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>

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 4fbe172e05c87badc1555ff4fa52a79c913075d5..03746dd12fc9b3bd981458b8695ac728c98e72c3 100644 (file)
--- 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 55e0547b16965ea5cd22e9bdea18fd1ee54eb987..3bedbf213f477b6e245b2f31c74337cd73d1b05a 100644 (file)
--- 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 cb8c315a1510e57c6d19bcf5475f89ad65b59b8d..bfa565c4c3a4a6b5d3a31c079b757509382ace20 100644 (file)
--- 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