sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

usb: add (move) CONFIG_USB_HOST to Kconfig 

The meaning of CONFIG_USB in U-Boot is different from that in Linux.

As you see in drivers/usb/Kconfig of Linux, CONFIG_USB enables the
USB host controller support, while CONFIG_USB_SUPPORT is used to
enable the whole of the USB sub-system.

When I added CONFIG_USB into Kconfig by commit 6e7e9294d3 ("usb:
add basic USB configs in Kconfig"), I planned to follow the Linux's
convention, i.e. CONFIG_USB to enable/disable the USB host support.

Then, commit 68f7c5db2d ("usb: Generic USB Kconfig option, that
fits both host and gadget and comments") changed the logic of the
CONFIG_USB to point to the whole of the USB sub-system.  As a result,
currently we do not have an option for USB host.

This commit adds CONFIG_USB_HOST, which will be useful to compile
in the USB host support code.

CONFIG_USB_HOST is not referenced at all, but strangely some boards
define it in board headers.  I removed them because USB_HOST will be
selected in Kconfig going forward.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-08-01 00:16:34 +09:00 committed by Marek Vasut
parent 96d8284bd5
commit 2b58e1b76d
9 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/host/Kconfig
View File

@ -3,8 +3,12 @@
# #
comment "USB Host Controller Drivers" comment "USB Host Controller Drivers"
config USB_HOST
bool
config USB_XHCI_HCD config USB_XHCI_HCD
bool "xHCI HCD (USB 3.0) support" bool "xHCI HCD (USB 3.0) support"
select USB_HOST
---help--- ---help---
The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0 The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
"SuperSpeed" host controller hardware. "SuperSpeed" host controller hardware.
@ -28,6 +32,7 @@ endif # USB_XHCI_HCD
config USB_EHCI_HCD config USB_EHCI_HCD
bool "EHCI HCD (USB 2.0) support" bool "EHCI HCD (USB 2.0) support"
select USB_HOST
---help--- ---help---
The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
"high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware. "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
@ -128,6 +133,7 @@ config USB_OHCI_GENERIC
bool "Support for generic OHCI USB controller" bool "Support for generic OHCI USB controller"
depends on OF_CONTROL depends on OF_CONTROL
depends on DM_USB depends on DM_USB
select USB_HOST
---help--- ---help---
Enables support for generic OHCI controller. Enables support for generic OHCI controller.
@ -135,6 +141,7 @@ endif # USB_OHCI_HCD
config USB_UHCI_HCD config USB_UHCI_HCD
bool "UHCI HCD (most Intel and VIA) support" bool "UHCI HCD (most Intel and VIA) support"
select USB_HOST
---help--- ---help---
The Universal Host Controller Interface is a standard by Intel for The Universal Host Controller Interface is a standard by Intel for
accessing the USB hardware in the PC (which is also called the USB accessing the USB hardware in the PC (which is also called the USB

1
include/configs/am43xx_evm.h
View File

@ -98,7 +98,6 @@
#if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD)
#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
#define CONFIG_USB_HOST
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2

1
include/configs/am57xx_evm.h
View File

@ -63,7 +63,6 @@
#define CONFIG_SUPPORT_EMMC_BOOT #define CONFIG_SUPPORT_EMMC_BOOT
/* USB xHCI HOST */ /* USB xHCI HOST */
#define CONFIG_USB_HOST
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2

1
include/configs/cm_t43.h
View File

@ -60,7 +60,6 @@
#define CONFIG_SYS_RX_ETH_BUFFER 64 #define CONFIG_SYS_RX_ETH_BUFFER 64
/* USB support */ /* USB support */
#define CONFIG_USB_HOST
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2

1
include/configs/cm_t54.h
View File

@ -69,7 +69,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN) CONFIG_SYS_SCSI_MAX_LUN)
/* USB UHH support options */ /* USB UHH support options */
#define CONFIG_USB_HOST
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_EHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE

1
include/configs/dra7xx_evm.h
View File

@ -209,7 +209,6 @@
#define CONFIG_SUPPORT_EMMC_BOOT #define CONFIG_SUPPORT_EMMC_BOOT
/* USB xHCI HOST */ /* USB xHCI HOST */
#define CONFIG_USB_HOST
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2

1
include/configs/duovero.h
View File

@ -29,7 +29,6 @@
#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
/* USB UHH support options */ /* USB UHH support options */
#define CONFIG_USB_HOST
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_EHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE

1
include/configs/omap4_panda.h
View File

@ -17,7 +17,6 @@
*/ */
/* USB UHH support options */ /* USB UHH support options */
#define CONFIG_USB_HOST
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_EHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE

1
include/configs/omap5_uevm.h
View File

@ -88,7 +88,6 @@
#define CONFIG_SYS_I2C_TCA642X_ADDR 0x22 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
/* USB UHH support options */ /* USB UHH support options */
#define CONFIG_USB_HOST
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_EHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE