build: convert HAS_NS16550 use to Kconfig

Use the Kconfig generated CONFIG_HAS_NS16550 defines in the code base.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/config/arm32.mk b/config/arm32.mk
index cd97e428811177c8e6f9d89bd42ccc7e2891dfd6..f9633387a333f76b493c161052d08193d447a232 100644 (file)
--- 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 c5deb4e4b43cbfe28da0c7a9053e2c65e31e6eab..f35f6bfb23cc7f80d98d58d77e12799a9a2fc51e 100644 (file)
--- 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/x86/Kconfig b/xen/arch/x86/Kconfig
index 63f2b2136e64ac21a4ab6bf7274768d17cf71d9d..e68e35bfec9965be1aa167d0f5e0e0ea58fb200d 100644 (file)
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -3,6 +3,7 @@ config X86_64
 
 config X86
        def_bool y
+       select HAS_NS16550
        select HAS_PASSTHROUGH
        select HAS_PCI
 

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 6e55d80e92855c7e4a78885a3378a310712b2f4d..c924aa22c12b8aed656448518473d5426bfd0e8a 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -7,7 +7,6 @@ HAS_NUMA := 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 5362e41e686963910ce34898f56b2d0f60e450c9..fe6fcca2ef3f13f6395f1d3d5aaefc9b327f2dbd 100644 (file)
--- 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 (file)
index 0000000..eb8c3b5
--- /dev/null
+++ b/xen/drivers/char/Kconfig
@@ -0,0 +1,6 @@
+#  16550-series UART support
+config HAS_NS16550
+       bool
+       default y
+       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 47fc3f9225ab17f40d5347a130d0e89c4a0bd496..5e9d2717de68ae703e0d3e00a5d4d26a6cbee50d 100644 (file)
--- 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_HAS_NS16550) += ns16550.o
 obj-$(HAS_CADENCE_UART) += cadence-uart.o
 obj-$(HAS_PL011) += pl011.o
 obj-$(HAS_EXYNOS4210) += exynos4210-uart.o