From mboxrd@z Thu Jan  1 00:00:00 1970
From: Doug Goldstein <cardoe@cardoe.com>
Subject: [PATCHv2] 21/27] build: convert HAS_EHCI use to Kconfig
Date: Wed, 11 Nov 2015 10:50:11 -0600
Message-ID: <1447260617-10138-22-git-send-email-cardoe@cardoe.com>
References: <1447260617-10138-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: <1447260617-10138-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>, Doug Goldstein <cardoe@cardoe.com>, Jan Beulich <jbeulich@suse.com>, Andrew Cooper <andrew.cooper3@citrix.com>
List-Id: xen-devel@lists.xenproject.org

Use the Kconfig generated CONFIG_HAS_EHCI defines in the code base.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>

CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <jbeulich@suse.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 xen/arch/x86/Kconfig      | 1 +
 xen/arch/x86/Rules.mk     | 1 -
 xen/drivers/char/Kconfig  | 4 ++++
 xen/drivers/char/Makefile | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 8b2e024..89f685a 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -10,6 +10,7 @@ config X86
 	select HAS_VGA
 	select HAS_CPUFREQ
 	select HAS_PCI
+	select HAS_EHCI
 	select HAS_NS16550
 	select HAS_GDBSX
 	select HAS_PDX
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index c814a78..4bb6258 100644
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -1,7 +1,6 @@
 ########################################
 # x86-specific definitions
 
-HAS_EHCI := y
 HAS_CORE_PARKING := y
 xenoprof := y
 
diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index 8eda61c..5f5cb94 100644
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -27,3 +27,7 @@ config HAS_OMAP
 # Select HAS_SCIF if a SCIF UART is supported
 config HAS_SCIF
 	bool
+
+# Select HAS_EHCI if EHCI debug is supported
+config HAS_EHCI
+	bool
diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index f9d9a9c..aa620fc 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -5,6 +5,6 @@ obj-$(CONFIG_HAS_PL011) += pl011.o
 obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o
 obj-$(CONFIG_HAS_OMAP) += omap-uart.o
 obj-$(CONFIG_HAS_SCIF) += scif-uart.o
-obj-$(HAS_EHCI) += ehci-dbgp.o
+obj-$(CONFIG_HAS_EHCI) += ehci-dbgp.o
 obj-$(CONFIG_ARM) += dt-uart.o
 obj-y += serial.o
-- 
2.4.10