aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2023-05-06 16:42:38 +0200
committerMarek Vasut <marex@denx.de>2023-05-17 01:51:39 +0200
commit6308731648de53e2bc9463e4510649dee8b8d03c (patch)
tree3f368f3724f969d827ca9b7bdf1dc388b8537ae0
parentdf104411d1a9e695cec2ca992c5798b2df38c92b (diff)
downloadu-boot-6308731648de53e2bc9463e4510649dee8b8d03c.zip
u-boot-6308731648de53e2bc9463e4510649dee8b8d03c.tar.gz
u-boot-6308731648de53e2bc9463e4510649dee8b8d03c.tar.bz2
usb: Move SPL_USB_STORAGE Kconfig symbol to drivers/usb/
To avoid piling up all the various Kconfig symbols in one place, i.e. common/spl/Kconfig, move the USB Kconfig symbols into drivers/usb/ . This commit moves SPL_USB_STORAGE and matching SYS_USB_FAT_BOOT_PARTITION . Signed-off-by: Marek Vasut <marex@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com>
-rw-r--r--common/spl/Kconfig17
-rw-r--r--drivers/usb/Kconfig22
2 files changed, 22 insertions, 17 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 03d0fd9..5ad29af 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1345,23 +1345,6 @@ config SPL_THERMAL
automatic power-off when the temperature gets too high or low. Other
devices may be discrete but connected on a suitable bus.
-config SPL_USB_STORAGE
- bool "Support loading from USB"
- depends on SPL_USB_HOST
- help
- Enable support for USB devices in SPL. This allows use of USB
- devices such as hard drives and flash drivers for loading U-Boot.
- The actual drivers are enabled separately using the normal U-Boot
- config options. This enables loading from USB using a configured
- device.
-
-config SYS_USB_FAT_BOOT_PARTITION
- int "Partition on USB to use to load U-Boot from"
- depends on SPL_USB_STORAGE
- default 1
- help
- Partition on the USB storage device to load U-Boot from
-
config SPL_USB_GADGET
bool "Suppport USB Gadget drivers"
help
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 94fb32d..a972d87 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -126,6 +126,28 @@ config USB_HUB_DEBOUNCE_TIMEOUT
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 SPL_USB_HOST
+
+comment "USB peripherals in SPL"
+
+config SPL_USB_STORAGE
+ bool "Support loading from USB"
+ help
+ Enable support for USB devices in SPL. This allows use of USB
+ devices such as hard drives and flash drivers for loading U-Boot.
+ The actual drivers are enabled separately using the normal U-Boot
+ config options. This enables loading from USB using a configured
+ device.
+
+config SYS_USB_FAT_BOOT_PARTITION
+ int "Partition on USB to use to load U-Boot from"
+ depends on SPL_USB_STORAGE
+ default 1
+ help
+ Partition on the USB storage device to load U-Boot from.
+
+endif
+
if USB_KEYBOARD
config USB_KEYBOARD_FN_KEYS