[PATCH 01/41] usb: Update USB_STORAGE dependencies

Tom Rini
2022-12-02T21:43:01Z

As it's no longer possible to have !DM_USB set, we can remove these
dependencies.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
common/spl/Kconfig | 2 +-
drivers/usb/Kconfig | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index c6da4a403e98..78797e99e02d 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.
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 3afb45d5ccb2..8efd46145736 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -93,7 +93,6 @@ comment "USB peripherals"

config USB_STORAGE
bool "USB Mass Storage support"
- depends on !(BLK && !DM_USB)
---help---
Say Y here if you want to connect USB mass storage devices to your
board's USB port.
--
2.25.1