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 <cardoe@cardoe.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/config/arm64.mk b/config/arm64.mk
index f35f6bfb23cc7f80d98d58d77e12799a9a2fc51e..2d119a6e46133532fd7422be16cd6c0bb2fd50ea 100644 (file)
--- 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 eb8c3b5798c053ffc3027e08edb1491bc98482ec..fc49bd774d15093616b8818c44c7efe6c40d77b5 100644 (file)
--- 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 5e9d2717de68ae703e0d3e00a5d4d26a6cbee50d..e86ba6fea59eb191f7d8436a406b0d82b1fbe9b6 100644 (file)
--- 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