summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Schwermer <sven@svenschwermer.de>2018-11-21 08:43:53 +0100
committerMarek Vasut <marex@denx.de>2018-11-26 21:19:03 +0100
commit41a25f46044c5f9b57197cfcc931106a3b8327d7 (patch)
tree946bfa5f21d89f054c2b8a5e8f108ca1ff36e378
parent6b21502229035779059493b2193fd790448fe85e (diff)
usb: Introduce CONFIG_SPL_DM_USB
This allows building the SPL without driver model for USB. Since CONFIG_SPL_DM_USB is enabled if and only if CONFIG_DM_USB was enabled before, this patch does not change the build behaviour. Signed-off-by: Sven Schwermer <sven@svenschwermer.de>
-rw-r--r--drivers/usb/Kconfig5
-rw-r--r--drivers/usb/common/Makefile2
-rw-r--r--drivers/usb/host/Makefile2
3 files changed, 7 insertions, 2 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 4fbe172e05c..03746dd12fc 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -47,6 +47,11 @@ config DM_USB
declared with the U_BOOT_USB_DEVICE() macro and will be
automatically probed when found on the bus.
+config SPL_DM_USB
+ bool "Enable driver model for USB in SPL"
+ depends on DM_USB
+ default y
+
source "drivers/usb/host/Kconfig"
source "drivers/usb/dwc3/Kconfig"
diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile
index 55e0547b169..3bedbf213f4 100644
--- a/drivers/usb/common/Makefile
+++ b/drivers/usb/common/Makefile
@@ -3,6 +3,6 @@
# (C) Copyright 2016 Freescale Semiconductor, Inc.
#
-obj-$(CONFIG_DM_USB) += common.o
+obj-$(CONFIG_$(SPL_)DM_USB) += common.o
obj-$(CONFIG_USB_EHCI_FSL) += fsl-dt-fixup.o fsl-errata.o
obj-$(CONFIG_USB_XHCI_FSL) += fsl-dt-fixup.o fsl-errata.o
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index cb8c315a151..bfa565c4c3a 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -3,7 +3,7 @@
# (C) Copyright 2000-2007
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-ifdef CONFIG_DM_USB
+ifdef CONFIG_$(SPL_)DM_USB
obj-$(CONFIG_CMD_USB) += usb-uclass.o
obj-$(CONFIG_SANDBOX) += usb-sandbox.o
endif