usb: Update USB_STORAGE dependencies

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

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 1657c2ca96970ba4ca13a4e3522d3b7338e6fc7f..f0f7acead74c2d7e6811fd4437f36a8d9624af5a 100644 (file)
--- 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 3afb45d5ccb27ebd6a432cd1da8063d046e87444..8efd4614573649ae18185cf3d6ee7d73756345fc 100644 (file)
--- 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.