From: Doug Goldstein Date: Tue, 15 Dec 2015 13:14:00 +0000 (+0100) Subject: build: convert HAS_CADENCE_UART use to Kconfig X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2057 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d21e3663af228252036d72ba31cc8b9a856ccdfa;p=xen.git build: convert HAS_CADENCE_UART use to Kconfig Use the Kconfig generated CONFIG_HAS_CADENCE_UART defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- diff --git a/config/arm64.mk b/config/arm64.mk index f35f6bfb23..2d119a6e46 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -7,7 +7,6 @@ CONFIG_XEN_INSTALL_SUFFIX := CFLAGS += #-marm -march= -mcpu= etc HAS_PL011 := y -HAS_CADENCE_UART := y HAS_MEM_ACCESS := y HAS_GICV3 := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index eb8c3b5798..fc49bd774d 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -4,3 +4,12 @@ config HAS_NS16550 default y help This selects the 16550-series UART support. For most systems, say Y. + +# Xilinx Zynq Cadence UART support +config HAS_CADENCE_UART + bool + default y + depends on ARM_64 + help + This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq + based board, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index 5e9d2717de..e86ba6fea5 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -1,6 +1,6 @@ obj-y += console.o obj-$(CONFIG_HAS_NS16550) += ns16550.o -obj-$(HAS_CADENCE_UART) += cadence-uart.o +obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o obj-$(HAS_PL011) += pl011.o obj-$(HAS_EXYNOS4210) += exynos4210-uart.o obj-$(HAS_OMAP) += omap-uart.o