[PATCH v3 06/10] xen: remove HAS_ prefix from UART Kconfig options

From: Stefano Stabellini <sstabellini@kernel.org>
To: julien.grall@arm.com
Cc: artem_mygaiev@epam.com, lars.kurth@citrix.com,
	sstabellini@kernel.org, andrii_anisov@epam.com,
	George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com,
	ian.jackson@eu.citrix.com, dfaggioli@suse.com, tim@xen.org,
	jbeulich@suse.com, wei.liu2@citrix.com, xen-devel@lists.xen.org
Subject: [PATCH v3 06/10] xen: remove HAS_ prefix from UART Kconfig options
Date: Tue, 22 May 2018 17:25:04 -0700	[thread overview]
Message-ID: <1527035108-15051-6-git-send-email-sstabellini@kernel.org> (raw)
In-Reply-To: <alpine.DEB.2.10.1805221719560.24793@sstabellini-ThinkPad-X260>

UART drivers are now selectable by the user. To mark the change, remove
the HAS_ prefix.

Use HAS_* options to mark which options are available on which
architecture. Use HAS_*_ALWAYS_ON options to mark which options are
silent and always enabled on a given architecture.

Make NS16550 and EHCI silent and always enabled on x86.
Make all the others selectable on ARM, default on.

Suggested-by: Julien Grall <julien.grall@arm.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
CC: andrew.cooper3@citrix.com
CC: George.Dunlap@eu.citrix.com
CC: ian.jackson@eu.citrix.com
CC: jbeulich@suse.com
CC: julien.grall@arm.com
CC: konrad.wilk@oracle.com
CC: sstabellini@kernel.org
CC: tim@xen.org
CC: wei.liu2@citrix.com


---
Changes in v3:
- use HAS_* options to mark which options are available on which arch
- use HAS_*_ALWAYS_ON options to mark which options are silent and
  always enabled on a given arch
- mark UART appropriately on x86 and arm
- remove HAS_ prefix everywhere else

Changes in v2:
- patch added
---
 tools/firmware/xen-dir/shim.config |  2 +-
 xen/arch/arm/Kconfig               | 28 ++++++++++++++++++++++++++
 xen/arch/x86/Kconfig               | 14 +++++++++++++
 xen/drivers/char/Kconfig           | 41 ++++++++++++++++++++++----------------
 xen/drivers/char/Makefile          | 16 +++++++--------
 5 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/tools/firmware/xen-dir/shim.config b/tools/firmware/xen-dir/shim.config
index 21d7075..d3a40e7 100644
--- a/tools/firmware/xen-dir/shim.config
+++ b/tools/firmware/xen-dir/shim.config
@@ -63,7 +63,7 @@ CONFIG_ACPI=y
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 CONFIG_NUMA=y
 CONFIG_HAS_NS16550=y
-CONFIG_HAS_EHCI=y
+CONFIG_EHCI=y
 CONFIG_HAS_CPUFREQ=y
 CONFIG_HAS_PASSTHROUGH=y
 CONFIG_HAS_PCI=y
diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index 164cdc3..a5a6943 100644
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -20,6 +20,13 @@ config ARM
 	select HAS_MEM_ACCESS
 	select HAS_PASSTHROUGH
 	select HAS_PDX
+	select HAS_NS16550
+	select HAS_CADENCE_UART
+	select HAS_MVEBU
+	select HAS_PL011
+	select HAS_EXYNOS4210
+	select HAS_OMAP
+	select HAS_SCIF
 
 config ARCH_DEFCONFIG
 	string
@@ -29,6 +36,27 @@ config ARCH_DEFCONFIG
 config HAS_MEM_ACCESS
 	def_bool y
 
+config HAS_NS16550
+	def_bool y
+
+config HAS_CADENCE_UART
+	def_bool y
+
+config HAS_MVEBU
+	def_bool y
+
+config HAS_PL011
+	def_bool y
+
+config HAS_EXYNOS4210
+	def_bool y
+
+config HAS_OMAP
+	def_bool y
+
+config HAS_SCIF
+	def_bool y
+
 menu "Architecture Features"
 
 source "arch/Kconfig"
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 0c49d71..e69f5ac 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -11,6 +11,7 @@ config X86
 	select HAS_ALTERNATIVE
 	select HAS_CPUFREQ
 	select HAS_EHCI
+	select HAS_EHCI_ALWAYS_ON
 	select HAS_EX_TABLE
 	select HAS_GDBSX
 	select HAS_IOPORTS
@@ -20,6 +21,7 @@ config X86
 	select HAS_MEM_PAGING
 	select HAS_MEM_SHARING
 	select HAS_NS16550
+	select HAS_NS16550_ALWAYS_ON
 	select HAS_PASSTHROUGH
 	select HAS_PCI
 	select HAS_PDX
@@ -37,6 +39,18 @@ config HAS_MEM_ACCESS
 config MEM_ACCESS_ALWAYS_ON
 	def_bool y
 
+config HAS_NS16550
+	def_bool y
+
+config HAS_NS16550_ALWAYS_ON
+	def_bool y
+
+config HAS_EHCI
+	def_bool y
+
+config HAS_EHCI_ALWAYS_ON
+	def_bool y
+
 menu "Architecture Features"
 
 source "arch/Kconfig"
diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index c8f30b8..7204d38 100644
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -1,60 +1,67 @@
-config HAS_NS16550
-	bool "NS16550 UART driver" if ARM
+config NS16550
+	bool "NS16550 UART driver" if !HAS_NS16550_ALWAYS_ON
+	depends on HAS_NS16550
 	default y
 	help
 	  This selects the 16550-series UART support. For most systems, say Y.
 
-config HAS_CADENCE_UART
-	bool "Xilinx Cadence UART driver"
+config CADENCE_UART
+	bool "Xilinx Cadence UART driver" if !HAS_CADENCE_UART_ALWAYS_ON
+	depends on HAS_CADENCE_UART
 	default y
 	depends on ARM_64
 	help
 	  This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq
 	  based board, say Y.
 
-config HAS_MVEBU
-	bool "Marvell MVEBU UART driver"
+config MVEBU
+	bool "Marvell MVEBU UART driver" if !HAS_MVEBU_ALWAYS_ON
+	depends on HAS_MVEBU
 	default y
 	depends on ARM_64
 	help
 	  This selects the Marvell MVEBU UART. If you have a ARMADA 3700
 	  based board, say Y.
 
-config HAS_PL011
-	bool "ARM PL011 UART driver"
+config PL011
+	bool "ARM PL011 UART driver" if !HAS_PL011_ALWAYS_ON
+	depends on HAS_PL011
 	default y
 	depends on ARM
 	help
 	  This selects the ARM(R) AMBA(R) PrimeCell PL011 UART. If you have
 	  an Integrator/PP2, Integrator/CP or Versatile platform, say Y.
 
-config HAS_EXYNOS4210
-	bool "Samsung Exynos 4210 UART driver"
+config EXYNOS4210
+	bool "Samsung Exynos 4210 UART driver" if !HAS_EXYNOS4210_ALWAYS_ON
+	depends on HAS_EXYNOS4210
 	default y
 	depends on ARM_32
 	help
 	  This selects the Samsung Exynos 4210 UART. If you have a Samsung
 	  Exynos based board, say Y.
 
-config HAS_OMAP
-	bool "Texas Instruments OMAP UART driver"
+config OMAP
+	bool "Texas Instruments OMAP UART driver" if !HAS_OMAP_ALWAYS_ON
+	depends on HAS_OMAP
 	default y
 	depends on ARM_32
 	help
 	  This selects the Texas Instruments OMAP UART. If you have a Texas
 	  Instruments based CPU, say Y.
 
-config HAS_SCIF
-	bool "SuperH SCI(F) UART driver"
+config SCIF
+	bool "SuperH SCI(F) UART driver" if !HAS_SCIF_ALWAYS_ON
+	depends on HAS_SCIF
 	default y
 	depends on ARM
 	help
 	  This selects the SuperH SCI(F) UART. If you have a SuperH based board,
 	  or Renesas R-Car Gen 2/3 based board say Y.
 
-config HAS_EHCI
-	bool "EHCI UART driver"
-	depends on X86
+config EHCI
+	bool "EHCI UART driver" if !HAS_EHCI_ALWAYS_ON
+	depends on HAS_EHCI
 	help
 	  This selects the USB based EHCI debug port to be used as a UART. If
 	  you have an x86 based system with USB, say Y.
diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index b68c330..94014c3 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -1,12 +1,12 @@
 obj-y += console.o
-obj-$(CONFIG_HAS_NS16550) += ns16550.o
-obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o
-obj-$(CONFIG_HAS_PL011) += pl011.o
-obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o
-obj-$(CONFIG_HAS_MVEBU) += mvebu-uart.o
-obj-$(CONFIG_HAS_OMAP) += omap-uart.o
-obj-$(CONFIG_HAS_SCIF) += scif-uart.o
-obj-$(CONFIG_HAS_EHCI) += ehci-dbgp.o
+obj-$(CONFIG_NS16550) += ns16550.o
+obj-$(CONFIG_CADENCE_UART) += cadence-uart.o
+obj-$(CONFIG_PL011) += pl011.o
+obj-$(CONFIG_EXYNOS4210) += exynos4210-uart.o
+obj-$(CONFIG_MVEBU) += mvebu-uart.o
+obj-$(CONFIG_OMAP) += omap-uart.o
+obj-$(CONFIG_SCIF) += scif-uart.o
+obj-$(CONFIG_EHCI) += ehci-dbgp.o
 obj-$(CONFIG_ARM) += arm-uart.o
 obj-y += serial.o
 obj-$(CONFIG_XEN_GUEST) += xen_pv_console.o
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
