[Xen-devel] [PATCHv5] 07/28] build: convert HAS_NS16550 use to Kconfig

[Doug Goldstein <cardoe@xxxxxxxxxx>]

Use the Kconfig generated CONFIG_HAS_NS16550 defines in the code base.

CC: Keir Fraser <keir@xxxxxxx>
CC: Jan Beulich <jbeulich@xxxxxxxx>
CC: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
---
 config/arm32.mk                      | 1 -
 config/arm64.mk                      | 1 -
 xen/arch/arm/configs/arm32_defconfig | 1 +
 xen/arch/arm/configs/arm64_defconfig | 1 +
 xen/arch/x86/Kconfig                 | 1 +
 xen/arch/x86/Rules.mk                | 1 -
 xen/drivers/Kconfig                  | 2 ++
 xen/drivers/char/Kconfig             | 5 +++++
 xen/drivers/char/Makefile            | 2 +-
 9 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 xen/drivers/char/Kconfig

diff --git a/config/arm32.mk b/config/arm32.mk
index cd97e42..f963338 100644
--- a/config/arm32.mk
+++ b/config/arm32.mk
@@ -13,7 +13,6 @@ HAS_PL011 := y
 HAS_EXYNOS4210 := y
 HAS_OMAP := y
 HAS_SCIF := y
-HAS_NS16550 := y
 HAS_MEM_ACCESS := y
 
 # Use only if calling $(LD) directly.
diff --git a/config/arm64.mk b/config/arm64.mk
index c5deb4e..f35f6bf 100644
--- a/config/arm64.mk
+++ b/config/arm64.mk
@@ -8,7 +8,6 @@ CFLAGS += #-marm -march= -mcpu= etc
 
 HAS_PL011 := y
 HAS_CADENCE_UART := y
-HAS_NS16550 := y
 HAS_MEM_ACCESS := y
 HAS_GICV3 := y
 
diff --git a/xen/arch/arm/configs/arm32_defconfig 
b/xen/arch/arm/configs/arm32_defconfig
index 5608ff9..e204bbc 100644
--- a/xen/arch/arm/configs/arm32_defconfig
+++ b/xen/arch/arm/configs/arm32_defconfig
@@ -1 +1,2 @@
 CONFIG_64BIT=n
+CONFIG_UART_NS16550=y
diff --git a/xen/arch/arm/configs/arm64_defconfig 
b/xen/arch/arm/configs/arm64_defconfig
index e69de29..debc348 100644
--- a/xen/arch/arm/configs/arm64_defconfig
+++ b/xen/arch/arm/configs/arm64_defconfig
@@ -0,0 +1 @@
+CONFIG_UART_NS16550=y
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 4e1a9da..8039111 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -5,6 +5,7 @@ config X86
        def_bool y
        select HAS_PASSTHROUGH
        select HAS_PCI
+       select UART_NS16550
        select HAS_GDBSX
 
 config ARCH_DEFCONFIG
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 931e0b1..f6b9d28 100644
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -6,7 +6,6 @@ HAS_ACPI := y
 HAS_VGA  := y
 HAS_VIDEO  := y
 HAS_CPUFREQ := y
-HAS_NS16550 := y
 HAS_EHCI := y
 HAS_KEXEC := y
 HAS_GDBSX := y
diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig
index 5362e41..fe6fcca 100644
--- a/xen/drivers/Kconfig
+++ b/xen/drivers/Kconfig
@@ -1,5 +1,7 @@
 menu "Device Drivers"
 
+source "drivers/char/Kconfig"
+
 source "drivers/passthrough/Kconfig"
 
 source "drivers/pci/Kconfig"
diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
new file mode 100644
index 0000000..6ed451f
--- /dev/null
+++ b/xen/drivers/char/Kconfig
@@ -0,0 +1,5 @@
+
+config UART_NS16550
+       bool "16550-series UART support"
+       help
+         This selects the 16550-series UART support. For most systems, say Y.
diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index 47fc3f9..99e8c6f 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -1,5 +1,5 @@
 obj-y += console.o
-obj-$(HAS_NS16550) += ns16550.o
+obj-$(CONFIG_UART_NS16550) += ns16550.o
 obj-$(HAS_CADENCE_UART) += cadence-uart.o
 obj-$(HAS_PL011) += pl011.o
 obj-$(HAS_EXYNOS4210) += exynos4210-uart.o
-- 
2.4.10


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel