build: convert HAS_PL011 use to Kconfig

Use the Kconfig generated CONFIG_HAS_PL011 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/arm32.mk b/config/arm32.mk
index f9633387a333f76b493c161052d08193d447a232..3bbdd2d28bd9e1457c8257296f72e3dffa572456 100644 (file)
--- 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 2d119a6e46133532fd7422be16cd6c0bb2fd50ea..1b9a47f8964fdbfa93994c82803935e7308cbef7 100644 (file)
--- 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/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index fc49bd774d15093616b8818c44c7efe6c40d77b5..e90104b272e0e092dc9f184f198341006d7b0c10 100644 (file)
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -13,3 +13,12 @@ config HAS_CADENCE_UART
        help
          This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq
          based board, say Y.
+
+# ARM AMBA PL011 UART support
+config HAS_PL011
+       bool
+       default y
+       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 e86ba6fea59eb191f7d8436a406b0d82b1fbe9b6..df87594f5e35a746bb07df38bbe4c5717d280021 100644 (file)
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -1,7 +1,7 @@
 obj-y += console.o
 obj-$(CONFIG_HAS_NS16550) += ns16550.o
 obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o
-obj-$(HAS_PL011) += pl011.o
+obj-$(CONFIG_HAS_PL011) += pl011.o
 obj-$(HAS_EXYNOS4210) += exynos4210-uart.o
 obj-$(HAS_OMAP) += omap-uart.o
 obj-$(HAS_SCIF) += scif-uart.o