build: convert HAS_OMAP use to Kconfig

Use the Kconfig generated CONFIG_HAS_OMAP 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 56b71d71e9528522e8b5e63c7df798ce3e1d7f1c..b1de8dabe71556117292db8dd28caeccbaacbc5b 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_OMAP := y
 HAS_SCIF := y
 HAS_MEM_ACCESS := y
 

diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index 8f72f6869a374c9870f0312c8b90722f05f229c2..a424ab29018818797476b75eb2846b8994332696 100644 (file)
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -31,3 +31,12 @@ config HAS_EXYNOS4210
        help
          This selects the Samsung Exynos 4210 UART. If you have a Samsung
          Exynos based board, say Y.
+
+# OMAP UART support
+config HAS_OMAP
+       bool
+       default y
+       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 f8e7b44421c4a35d884d4ab5b942acceac186c9e..7118570d0f22ce3c6a35c09c2bf0d9f2ba3f856c 100644 (file)
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -3,7 +3,7 @@ obj-$(CONFIG_HAS_NS16550) += ns16550.o
 obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o
 obj-$(CONFIG_HAS_PL011) += pl011.o
 obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o
-obj-$(HAS_OMAP) += omap-uart.o
+obj-$(CONFIG_HAS_OMAP) += omap-uart.o
 obj-$(HAS_SCIF) += scif-uart.o
 obj-$(HAS_EHCI) += ehci-dbgp.o
 obj-$(CONFIG_ARM) += dt-uart.o