[Xen-devel] [PATCHv6] 20/28] build: convert HAS_OMAP use to Kconfig

[Doug Goldstein <cardoe@xxxxxxxxxx>]

Use the Kconfig generated CONFIG_UART_OMAP defines in the code base.

CC: Ian Campbell <ian.campbell@xxxxxxxxxx>
CC: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CC: Jan Beulich <jbeulich@xxxxxxxx>
CC: Keir Fraser <keir@xxxxxxx>
CC: Tim Deegan <tim@xxxxxxx>
Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Tested-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 config/arm32.mk                      | 1 -
 xen/arch/arm/configs/arm32_defconfig | 1 +
 xen/drivers/char/Kconfig             | 7 +++++++
 xen/drivers/char/Makefile            | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config/arm32.mk b/config/arm32.mk
index 56b71d7..b1de8da 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_OMAP := y
 HAS_SCIF := y
 HAS_MEM_ACCESS := y
 
diff --git a/xen/arch/arm/configs/arm32_defconfig 
b/xen/arch/arm/configs/arm32_defconfig
index 420602a..121c3f6 100644
--- a/xen/arch/arm/configs/arm32_defconfig
+++ b/xen/arch/arm/configs/arm32_defconfig
@@ -2,3 +2,4 @@ CONFIG_64BIT=n
 CONFIG_UART_NS16550=y
 CONFIG_UART_PL011=y
 CONFIG_UART_EXYNOS4210=y
+CONFIG_UART_OMAP=y
diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index 7262975..70f0eee6 100644
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -29,3 +29,10 @@ config UART_EXYNOS4210
        help
          This selects the Samsung Exynos 4210 UART. If you have a Samsung
          Exynos based board, say Y.
+
+config UART_OMAP
+       bool "OMAP UART support"
+       depends on ARM_32
+       help
+         This selects the Texas Instruments OMAP UART. If you have a Texas
+         Instruments based CPU, say Y.
diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index ebea593..06d02fb 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -3,7 +3,7 @@ obj-$(CONFIG_UART_NS16550) += ns16550.o
 obj-$(CONFIG_UART_CADENCE) += cadence-uart.o
 obj-$(CONFIG_UART_PL011) += pl011.o
 obj-$(CONFIG_UART_EXYNOS4210) += exynos4210-uart.o
-obj-$(HAS_OMAP) += omap-uart.o
+obj-$(CONFIG_UART_OMAP) += omap-uart.o
 obj-$(HAS_SCIF) += scif-uart.o
 obj-$(HAS_EHCI) += ehci-dbgp.o
 obj-$(CONFIG_ARM) += dt-uart.o
-- 
2.4.10


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel