Message ID | 1501247229-15001-22-git-send-email-bmeng.cn@gmail.com |
---|---|
State | Superseded |
Delegated to: | Bin Meng |
Headers | show |
diff --git a/arch/Kconfig b/arch/Kconfig index 3943519..f16aebd 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -94,8 +94,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 d694973..2d5dad2 100644 --- a/arch/x86/cpu/baytrail/Kconfig +++ b/arch/x86/cpu/baytrail/Kconfig @@ -17,6 +17,9 @@ config INTEL_BAYTRAIL imply MMC_SDHCI_SDMA imply SCSI 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 dc0e10e..3778097 100644 --- a/arch/x86/cpu/broadwell/Kconfig +++ b/arch/x86/cpu/broadwell/Kconfig @@ -12,6 +12,8 @@ config INTEL_BROADWELL imply ICH_SPI imply INTEL_BROADWELL_GPIO imply SCSI + 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 641a3f1..7db2bd2 100644 --- a/arch/x86/cpu/coreboot/Kconfig +++ b/arch/x86/cpu/coreboot/Kconfig @@ -5,6 +5,9 @@ config SYS_COREBOOT default y imply E1000 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 5ac012f..37c9ca4 100644 --- a/arch/x86/cpu/ivybridge/Kconfig +++ b/arch/x86/cpu/ivybridge/Kconfig @@ -12,6 +12,8 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE imply ENABLE_MRC_CACHE imply ICH_SPI imply SCSI + 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 9621589..7f74346 100644 --- a/arch/x86/cpu/qemu/Kconfig +++ b/arch/x86/cpu/qemu/Kconfig @@ -9,6 +9,8 @@ config QEMU select ARCH_EARLY_INIT_R 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 a4d0b7d..1de9e4f 100644 --- a/arch/x86/cpu/quark/Kconfig +++ b/arch/x86/cpu/quark/Kconfig @@ -17,6 +17,8 @@ config INTEL_QUARK imply MMC_SDHCI imply MMC_SDHCI_SDMA 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 c91d624..08dc324 100644 --- a/arch/x86/cpu/queensbay/Kconfig +++ b/arch/x86/cpu/queensbay/Kconfig @@ -17,6 +17,8 @@ config INTEL_QUEENSBAY imply PCH_GBE imply SCSI 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 7655c1a..e53a7d9 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_defconfig @@ -31,7 +31,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
Like other peripheral drivers, move USB related drivers to platform Kconfig as well. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- 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(-)