The config SPL_DM_USB gives the user the option to be more selective in what phase the USB drivers should enabled.
Pass this concept to the dwc2_usb driver and make a SPL_USB_DWC2 config available in SPL to load U-boot (full) from a USB disk. Signed-off-by: Johan Jonker <[email protected]> --- Note: There are no boards with SPL_DM_USB and USB_DWC2 enabled, so no need for a default y. grep -l SPL_DM_USB `grep -l USB_DWC2 ./configs/*` Changed V4: (Jonas) reword replaced deprecated help word --- drivers/Makefile | 3 ++- drivers/usb/common/Makefile | 2 +- drivers/usb/host/Kconfig | 11 +++++++++++ drivers/usb/host/Makefile | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/Makefile b/drivers/Makefile index 43d0ba332818..87f755d8a35b 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -68,8 +68,9 @@ obj-$(CONFIG_SPL_MUSB_NEW) += usb/musb-new/ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/ obj-$(CONFIG_SPL_USB_GADGET) += usb/common/ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/udc/ -obj-$(CONFIG_SPL_WATCHDOG) += watchdog/ +obj-$(CONFIG_SPL_USB_HOST) += usb/common/ obj-$(CONFIG_SPL_USB_HOST) += usb/host/ +obj-$(CONFIG_SPL_WATCHDOG) += watchdog/ obj-$(CONFIG_SPL_SATA) += ata/ scsi/ obj-$(CONFIG_SPL_LEGACY_BLOCK) += block/ obj-$(CONFIG_SPL_THERMAL) += thermal/ diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile index db8f35c10c4f..5350cd668d03 100644 --- a/drivers/usb/common/Makefile +++ b/drivers/usb/common/Makefile @@ -4,7 +4,7 @@ # obj-$(CONFIG_$(PHASE_)DM_USB) += common.o -obj-$(CONFIG_USB_DWC2) += dwc2_core.o +obj-$(CONFIG_$(PHASE_)USB_DWC2) += dwc2_core.o obj-$(CONFIG_USB_GADGET_DWC2_OTG) += dwc2_core.o obj-$(CONFIG_USB_ISP1760) += usb_urb.o obj-$(CONFIG_USB_MUSB_HOST) += usb_urb.o diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index d75883e28650..fcea2a22e955 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -417,6 +417,17 @@ config USB_DWC2 operation is compliant to the controller Supplement. If you want to enable this controller in host mode, say Y. +config SPL_USB_DWC2 + bool "DesignWare USB2 Core support in SPL" + depends on SPL_DM && SPL_OF_CONTROL + select SPL_USB_HOST + help + The DesignWare USB 2.0 controller is compliant with the + USB-Implementers Forum (USB-IF) USB 2.0 specifications. + Hi-Speed (480 Mbps), Full-Speed (12 Mbps), and Low-Speed (1.5 Mbps) + operation is compliant to the controller Supplement. If you want to + enable this controller in host mode, say Y. + if USB_DWC2 config USB_DWC2_BUFFER_SIZE int "Data buffer size in kB" diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index ef4ce62a680c..ec99d0b3882a 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -57,4 +57,4 @@ obj-$(CONFIG_USB_XHCI_RCAR) += xhci-rcar.o obj-$(CONFIG_USB_XHCI_OCTEON) += dwc3-octeon-glue.o # designware -obj-$(CONFIG_USB_DWC2) += dwc2.o +obj-$(CONFIG_$(PHASE_)USB_DWC2) += dwc2.o -- 2.39.5
