diff options
| author | Tom Rini <[email protected]> | 2022-12-22 10:33:04 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-12-22 10:33:04 -0500 |
| commit | 52d91e1c20b399ddab276e2c03e5788ed5e5fdd2 (patch) | |
| tree | 3da0b0377b27eedd5d702c77fbb63a0d905a3f77 /common | |
| parent | 14f43797d0a696248c09d298e2f2809dded345ba (diff) | |
| parent | 8214b772cf213f1f02e5e33f4a5158f52d9d2c23 (diff) | |
Merge branch '2022-12-21-CONFIG-migration-work' into next
- Bring in the second to last big batch of CONFIG migrations and
renames. Of note here we fix a few inconsistencies around the baudrate
tables on some SoCs and now are consistent in hostname/etc handling in
the environment.
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 1657c2ca969..f0f7acead74 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1347,7 +1347,7 @@ config SPL_USB_HOST config SPL_USB_STORAGE bool "Support loading from USB" - depends on SPL_USB_HOST && !(BLK && !DM_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. |