Use the Kconfig generated CONFIG_HAS_NS16550 defines in the code base.
Signed-off-by: Doug Goldstein <car...@cardoe.com>
---
xen/arch/x86/Kconfig | 1 +
xen/arch/x86/Rules.mk | 1 -
xen/drivers/Kconfig | 2 ++
xen/drivers/char/Kconfig | 4 ++++
xen/drivers/char/Makefile | 2 +-
5 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 xen/drivers/char/Kconfig
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index d1d8f35..7296fbb 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -18,6 +18,7 @@ config X86
def_bool y
select HAS_PASSTHROUGH
select HAS_PCI
+ select HAS_NS16550
select HAS_GDBSX
config ARCH_DEFCONFIG
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 10cfb21..ae2929d 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..ca7924f
--- /dev/null
+++ b/xen/drivers/char/Kconfig
@@ -0,0 +1,4 @@
+
+# Select HAS_NS16550 if a 16550 UART is supported
+config HAS_NS16550
+ bool
diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index 47fc3f9..5e9d271 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_HAS_NS16550) += ns16550.o
obj-$(HAS_CADENCE_UART) += cadence-uart.o
obj-$(HAS_PL011) += pl011.o
obj-$(HAS_EXYNOS4210) += exynos4210-uart.o
--
2.4.9
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
