From: Doug Goldstein Date: Tue, 15 Dec 2015 13:14:00 +0000 (+0100) Subject: build: convert HAS_PL011 use to Kconfig X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2056 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=162df803d6707bc89a1d6d92f6b619c7ab678477;p=xen.git build: convert HAS_PL011 use to Kconfig Use the Kconfig generated CONFIG_HAS_PL011 defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- diff --git a/config/arm32.mk b/config/arm32.mk index f9633387a3..3bbdd2d28b 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 2d119a6e46..1b9a47f896 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/drivers/char/Kconfig b/xen/drivers/char/Kconfig index fc49bd774d..e90104b272 100644 --- 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 e86ba6fea5..df87594f5e 100644 --- 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