Use the Kconfig generated CONFIG_UART_PL011 defines in the code base.
The prefix HAS_ does not make sense in this case because these are
intended to be user selected options while HAS_ just states that the
hardware has this support and is controlled by Xen maintainers.
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/arm32.mk | 1 -
config/arm64.mk | 1 -
xen/arch/arm/configs/arm32_defconfig | 1 +
xen/arch/arm/configs/arm64_defconfig | 1 +
xen/drivers/char/Kconfig | 7 +++++++
xen/drivers/char/Makefile | 2 +-
6 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/config/arm32.mk b/config/arm32.mk
index f963338..3bbdd2d 100644
--- a/config/arm32.mk
+++ b/config/arm32.mk
@@ -9,7 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX :=
# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
CFLAGS += -marm
-HAS_PL011 := y
HAS_EXYNOS4210 := y
HAS_OMAP := y
HAS_SCIF := y
diff --git a/config/arm64.mk b/config/arm64.mk
index 2d119a6..1b9a47f 100644
--- a/config/arm64.mk
+++ b/config/arm64.mk
@@ -6,7 +6,6 @@ CONFIG_XEN_INSTALL_SUFFIX :=
CFLAGS += #-marm -march= -mcpu= etc
-HAS_PL011 := y
HAS_MEM_ACCESS := y
HAS_GICV3 := y
diff --git a/xen/arch/arm/configs/arm32_defconfig
b/xen/arch/arm/configs/arm32_defconfig
index e204bbc..61d6b5d 100644
--- a/xen/arch/arm/configs/arm32_defconfig
+++ b/xen/arch/arm/configs/arm32_defconfig
@@ -1,2 +1,3 @@
CONFIG_64BIT=n
CONFIG_UART_NS16550=y
+CONFIG_UART_PL011=y
diff --git a/xen/arch/arm/configs/arm64_defconfig
b/xen/arch/arm/configs/arm64_defconfig
index 1fb8c7b..4bee0a2 100644
--- a/xen/arch/arm/configs/arm64_defconfig
+++ b/xen/arch/arm/configs/arm64_defconfig
@@ -1,2 +1,3 @@
CONFIG_UART_NS16550=y
CONFIG_UART_CADENCE=y
+CONFIG_UART_PL011=y
diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index 5fc44c0..120525b 100644
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -15,3 +15,10 @@ config UART_CADENCE
help
This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq
based board, say Y.
+
+config UART_PL011
+ bool "ARM AMBA PL011 UART support"
+ depends on ARM
+ help
+ This selects the ARM(R) AMBA(R) PrimeCell PL011 UART. If you have
+ an Integrator/PP2, Integrator/CP or Versatile platform, say Y.
diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index d396b2e..0adb3b7 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -1,7 +1,7 @@
obj-y += console.o
obj-$(CONFIG_UART_NS16550) += ns16550.o
obj-$(CONFIG_UART_CADENCE) += cadence-uart.o
-obj-$(HAS_PL011) += pl011.o
+obj-$(CONFIG_UART_PL011) += pl011.o
obj-$(HAS_EXYNOS4210) += exynos4210-uart.o
obj-$(HAS_OMAP) += omap-uart.o
obj-$(HAS_SCIF) += scif-uart.o
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
