Use the Kconfig generated CONFIG_HAS_CADENCE_UART defines in the code base.
CC: Ian Campbell <ian.campb...@citrix.com>
CC: Ian Jackson <ian.jack...@eu.citrix.com>
CC: Jan Beulich <jbeul...@suse.com>
CC: Keir Fraser <k...@xen.org>
CC: Tim Deegan <t...@xen.org>
Signed-off-by: Doug Goldstein <car...@cardoe.com>
Acked-by: Andrew Cooper <andrew.coop...@citrix.com>
Tested-by: Andrew Cooper <andrew.coop...@citrix.com>
---
config/arm64.mk | 1 -
xen/arch/arm/configs/arm64_defconfig | 1 +
xen/drivers/char/Kconfig | 7 +++++++
xen/drivers/char/Makefile | 2 +-
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/config/arm64.mk b/config/arm64.mk
index f35f6bf..2d119a6 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/arch/arm/configs/arm64_defconfig
b/xen/arch/arm/configs/arm64_defconfig
index debc348..1fb8c7b 100644
--- a/xen/arch/arm/configs/arm64_defconfig
+++ b/xen/arch/arm/configs/arm64_defconfig
@@ -1 +1,2 @@
CONFIG_UART_NS16550=y
+CONFIG_UART_CADENCE=y
diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index 8ecea29..5fc44c0 100644
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -8,3 +8,10 @@ config UART_NS16550
config HAS_IOPORTS
bool
depends on UART_NS16550
+
+config UART_CADENCE
+ bool "Xilinx Zynq Cadence UART support"
+ 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 99e8c6f..d396b2e 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -1,6 +1,6 @@
obj-y += console.o
obj-$(CONFIG_UART_NS16550) += ns16550.o
-obj-$(HAS_CADENCE_UART) += cadence-uart.o
+obj-$(CONFIG_UART_CADENCE) += cadence-uart.o
obj-$(HAS_PL011) += pl011.o
obj-$(HAS_EXYNOS4210) += exynos4210-uart.o
obj-$(HAS_OMAP) += omap-uart.o
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
