summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartyn Welch <martyn@welchs.me.uk>2018-12-10 11:05:16 +0000
committerMarek Vasut <marex@denx.de>2018-12-14 17:59:08 +0100
commit16ecb295b3834d8017d922ae46eedbbf6fd6c99b (patch)
treefb2477fef9ed7dca01c68ca50690d30e7de43b9a
parent916fa097997a5e1b70768ce944de28e038d4bebf (diff)
usb: Don't enable CONFIG_SPL_DM_USB for non-DM SPL
When CONFIG_SPL_DM_USB was added, it was added defaulted on without protection to ensure it didn't get set for non-DM SPL builds. This leads to unexpected and confusing failures when building a DM based U-Boot but with a non-DM SPL, as the defconfig is unlikely to have CONFIG_SPL_DM_USB actively disabled. Tweak the Kconfig to not enable this setting unless CONFIG_SPL_DM is set. Signed-off-by: Martyn Welch <martyn.welch@collabora.com>
-rw-r--r--drivers/usb/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 98f83433be..3b53bf2c58 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -49,7 +49,7 @@ config DM_USB
config SPL_DM_USB
bool "Enable driver model for USB in SPL"
- depends on DM_USB
+ depends on SPL_DM && DM_USB
default y
config DM_USB_GADGET