diff options
| author | Tom Rini <trini@konsulko.com> | 2023-03-10 19:10:14 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-10 19:10:14 -0500 |
| commit | 1247fc7de81d8106cdfa64ecf18aba47a6e587f3 (patch) | |
| tree | 4421bfbc1a7c07089076ea44e005a8d173de51bc | |
| parent | 0e823300f5f74a31bc2b36443bbab117b77a7f1a (diff) | |
| parent | 4042ce73c8bee9077d80a42b27aa21f98636b780 (diff) | |
| download | u-boot-1247fc7de81d8106cdfa64ecf18aba47a6e587f3.zip u-boot-1247fc7de81d8106cdfa64ecf18aba47a6e587f3.tar.gz u-boot-1247fc7de81d8106cdfa64ecf18aba47a6e587f3.tar.bz2 | |
Merge https://source.denx.de/u-boot/custodians/u-boot-usbWIP/10Mar2023
Two minimal Kconfig/Makefile fixes for USB.
| -rw-r--r-- | common/Kconfig | 12 | ||||
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | drivers/usb/Kconfig | 11 |
3 files changed, 12 insertions, 13 deletions
diff --git a/common/Kconfig b/common/Kconfig index e3a5e1b..0afc01b 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1106,15 +1106,3 @@ config FDT_SIMPLEFB config IO_TRACE bool - -config USB_HUB_DEBOUNCE_TIMEOUT - int "Timeout in milliseconds for USB HUB connection" - depends on USB - default 1000 - help - Value in milliseconds of the USB connection timeout, the max delay to - wait the hub port status to be connected steadily after being powered - off and powered on in the usb hub driver. - This define allows to increase the HUB_DEBOUNCE_TIMEOUT default - value = 1s because some usb device needs around 1.5s to be initialized - and a 2s value should solve detection issue on problematic USB keys. diff --git a/common/Makefile b/common/Makefile index 252e965..a50302d 100644 --- a/common/Makefile +++ b/common/Makefile @@ -24,7 +24,7 @@ obj-$(CONFIG_CMD_MII) += miiphyutil.o obj-$(CONFIG_PHYLIB) += miiphyutil.o obj-$(CONFIG_USB_HOST) += usb.o usb_hub.o -obj-$(CONFIG_USB_GADGET) += usb.o usb_hub.o +obj-$(CONFIG_USB_GADGET) += usb.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o obj-$(CONFIG_USB_ONBOARD_HUB) += usb_onboard_hub.o diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index ebe6bf9..94fb32d 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -115,6 +115,17 @@ config USB_ONBOARD_HUB power regulator. An example for such a hub is the Microchip USB2514B. +config USB_HUB_DEBOUNCE_TIMEOUT + int "Timeout in milliseconds for USB HUB connection" + default 1000 + help + Value in milliseconds of the USB connection timeout, the max delay to + wait the hub port status to be connected steadily after being powered + off and powered on in the usb hub driver. + This define allows to increase the HUB_DEBOUNCE_TIMEOUT default + value = 1s because some usb device needs around 1.5s to be initialized + and a 2s value should solve detection issue on problematic USB keys. + if USB_KEYBOARD config USB_KEYBOARD_FN_KEYS |