From 3da53cbff947503ae0321c511c4210439c29746f Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 19 Oct 2018 14:41:01 +0200 Subject: [PATCH] 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 Signed-off-by: Frank Wang (cherry picked from commit dc03b704f4364da6df6a86aafccc3828ade8ed43) --- drivers/usb/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 998fae79f2..06291a82fa 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -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.