[PATCH 18/18] usb: Require migration to DM_USB and OF_CONTROL for non-SPL cases

Sat May 22 14:47:17 CEST 2021

As the deadline for migration passed with v2019.07, make support for USB
depend on DM and OF_CONTROL to be enabled.  Rework the Kconfig logic
slightly in a few places so that SPL gadget support can exist without
SPL_DM being required.  Update a few defconfigs to maintain their DM_USB
+ !SPL_DM_USB support.

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 Makefile                       | 2 --
 configs/devkit3250_defconfig   | 1 +
 configs/draco_defconfig        | 1 +
 configs/etamin_defconfig       | 1 +
 configs/imx6dl_mamoj_defconfig | 1 +
 configs/pxm2_defconfig         | 1 +
 configs/rastaban_defconfig     | 1 +
 configs/rut_defconfig          | 1 +
 configs/thuban_defconfig       | 1 +
 drivers/block/Kconfig          | 2 +-
 drivers/usb/Kconfig            | 9 +++++----
 11 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 9b45e0e26784..b7dd5570c9c4 100644
--- a/Makefile
+++ b/Makefile
@@ -1087,8 +1087,6 @@ ifneq ($(CONFIG_DM),y)
 	@echo >&2 "See doc/driver-model/migration.rst for more info."
 	@echo >&2 "===================================================="
 endif
-	$(call deprecated,CONFIG_DM_USB CONFIG_OF_CONTROL CONFIG_BLK,\
-		USB,v2019.07,$(CONFIG_USB))
 	$(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\
 		$(CONFIG_LCD)$(CONFIG_VIDEO))
 	$(call deprecated,CONFIG_DM_SPI_FLASH,SPI flash,v2019.07,\
diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig
index 93c048cee86b..104893bee2f8 100644
--- a/configs/devkit3250_defconfig
+++ b/configs/devkit3250_defconfig
@@ -54,5 +54,6 @@ CONFIG_PHY_SMSC=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_USB=y
+# CONFIG_SPL_DM_USB is not set
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index d48f8082755b..db7bd12866aa 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -89,6 +89,7 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
+# CONFIG_SPL_DM_USB is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_DSPS=y
diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index 3256fd3493ec..5c4045a58bc3 100644
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -90,6 +90,7 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
+# CONFIG_SPL_DM_USB is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_DSPS=y
diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig
index fa2adaf47d74..75c06d3663a3 100644
--- a/configs/imx6dl_mamoj_defconfig
+++ b/configs/imx6dl_mamoj_defconfig
@@ -52,6 +52,7 @@ CONFIG_PINCTRL_IMX6=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
 CONFIG_USB=y
+# CONFIG_SPL_DM_USB is not set
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 90ef4c8d99ac..6bd7b2100db5 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -91,6 +91,7 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
+# CONFIG_SPL_DM_USB is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_DSPS=y
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 63c62a5c0745..08cf934b3577 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -89,6 +89,7 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
+# CONFIG_SPL_DM_USB is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_DSPS=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 6fc06f1ed974..3cac8d6ca2dd 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -92,6 +92,7 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
+# CONFIG_SPL_DM_USB is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_DSPS=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index d1cc9a69bec8..cd1b3e4552d0 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -89,6 +89,7 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
+# CONFIG_SPL_DM_USB is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_DSPS=y
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 1e6dad86927f..4023332dd98c 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -1,7 +1,7 @@
 config BLK
 	bool "Support block devices"
 	depends on DM
-	default y if DM_MMC
+	default y if DM_MMC || DM_USB
 	help
 	  Enable support for block devices, such as SCSI, MMC and USB
 	  flash sticks. These provide a block-level interface which permits
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index f6975730bf8d..a3c0ceac1740 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -1,5 +1,7 @@
 menuconfig USB
 	bool "USB support"
+	depends on DM && OF_CONTROL
+	select DM_USB
 	---help---
 	  Universal Serial Bus (USB) is a specification for a serial bus
 	  subsystem which offers higher speeds and more features than the
@@ -31,11 +33,8 @@ menuconfig USB
 	  in <file:Documentation/usb/> and especially the links given in
 	  <file:Documentation/usb/usb-help.txt>.
 
-if USB
-
 config DM_USB
-	bool "Enable driver model for USB"
-	depends on USB && DM
+	bool
 	help
 	  Enable driver model for USB. The USB interface is then implemented
 	  by the USB uclass. Multiple USB controllers of different types
@@ -47,6 +46,8 @@ config DM_USB
 	  declared with the U_BOOT_USB_DEVICE() macro and will be
 	  automatically probed when found on the bus.
 
+if USB
+
 config SPL_DM_USB
 	bool "Enable driver model for USB in SPL"
 	depends on SPL_DM && DM_USB
-- 
2.17.1

