[Xen-devel] [PATCH v2 06/10] xen: remove HAS_ prefix from UART Kconfig options

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

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

Suggested-by: Julien Grall <julien.grall@xxxxxxx>
Signed-off-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
CC: andrew.cooper3@xxxxxxxxxx
CC: George.Dunlap@xxxxxxxxxxxxx
CC: ian.jackson@xxxxxxxxxxxxx
CC: jbeulich@xxxxxxxx
CC: julien.grall@xxxxxxx
CC: konrad.wilk@xxxxxxxxxx
CC: sstabellini@xxxxxxxxxx
CC: tim@xxxxxxx
CC: wei.liu2@xxxxxxxxxx


---
Actually, I don't have an opinion on KConfig names. I am happy to keep
as this or rename to something else.

Changes in v2:
- patch added
---
 tools/firmware/xen-dir/shim.config |  2 +-
 xen/arch/x86/Kconfig               |  4 ++--
 xen/drivers/char/Kconfig           | 16 ++++++++--------
 xen/drivers/char/Makefile          | 16 ++++++++--------
 4 files changed, 19 insertions(+), 19 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/x86/Kconfig b/xen/arch/x86/Kconfig
index 34d7c4b..770e640 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -10,7 +10,7 @@ config X86
        select CORE_PARKING
        select HAS_ALTERNATIVE
        select HAS_CPUFREQ
-       select HAS_EHCI
+       select EHCI
        select HAS_EX_TABLE
        select HAS_GDBSX
        select HAS_IOPORTS
@@ -18,7 +18,7 @@ config X86
        select MEM_ACCESS
        select HAS_MEM_PAGING
        select HAS_MEM_SHARING
-       select HAS_NS16550
+       select NS16550
        select HAS_PASSTHROUGH
        select HAS_PCI
        select HAS_PDX
diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index 9ffbfa7..ad409ff 100644
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -1,10 +1,10 @@
-config HAS_NS16550
+config NS16550
        bool "NS16550 UART driver"
        default y
        help
          This selects the 16550-series UART support. For most systems, say Y.
 
-config HAS_CADENCE_UART
+config CADENCE_UART
        bool "Xilinx Cadence UART driver"
        default y
        depends on ARM_64
@@ -12,7 +12,7 @@ config HAS_CADENCE_UART
          This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq
          based board, say Y.
 
-config HAS_MVEBU
+config MVEBU
        bool "Marvell MVEBU UART driver"
        default y
        depends on ARM_64
@@ -20,7 +20,7 @@ config HAS_MVEBU
          This selects the Marvell MVEBU UART. If you have a ARMADA 3700
          based board, say Y.
 
-config HAS_PL011
+config PL011
        bool "ARM PL011 UART driver"
        default y
        depends on ARM
@@ -28,7 +28,7 @@ config HAS_PL011
          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
+config EXYNOS4210
        bool "Samsung Exynos 4210 UART driver"
        default y
        depends on ARM_32
@@ -36,7 +36,7 @@ config HAS_EXYNOS4210
          This selects the Samsung Exynos 4210 UART. If you have a Samsung
          Exynos based board, say Y.
 
-config HAS_OMAP
+config OMAP
        bool "Texas Instruments OMAP UART driver"
        default y
        depends on ARM_32
@@ -44,7 +44,7 @@ config HAS_OMAP
          This selects the Texas Instruments OMAP UART. If you have a Texas
          Instruments based CPU, say Y.
 
-config HAS_SCIF
+config SCIF
        bool "SuperH SCI(F) UART driver"
        default y
        depends on ARM
@@ -52,7 +52,7 @@ config HAS_SCIF
          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
+config EHCI
        bool "EHCI UART driver"
        depends on x86
        help
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@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel