x86: kconfig: Move USB to platform Kconfig

Like other peripheral drivers, move USB related drivers to platform
Kconfig as well.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/Kconfig b/arch/Kconfig
index fef06d688381fd75e2db292560b314a314687eb7..99617b7d04325f0499071868344a4f11828dccf1 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -95,8 +95,6 @@ config X86
        select PCI
        select TIMER
        select X86_TSC_TIMER
-       select USB
-       select USB_EHCI_HCD
        imply DM_ETH
        imply DM_GPIO
        imply DM_KEYBOARD

diff --git a/arch/x86/cpu/baytrail/Kconfig b/arch/x86/cpu/baytrail/Kconfig
index 9f4947d116e41c9ac51adfaec0f96d224c3c7727..7ea43b9521e37dfeaf62cf4778e4e4f61ce16dd3 100644 (file)
--- a/arch/x86/cpu/baytrail/Kconfig
+++ b/arch/x86/cpu/baytrail/Kconfig
@@ -19,6 +19,9 @@ config INTEL_BAYTRAIL
        imply SCSI
        imply SPI_FLASH
        imply SYS_NS16550
+       imply USB
+       imply USB_EHCI_HCD
+       imply USB_XHCI_HCD
        imply VIDEO_VESA
 
 if INTEL_BAYTRAIL

diff --git a/arch/x86/cpu/broadwell/Kconfig b/arch/x86/cpu/broadwell/Kconfig
index c56f90df3503c3e68ebd76578e5875a62a25f5a5..7e713254dae657ba3b2082fde2eff9e634a22261 100644 (file)
--- a/arch/x86/cpu/broadwell/Kconfig
+++ b/arch/x86/cpu/broadwell/Kconfig
@@ -14,6 +14,8 @@ config INTEL_BROADWELL
        imply INTEL_BROADWELL_GPIO
        imply SCSI
        imply SPI_FLASH
+       imply USB
+       imply USB_EHCI_HCD
        imply VIDEO_BROADWELL_IGD
 
 if INTEL_BROADWELL

diff --git a/arch/x86/cpu/coreboot/Kconfig b/arch/x86/cpu/coreboot/Kconfig
index 31fe17bb9bca285836fc9923cf0dbade2c66e326..07d3fb8bead23afa41659cdf61d2e6f55c2eaf8d 100644 (file)
--- a/arch/x86/cpu/coreboot/Kconfig
+++ b/arch/x86/cpu/coreboot/Kconfig
@@ -12,6 +12,9 @@ config SYS_COREBOOT
        imply MMC_SDHCI_SDMA
        imply SPI_FLASH
        imply SYS_NS16550
+       imply USB
+       imply USB_EHCI_HCD
+       imply USB_XHCI_HCD
        imply VIDEO_COREBOOT
        imply CMD_CBFS
        imply FS_CBFS

diff --git a/arch/x86/cpu/ivybridge/Kconfig b/arch/x86/cpu/ivybridge/Kconfig
index 82af7ac8d5edc57983224dd5c1ce5a484efb2ebf..5630da06ee2bc48cb588e01e78df112e6676f6f4 100644 (file)
--- a/arch/x86/cpu/ivybridge/Kconfig
+++ b/arch/x86/cpu/ivybridge/Kconfig
@@ -14,6 +14,8 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE
        imply ICH_SPI
        imply SCSI
        imply SPI_FLASH
+       imply USB
+       imply USB_EHCI_HCD
        imply VIDEO_VESA
 
 if NORTHBRIDGE_INTEL_IVYBRIDGE

diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig
index ef0fd306cd6e1fbebea658d1eeded55ad68c0b0e..b6297f7971062d5cb27e6c623eb77464cdc3f656 100644 (file)
--- a/arch/x86/cpu/qemu/Kconfig
+++ b/arch/x86/cpu/qemu/Kconfig
@@ -10,6 +10,8 @@ config QEMU
        imply ENV_IS_NOWHERE
        imply E1000
        imply SYS_NS16550
+       imply USB
+       imply USB_EHCI_HCD
        imply VIDEO_VESA
 
 if QEMU

diff --git a/arch/x86/cpu/quark/Kconfig b/arch/x86/cpu/quark/Kconfig
index 46dade34c6bde2b45ab3c08ddbf3ab08af91cec3..ce0c454a1380f538cf76d337e0b6525f833d4915 100644 (file)
--- a/arch/x86/cpu/quark/Kconfig
+++ b/arch/x86/cpu/quark/Kconfig
@@ -19,6 +19,8 @@ config INTEL_QUARK
        imply MMC_SDHCI_SDMA
        imply SPI_FLASH
        imply SYS_NS16550
+       imply USB
+       imply USB_EHCI_HCD
 
 if INTEL_QUARK
 

diff --git a/arch/x86/cpu/queensbay/Kconfig b/arch/x86/cpu/queensbay/Kconfig
index 6e47ee5d5644531594171a7b3c24d343fc4d5f46..9b9c75616783d37420b87cc96da4fd3f5b6f0849 100644 (file)
--- a/arch/x86/cpu/queensbay/Kconfig
+++ b/arch/x86/cpu/queensbay/Kconfig
@@ -19,6 +19,8 @@ config INTEL_QUEENSBAY
        imply SCSI
        imply SPI_FLASH
        imply SYS_NS16550
+       imply USB
+       imply USB_EHCI_HCD
        imply VIDEO_VESA
 
 if INTEL_QUEENSBAY

diff --git a/arch/x86/cpu/tangier/Kconfig b/arch/x86/cpu/tangier/Kconfig
index e7d16dbaeb5ccc5161b2576cdccb7ca1537a2530..86a334047c0b47f2f0d02f03347709c39e470e49 100644 (file)
--- a/arch/x86/cpu/tangier/Kconfig
+++ b/arch/x86/cpu/tangier/Kconfig
@@ -13,6 +13,7 @@ config INTEL_TANGIER
        imply MMC_SDHCI_SDMA
        imply MMC_SDHCI_TANGIER
        imply TANGIER_WATCHDOG
+       imply USB
        imply USB_DWC3
 
 config SYS_CAR_ADDR

diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
index 47843f7bdaa5f3b771134cae7653fd9651cd81bb..d45932bcfc0fbc9cfa4ccd76021be9363808dc87 100644 (file)
--- a/configs/efi-x86_defconfig
+++ b/configs/efi-x86_defconfig
@@ -32,7 +32,5 @@ CONFIG_DEBUG_EFI_CONSOLE=y
 CONFIG_DEBUG_UART_BASE=0
 CONFIG_DEBUG_UART_CLOCK=0
 CONFIG_ICH_SPI=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_KEYBOARD=y
 CONFIG_EFI=y
 # CONFIG_EFI_LOADER is not set

diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 5a770a9409a8709b7d038c9ef45c0a444ab6f464..0d58848e3ca1a4fd31e65ac14a78c806bb5dc6c9 100644 (file)
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -46,7 +46,6 @@ CONFIG_CPU=y
 CONFIG_RTL8169=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
-CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y