UPSTREAM: usb: Do not compile USB_STORAGE with BLK && !DM_USB

The USB storage driver does not compile when CONFIG_BLK is set,
but DM_USB is not set, as we're missing the DM device links for
CONFIG_BLK enabled code paths.

So far it looks like nobody fell into this trap, because no board
enabled CONFIG_BLK and CONFIG_USB_STORAGE while not enabling
CONFIG_DM_USB, but we should still reflect that dependency properly
in Kconfig so that implicit enabling of CONFIG_USB_STORAGE works.

Change-Id: I5f87b577eb94e0ee33036b7162fcece7e04841aa
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit dc03b704f4364da6df6a86aafccc3828ade8ed43)
This commit is contained in:
Alexander Graf 2018-10-19 14:41:01 +02:00 committed by Frank Wang
parent 3739bf7e20
commit 3da53cbff9
1 changed files with 1 additions and 0 deletions

View File

@ -66,6 +66,7 @@ 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.