From f02ad357247901ad83e3910f3dadd70e231f3f3d Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 15 Dec 2015 14:14:00 +0100 Subject: [PATCH] build: convert HAS_NS16550 use to Kconfig Use the Kconfig generated CONFIG_HAS_NS16550 defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - config/arm64.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/drivers/Kconfig | 2 ++ xen/drivers/char/Kconfig | 6 ++++++ xen/drivers/char/Makefile | 2 +- 7 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 xen/drivers/char/Kconfig diff --git a/config/arm32.mk b/config/arm32.mk index cd97e42881..f9633387a3 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 c5deb4e4b4..f35f6bfb23 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/x86/Kconfig b/xen/arch/x86/Kconfig index 63f2b2136e..e68e35bfec 100644 --- 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 6e55d80e92..c924aa22c1 100644 --- 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 5362e41e68..fe6fcca2ef 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 0000000000..eb8c3b5798 --- /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 47fc3f9225..5e9d2717de 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.39.5