build: convert HAS_EHCI use to Kconfig

Use the Kconfig generated CONFIG_HAS_EHCI defines in the code base.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 88955e7030ed3eacef03f362405f31c3b7dea908..393127df520aafe4af0795433b95f26444a61291 100644 (file)
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -5,6 +5,7 @@ config X86
        def_bool y
        select HAS_ACPI
        select HAS_CPUFREQ
+       select HAS_EHCI
        select HAS_GDBSX
        select HAS_IOPORTS
        select HAS_KEXEC

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index c27e0d6c7fbdc226c66d9e222f6d2749b458f3bb..4ca69a1650500e87567321962079ce5848cf91b4 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -2,7 +2,6 @@
 # x86-specific definitions
 
 HAS_NUMA := y
-HAS_EHCI := y
 HAS_CORE_PARKING := y
 xenoprof := y
 

diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig
index c81b109df0314250b5247de1b83b088fa5387f64..08973cfaf5cdd01d5f093828aae338ae4b60e973 100644 (file)
--- a/xen/drivers/char/Kconfig
+++ b/xen/drivers/char/Kconfig
@@ -49,3 +49,10 @@ config HAS_SCIF
        help
          This selects the SuperH SCI(F) UART. If you have a SuperH based board,
          say Y.
+
+# USB EHCI debug port support
+config HAS_EHCI
+       bool
+       help
+         This selects the USB based EHCI debug port to be used as a UART. If
+         you have an x86 based system with USB, say Y.

diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index f9d9a9ca59bdfeb426d4018cd075cf3cef2bf1e5..aa620fc890d22b50a88ac56c78adf75e542c838d 100644 (file)
--- 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