[U-Boot] [PATCH v2 21/22] x86: kconfig: Move USB to platform Kconfig

[Bin Meng]

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

Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---

Changes in v2: None

 arch/Kconfig                   | 2 --
 arch/x86/cpu/baytrail/Kconfig  | 3 +++
 arch/x86/cpu/broadwell/Kconfig | 2 ++
 arch/x86/cpu/coreboot/Kconfig  | 3 +++
 arch/x86/cpu/ivybridge/Kconfig | 2 ++
 arch/x86/cpu/qemu/Kconfig      | 2 ++
 arch/x86/cpu/quark/Kconfig     | 2 ++
 arch/x86/cpu/queensbay/Kconfig | 2 ++
 arch/x86/cpu/tangier/Kconfig   | 1 +
 configs/efi-x86_defconfig      | 2 --
 configs/minnowmax_defconfig    | 1 -
 11 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index fef06d6..99617b7 100644
--- 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 9f4947d..7ea43b9 100644
--- 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 c56f90d..7e71325 100644
--- 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 31fe17b..07d3fb8 100644
--- 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 82af7ac..5630da0 100644
--- 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 ef0fd30..b6297f7 100644
--- 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 46dade3..ce0c454 100644
--- 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 6e47ee5..9b9c756 100644
--- 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 e7d16db..86a3340 100644
--- 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 47843f7..d45932b 100644
--- 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 5a770a9..0d58848 100644
--- 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
-- 
2.9.2