build: convert HAS_SCIF use to Kconfig

Use the Kconfig generated CONFIG_HAS_SCIF 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 b1de8dabe71556117292db8dd28caeccbaacbc5b..001b2cd9c4f70e709cb5f39b5ec9972530662aa9 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_SCIF := y
 HAS_MEM_ACCESS := y
 
 # Use only if calling $(LD) directly.

diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index a424ab29018818797476b75eb2846b8994332696..c81b109df0314250b5247de1b83b088fa5387f64 100644 (file)
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -40,3 +40,12 @@ config HAS_OMAP
        help
          This selects the Texas Instruments OMAP UART. If you have a Texas
          Instruments based CPU, say Y.
+
+# SuperH SCI(F) UART support
+config HAS_SCIF
+       bool
+       default y
+       depends on ARM_32
+       help
+         This selects the SuperH SCI(F) UART. If you have a SuperH based board,
+         say Y.

diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index 7118570d0f22ce3c6a35c09c2bf0d9f2ba3f856c..f9d9a9ca59bdfeb426d4018cd075cf3cef2bf1e5 100644 (file)
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o
 obj-$(CONFIG_HAS_PL011) += pl011.o
 obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o
 obj-$(CONFIG_HAS_OMAP) += omap-uart.o
-obj-$(HAS_SCIF) += scif-uart.o
+obj-$(CONFIG_HAS_SCIF) += scif-uart.o
 obj-$(HAS_EHCI) += ehci-dbgp.o
 obj-$(CONFIG_ARM) += dt-uart.o
 obj-y += serial.o