From mboxrd@z Thu Jan  1 00:00:00 1970
From: Doug Goldstein <cardoe@cardoe.com>
Subject: [PATCHv6] 21/28] build: convert HAS_SCIF use to Kconfig
Date: Tue, 24 Nov 2015 11:52:11 -0600
Message-ID: <1448387538-12208-22-git-send-email-cardoe@cardoe.com>
References: <1448387538-12208-1-git-send-email-cardoe@cardoe.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1448387538-12208-1-git-send-email-cardoe@cardoe.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xen.org
Cc: Keir Fraser <keir@xen.org>, Ian Campbell <ian.campbell@citrix.com>, Doug Goldstein <cardoe@cardoe.com>, Ian Jackson <ian.jackson@eu.citrix.com>, Tim Deegan <tim@xen.org>, Jan Beulich <jbeulich@suse.com>
List-Id: xen-devel@lists.xenproject.org

Use the Kconfig generated CONFIG_UART_SCIF defines in the code base.

CC: Ian Campbell <ian.campbell@citrix.com>
CC: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Keir Fraser <keir@xen.org>
CC: Tim Deegan <tim@xen.org>
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Tested-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
 config/arm32.mk           | 1 -
 xen/drivers/char/Kconfig  | 7 +++++++
 xen/drivers/char/Makefile | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/arm32.mk b/config/arm32.mk
index b1de8da..001b2cd 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_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 70f0eee6..d5cc991 100644
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -36,3 +36,10 @@ config UART_OMAP
 	help
 	  This selects the Texas Instruments OMAP UART. If you have a Texas
 	  Instruments based CPU, say Y.
+
+config UART_SCIF
+	bool "SuperH SCI(F) UART support"
+	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 06d02fb..68ebc2d 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_UART_CADENCE) += cadence-uart.o
 obj-$(CONFIG_UART_PL011) += pl011.o
 obj-$(CONFIG_UART_EXYNOS4210) += exynos4210-uart.o
 obj-$(CONFIG_UART_OMAP) += omap-uart.o
-obj-$(HAS_SCIF) += scif-uart.o
+obj-$(CONFIG_UART_SCIF) += scif-uart.o
 obj-$(HAS_EHCI) += ehci-dbgp.o
 obj-$(CONFIG_ARM) += dt-uart.o
 obj-y += serial.o
-- 
2.4.10