usb: arrange Kconfig entries for USB host support
cover usb: arrange Kconfig entries for USB host support
We have CONFIG_USB_GADGET, while we do not have an option to turn on/off USB host support.
In Linux, CONFIG_USB is used to enable the USB host support, but it is used in U-Boot to enable the whole USB sub-system. So, as an alternative, this commit adds CONFIG_USB_HOST and I think it makes sense enough.
Masahiro Yamada (3):
usb: add CONIFG_USB_OHCI_HCD in Kconfig
usb: add CONFIG_USB_UHCI_HCD in Kconfig
usb: add (move) CONFIG_USB_HOST to Kconfig
configs/axs103_defconfig | 1 + drivers/usb/host/Kconfig | 59 +++++++++++++++++++++++++++++++++++-------- include/configs/am43xx_evm.h | 1 - include/configs/am57xx_evm.h | 1 - include/configs/cm_t43.h | 1 - include/configs/cm_t54.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/duovero.h | 1 - include/configs/omap4_panda.h | 1 - include/configs/omap5_uevm.h | 1 - 10 files changed, 50 insertions(+), 18 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/3 usb: add CONIFG_USB_OHCI_HCD in Kconfig
Add this option as a common config for all OHCI controllers. Its help message was copied from Linux. Also, I moved it below EHCI to respect the order in Linux's Kconfig.
Add CONFIG_USB_OHCI_HCD=y to axs103_defconfig, which is the only user of OHCI_GENERIC.
---
configs/axs103_defconfig | 1 + drivers/usb/host/Kconfig | 35 +++++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-)
configs/axs103_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_STORAGE=y CONFIG_USE_PRIVATE_LIBGCC=y
drivers/usb/host/Kconfig +25 -10
@@ -24,15 +24,7 @@ config USB_XHCI_DWC3 Say Y or if your system has a Dual Role SuperSpeed USB controller based on the DesignWare USB3 IP Core. -endif - -config USB_OHCI_GENERIC - bool "Support for generic OHCI USB controller" - depends on OF_CONTROL - depends on DM_USB - default n - ---help--- - Enables support for generic OHCI controller. +endif # USB_XHCI_HCD config USB_EHCI_HCD bool "EHCI HCD (USB 2.0) support"
@@ -100,4 +92,27 @@ config USB_EHCI_GENERIC ---help--- Enables support for generic EHCI controller. -endif +endif # USB_EHCI_HCD + +config USB_OHCI_HCD + bool "OHCI HCD (USB 1.1) support" + ---help--- + The Open Host Controller Interface (OHCI) is a standard for accessing + USB 1.1 host controller hardware. It does more in hardware than Intel's + UHCI specification. If your USB host controller follows the OHCI spec, + say Y. On most non-x86 systems, and on x86 hardware that's not using a + USB controller from Intel or VIA, this is appropriate. If your host + controller doesn't use PCI, this is probably appropriate. For a PCI + based system where you're not sure, the "lspci -v" entry will list the + right "prog-if" for your USB controller(s): EHCI, OHCI, or UHCI. + +if USB_OHCI_HCD + +config USB_OHCI_GENERIC + bool "Support for generic OHCI USB controller" + depends on OF_CONTROL + depends on DM_USB + ---help--- + Enables support for generic OHCI controller. + +endif # USB_OHCI_HCD
Signature · 1 line
1.9.1
PATCH 1/3 usb: add CONIFG_USB_OHCI_HCD in Kconfig
"CONIFG"?
rday
PATCH 1/3 usb: add CONIFG_USB_OHCI_HCD in Kconfig
2016-07-31 18:38 GMT+09:00 Robert P. J. Day <[email protected]>:
Quoted 3 lines
"CONIFG"?
I will fix it in v2.
Thanks!
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 1/3 usb: add CONIFG_USB_OHCI_HCD in Kconfig
In reply to Masahiro YamadaHi?Masahiro-san,
Quoted 9 lines · Masahiro Yamada
Add this option as a common config for all OHCI controllers.??Its help message was copied from Linux.??Also, I moved it below EHCI to respect the order in Linux's
Kconfig.Add
CONFIG_USB_OHCI_HCD=ytoaxs103_defconfig, which is the only user ofOHCI_GENERIC.Signed-off-by Masahiro Yamada <[email protected]>---
There's such a thing like "new OHCI driver" which is enabled by CONFIG_USB_OHCI_NEW (as of today in config headers) and some OHCI drivers rely on it.
I'd say it is a very good candidate to go to Kconfig especially for those boards that use DM_USB.
Not sure if that makes sense for boards except axs103 in your change-set though.
-Alexey
PATCH 2/3 usb: add CONFIG_USB_UHCI_HCD in Kconfig
In reply to Masahiro YamadaThere is no UHCI driver entry in Kconfig for now, but we have some UHCI drivers, for example, LEON. This is a placeholder in case we want to move them to Kconfig in the future.
The help message was copied from Linux.
---
drivers/usb/host/Kconfig | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/usb/host/Kconfig +17 -0
@@ -116,3 +116,20 @@ config USB_OHCI_GENERIC Enables support for generic OHCI controller. endif # USB_OHCI_HCD + +config USB_UHCI_HCD + bool "UHCI HCD (most Intel and VIA) support" + ---help--- + The Universal Host Controller Interface is a standard by Intel for + accessing the USB hardware in the PC (which is also called the USB + host controller). If your USB host controller conforms to this + standard, you may want to say Y, but see below. All recent boards + with Intel PCI chipsets (like intel 430TX, 440FX, 440LX, 440BX, + i810, i820) conform to this standard. Also all VIA PCI chipsets + (like VIA VP2, VP3, MVP3, Apollo Pro, Apollo Pro II or Apollo Pro + 133) and LEON/GRLIB SoCs with the GRUSBHC controller. + If unsure, say Y. + +if USB_UHCI_HCD + +endif # USB_UHCI_HCD
Signature · 1 line
1.9.1
PATCH 3/3 usb: add (move) CONFIG_USB_HOST to Kconfig
In reply to Masahiro YamadaThe 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 6e7e9294d321 ("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 68f7c5db2d1e ("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.
---
drivers/usb/host/Kconfig | 7 +++++++ include/configs/am43xx_evm.h | 1 - include/configs/am57xx_evm.h | 1 - include/configs/cm_t43.h | 1 - include/configs/cm_t54.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/duovero.h | 1 - include/configs/omap4_panda.h | 1 - include/configs/omap5_uevm.h | 1 - 9 files changed, 7 insertions(+), 8 deletions(-)
drivers/usb/host/Kconfig +7 -0
@@ -3,8 +3,12 @@ # comment "USB Host Controller Drivers" +config USB_HOST + bool + config USB_XHCI_HCD bool "xHCI HCD (USB 3.0) support" + select USB_HOST ---help--- The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0 "SuperSpeed" host controller hardware.
@@ -28,6 +32,7 @@ endif # USB_XHCI_HCD config USB_EHCI_HCD bool "EHCI HCD (USB 2.0) support" + select USB_HOST ---help--- The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
@@ -112,6 +117,7 @@ config USB_OHCI_GENERIC bool "Support for generic OHCI USB controller" depends on OF_CONTROL depends on DM_USB + select USB_HOST ---help--- Enables support for generic OHCI controller.
@@ -119,6 +125,7 @@ endif # USB_OHCI_HCD config USB_UHCI_HCD bool "UHCI HCD (most Intel and VIA) support" + select USB_HOST ---help--- The Universal Host Controller Interface is a standard by Intel for accessing the USB hardware in the PC (which is also called the USB
include/configs/am43xx_evm.h +0 -1
@@ -98,7 +98,6 @@#if defined(CONFIG_SPL_USB_HOST_SUPPORT ) || !defined(CONFIG_SPL_BUILD )#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 -#define CONFIG_USB_HOST #define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
include/configs/am57xx_evm.h +0 -1
@@ -63,7 +63,6 @@#define CONFIG_SUPPORT_EMMC_BOOT /* USB xHCI HOST */ -#define CONFIG_USB_HOST #define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
include/configs/cm_t43.h +0 -1
@@ -60,7 +60,6 @@#define CONFIG_SYS_RX_ETH_BUFFER 64/* USB support */ -#define CONFIG_USB_HOST #define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
include/configs/cm_t54.h +0 -1
@@ -69,7 +69,6 @@#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN)/* USB UHH support options */ -#define CONFIG_USB_HOST #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_STORAGE
include/configs/dra7xx_evm.h +0 -1
@@ -210,7 +210,6 @@#define CONFIG_SUPPORT_EMMC_BOOT /* USB xHCI HOST */ -#define CONFIG_USB_HOST #define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
include/configs/duovero.h +0 -1
@@ -29,7 +29,6 @@#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS /* USB UHH support options */ -#define CONFIG_USB_HOST #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_STORAGE
include/configs/omap4_panda.h +0 -1
@@ -17,7 +17,6 @@*/ /* USB UHH support options */ -#define CONFIG_USB_HOST #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_STORAGE
include/configs/omap5_uevm.h +0 -1
@@ -88,7 +88,6 @@#define CONFIG_SYS_I2C_TCA642X_ADDR 0x22/* USB UHH support options */ -#define CONFIG_USB_HOST #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_STORAGE
Signature · 1 line
1.9.1