| Message ID | 20221202214251.3027264-1-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 7d212af2b1cf19c643368668fafd2525fda26277 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/41] usb: Update USB_STORAGE dependencies | expand |
On Sat, 3 Dec 2022 at 10:43, Tom Rini <trini@konsulko.com> wrote: > > 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(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Fri, Dec 02, 2022 at 04:42:11PM -0500, Tom Rini wrote: > 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> For the series, applied to u-boot/next, thanks!
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.
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(-)