x86: kconfig: Move USB to platform Kconfig

Like other peripheral drivers, move USB related drivers to platform
Kconfig as well.
Signed-off-by: NBin Meng <bmeng.cn@gmail.com>
Reviewed-by: NAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: NSimon Glass <sjg@chromium.org>

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

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

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

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

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

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

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
 

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

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

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

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