Skip to contentSkip to conversation

common: Break USB_STORAGE dependency between SPL and u-boot proper

PATCH New Abel Vesa 4 participants 10 messages Jan 15, 2019 – Jan 16, 2019

Subsystems (2)
lore
Share & tools
lore

Abel Vesa

author
#0 lore raw

PATCH 1/1 common: Break USB_STORAGE dependency between SPL and u-boot proper

Some boards might need USB_STORAGE enabled in u-boot proper but not in SPL. Make a separate config for SPL and keep the same depends on conditions but for SPL.

---
 common/Makefile                | 2 +-
 configs/apalis_imx6_defconfig  | 1 +
 configs/colibri_imx6_defconfig | 1 +
 configs/mx6sabresd_defconfig   | 1 +
 drivers/usb/Kconfig            | 8 ++++++++
 5 files changed, 12 insertions(+), 1 deletion(-)
common/Makefile +1 -1
index 0de60b3..34931f3 100644
@@ -77,7 +77,7 @@ obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
 
 ifdef CONFIG_SPL_USB_HOST_SUPPORT
 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
-obj-$(CONFIG_USB_STORAGE) += usb_storage.o
+obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o
 else
 obj-$(CONFIG_USB_MUSB_HOST) += usb.o
 endif
configs/apalis_imx6_defconfig +1 -0
index e02d9bc..c4916ad 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Apalis iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/colibri_imx6_defconfig +1 -0
index 68f0746..441a4e7 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Colibri iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/mx6sabresd_defconfig +1 -0
index 1857c18..3532fce 100644
@@ -21,6 +21,7 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
drivers/usb/Kconfig +8 -0
index 3b53bf2..4185e16 100644
@@ -89,6 +89,14 @@ config USB_STORAGE
 	  Say Y here if you want to connect USB mass storage devices to your
 	  board's USB port.
 
+config SPL_USB_STORAGE
+	bool "SPL USB Mass Storage support"
+	depends on !(SPL_BLK && !SPL_DM_USB)
+	---help---
+	  Say Y here if you want to connect USB mass storage devices to your
+	  board's USB port in SPL.
+
+
 config USB_KEYBOARD
 	bool "USB Keyboard support"
 	select SYS_STDIO_DEREGISTER
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 common: Break USB_STORAGE dependency between SPL and u-boot proper

Quoted 2 lines · Abel Vesa

Some boards might need USB_STORAGE enabled in u-boot proper but not in SPL. Make a separate config for SPL and keep the same depends on conditions but for SPL.

Is this new or is this something which worked before and broke in the last few releases ? I recall discussing a patch changing this behavior before.

Quoted 14 lines
---
 common/Makefile                | 2 +-
 configs/apalis_imx6_defconfig  | 1 +
 configs/colibri_imx6_defconfig | 1 +
 configs/mx6sabresd_defconfig   | 1 +
 drivers/usb/Kconfig            | 8 ++++++++
 5 files changed, 12 insertions(+), 1 deletion(-)
common/Makefile +0 -0
index 0de60b3..34931f3 100644

common/Makefile obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o · line 80

Quoted 5 lines
common/Makefile +1 -1
@@ -77,7 +77,7 @@ obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
 
 ifdef CONFIG_SPL_USB_HOST_SUPPORT
 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
-obj-$(CONFIG_USB_STORAGE) += usb_storage.o
+obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o

Should be obj-$(CONFIG_$(SPL_)USB_STORAGE) += usb_storage.o

Quoted 59 lines
common/Makefile +0 -0
 else
 obj-$(CONFIG_USB_MUSB_HOST) += usb.o
 endif
configs/apalis_imx6_defconfig +1 -0
index e02d9bc..c4916ad 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Apalis iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/colibri_imx6_defconfig +1 -0
index 68f0746..441a4e7 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Colibri iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/mx6sabresd_defconfig +1 -0
index 1857c18..3532fce 100644
@@ -21,6 +21,7 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
drivers/usb/Kconfig +8 -0
index 3b53bf2..4185e16 100644
@@ -89,6 +89,14 @@ config USB_STORAGE
 	  Say Y here if you want to connect USB mass storage devices to your
 	  board's USB port.
 
+config SPL_USB_STORAGE
+	bool "SPL USB Mass Storage support"
+	depends on !(SPL_BLK && !SPL_DM_USB)
+	---help---
+	  Say Y here if you want to connect USB mass storage devices to your
+	  board's USB port in SPL.
+
+
 config USB_KEYBOARD
 	bool "USB Keyboard support"
 	select SYS_STDIO_DEREGISTER
Signature · 2 lines
Best regards,
Marek Vasut
author
#2 lore raw

PATCH 1/1 common: Break USB_STORAGE dependency between SPL and u-boot proper

Quoted 7 lines · Marek Vasut
Quoted 2 lines · Abel Vesa

Some boards might need USB_STORAGE enabled in u-boot proper but not in SPL. Make a separate config for SPL and keep the same depends on conditions but for SPL.

Is this new or is this something which worked before and broke in the last few releases ? I recall discussing a patch changing this behavior before.

I don't know about any discussion. I met this issue now that I'm trying to get FIT + DM in SPL for mx6sabresd . On mx6sabresd, the SPL doesn't fit into sram when DM + FIT is enabled if I leave the USB_STORAGE in. So that's the reason I need this splitting.

Quoted 16 lines
Quoted 16 lines
---
 common/Makefile                | 2 +-
 configs/apalis_imx6_defconfig  | 1 +
 configs/colibri_imx6_defconfig | 1 +
 configs/mx6sabresd_defconfig   | 1 +
 drivers/usb/Kconfig            | 8 ++++++++
 5 files changed, 12 insertions(+), 1 deletion(-)
common/Makefile +0 -0
index 0de60b3..34931f3 100644
@@ -77,7 +77,7 @@ obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
 
Quoted 7 lines

common/Makefile obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o · line 80

Quoted 4 lines
common/Makefile +1 -1
 ifdef CONFIG_SPL_USB_HOST_SUPPORT
 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
-obj-$(CONFIG_USB_STORAGE) += usb_storage.o
+obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o

Should be obj-$(CONFIG_$(SPL_)USB_STORAGE) += usb_storage.o

Will fix and resend.

Quoted 64 lines
Quoted 59 lines
common/Makefile +0 -0
 else
 obj-$(CONFIG_USB_MUSB_HOST) += usb.o
 endif
configs/apalis_imx6_defconfig +1 -0
index e02d9bc..c4916ad 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Apalis iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/colibri_imx6_defconfig +1 -0
index 68f0746..441a4e7 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Colibri iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/mx6sabresd_defconfig +1 -0
index 1857c18..3532fce 100644
@@ -21,6 +21,7 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
drivers/usb/Kconfig +8 -0
index 3b53bf2..4185e16 100644
@@ -89,6 +89,14 @@ config USB_STORAGE
 	  Say Y here if you want to connect USB mass storage devices to your
 	  board's USB port.
 
+config SPL_USB_STORAGE
+	bool "SPL USB Mass Storage support"
+	depends on !(SPL_BLK && !SPL_DM_USB)
+	---help---
+	  Say Y here if you want to connect USB mass storage devices to your
+	  board's USB port in SPL.
+
+
 config USB_KEYBOARD
 	bool "USB Keyboard support"
 	select SYS_STDIO_DEREGISTER
Signature · 2 lines
Best regards,
Marek Vasut
#3 lore raw

PATCH 1/1 common: Break USB_STORAGE dependency between SPL and u-boot proper

In reply to Abel Vesa
Quoted 11 lines · Abel Vesa

Some boards might need USB_STORAGE enabled in u-boot proper but not in SPL. Make a separate config for SPL and keep the same depends on conditions but for SPL.

---
 common/Makefile                | 2 +-
 configs/apalis_imx6_defconfig  | 1 +
 configs/colibri_imx6_defconfig | 1 +
 configs/mx6sabresd_defconfig   | 1 +
 drivers/usb/Kconfig            | 8 ++++++++
 5 files changed, 12 insertions(+), 1 deletion(-)

New config SPL_USB_STORAGE should be enabled for all boards that currently have CONFIG_SPL_USB_HOST_SUPPORT=y and CONFIG_USB_STORAGE=y right? I see that atleast configs/am43xx_evm_usbhost_boot_defconfig is not in the above list.

Regards
Vignesh

Quoted 70 lines
common/Makefile +1 -1
index 0de60b3..34931f3 100644
@@ -77,7 +77,7 @@ obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
 
 ifdef CONFIG_SPL_USB_HOST_SUPPORT
 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
-obj-$(CONFIG_USB_STORAGE) += usb_storage.o
+obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o
 else
 obj-$(CONFIG_USB_MUSB_HOST) += usb.o
 endif
configs/apalis_imx6_defconfig +1 -0
index e02d9bc..c4916ad 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Apalis iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/colibri_imx6_defconfig +1 -0
index 68f0746..441a4e7 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Colibri iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/mx6sabresd_defconfig +1 -0
index 1857c18..3532fce 100644
@@ -21,6 +21,7 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
drivers/usb/Kconfig +8 -0
index 3b53bf2..4185e16 100644
@@ -89,6 +89,14 @@ config USB_STORAGE
 	  Say Y here if you want to connect USB mass storage devices to your
 	  board's USB port.
 
+config SPL_USB_STORAGE
+	bool "SPL USB Mass Storage support"
+	depends on !(SPL_BLK && !SPL_DM_USB)
+	---help---
+	  Say Y here if you want to connect USB mass storage devices to your
+	  board's USB port in SPL.
+
+
 config USB_KEYBOARD
 	bool "USB Keyboard support"
 	select SYS_STDIO_DEREGISTER
Signature · 2 lines
Regards
Vignesh
author
#4 lore raw

PATCH 1/1 common: Break USB_STORAGE dependency between SPL and u-boot proper

Quoted 15 lines · Vignesh R
Quoted 11 lines · Abel Vesa

Some boards might need USB_STORAGE enabled in u-boot proper but not in SPL. Make a separate config for SPL and keep the same depends on conditions but for SPL.

---
 common/Makefile                | 2 +-
 configs/apalis_imx6_defconfig  | 1 +
 configs/colibri_imx6_defconfig | 1 +
 configs/mx6sabresd_defconfig   | 1 +
 drivers/usb/Kconfig            | 8 ++++++++
 5 files changed, 12 insertions(+), 1 deletion(-)
Quoted 5 lines

New config SPL_USB_STORAGE should be enabled for all boards that currently have CONFIG_SPL_USB_HOST_SUPPORT=y and CONFIG_USB_STORAGE=y right? I see that atleast configs/am43xx_evm_usbhost_boot_defconfig is not in the above list.

As of commit ('d368926 Prepare v2019.01'),

$ grep USB_STORAGE configs/am43xx_evm_usbhost_boot_defconfig
$ 

so it doesn't seem to be the case.

Quoted 77 lines

Regards
Vignesh

Quoted 70 lines
common/Makefile +1 -1
index 0de60b3..34931f3 100644
@@ -77,7 +77,7 @@ obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
 
 ifdef CONFIG_SPL_USB_HOST_SUPPORT
 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
-obj-$(CONFIG_USB_STORAGE) += usb_storage.o
+obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o
 else
 obj-$(CONFIG_USB_MUSB_HOST) += usb.o
 endif
configs/apalis_imx6_defconfig +1 -0
index e02d9bc..c4916ad 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Apalis iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/colibri_imx6_defconfig +1 -0
index 68f0746..441a4e7 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Colibri iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/mx6sabresd_defconfig +1 -0
index 1857c18..3532fce 100644
@@ -21,6 +21,7 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
drivers/usb/Kconfig +8 -0
index 3b53bf2..4185e16 100644
@@ -89,6 +89,14 @@ config USB_STORAGE
 	  Say Y here if you want to connect USB mass storage devices to your
 	  board's USB port.
 
+config SPL_USB_STORAGE
+	bool "SPL USB Mass Storage support"
+	depends on !(SPL_BLK && !SPL_DM_USB)
+	---help---
+	  Say Y here if you want to connect USB mass storage devices to your
+	  board's USB port in SPL.
+
+
 config USB_KEYBOARD
 	bool "USB Keyboard support"
 	select SYS_STDIO_DEREGISTER
Signature · 2 lines
Regards
Vignesh
#5 lore raw

PATCH 1/1 common: Break USB_STORAGE dependency between SPL and u-boot proper

Quoted 22 lines · Abel Vesa
Quoted 15 lines · Vignesh R
Quoted 11 lines · Abel Vesa

Some boards might need USB_STORAGE enabled in u-boot proper but not in SPL. Make a separate config for SPL and keep the same depends on conditions but for SPL.

---
 common/Makefile                | 2 +-
 configs/apalis_imx6_defconfig  | 1 +
 configs/colibri_imx6_defconfig | 1 +
 configs/mx6sabresd_defconfig   | 1 +
 drivers/usb/Kconfig            | 8 ++++++++
 5 files changed, 12 insertions(+), 1 deletion(-)
Quoted 5 lines

New config SPL_USB_STORAGE should be enabled for all boards that currently have CONFIG_SPL_USB_HOST_SUPPORT=y and CONFIG_USB_STORAGE=y right? I see that atleast configs/am43xx_evm_usbhost_boot_defconfig is not in the above list.

Quoted 7 lines

As of commit ('d368926 Prepare v2019.01'),

$ grep USB_STORAGE configs/am43xx_evm_usbhost_boot_defconfig
$ 

so it doesn't seem to be the case.

Ok, I see its removed as USB_STORAGE is implied for DISTRO_DEFAULTS.

toplevel Kconfig has:
config DISTRO_DEFAULTS

	...
        imply USB_STORAGE

So, you should probably add something like:
imply SPL_USB_STORAGE if SPL_USB_HOST_SUPPORT

at all places where there is "imply USB_STORAGE" currently.

Regards
Vignesh

Quoted 75 lines
Quoted 75 lines
Quoted 71 lines
common/Makefile +1 -1
index 0de60b3..34931f3 100644
@@ -77,7 +77,7 @@ obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
 
 ifdef CONFIG_SPL_USB_HOST_SUPPORT
 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
-obj-$(CONFIG_USB_STORAGE) += usb_storage.o
+obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o
 else
 obj-$(CONFIG_USB_MUSB_HOST) += usb.o
 endif
configs/apalis_imx6_defconfig +1 -0
index e02d9bc..c4916ad 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Apalis iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/colibri_imx6_defconfig +1 -0
index 68f0746..441a4e7 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Colibri iMX6 # "
 CONFIG_CMD_BOOTZ=y
configs/mx6sabresd_defconfig +1 -0
index 1857c18..3532fce 100644
@@ -21,6 +21,7 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_USB_STORAGE=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
drivers/usb/Kconfig +8 -0
index 3b53bf2..4185e16 100644
@@ -89,6 +89,14 @@ config USB_STORAGE
 	  Say Y here if you want to connect USB mass storage devices to your
 	  board's USB port.
 
+config SPL_USB_STORAGE
+	bool "SPL USB Mass Storage support"
+	depends on !(SPL_BLK && !SPL_DM_USB)
+	---help---
+	  Say Y here if you want to connect USB mass storage devices to your
+	  board's USB port in SPL.
+
+
 config USB_KEYBOARD
 	bool "USB Keyboard support"
 	select SYS_STDIO_DEREGISTER
Signature · 2 lines
Regards
Vignesh
#6 lore raw

PATCH 1/1 common: Break USB_STORAGE dependency between SPL and u-boot proper

In reply to Abel Vesa
Quoted 11 lines · Abel Vesa

Some boards might need USB_STORAGE enabled in u-boot proper but not in SPL. Make a separate config for SPL and keep the same depends on conditions but for SPL.

---
 common/Makefile                | 2 +-
 configs/apalis_imx6_defconfig  | 1 +
 configs/colibri_imx6_defconfig | 1 +
 configs/mx6sabresd_defconfig   | 1 +
 drivers/usb/Kconfig            | 8 ++++++++
 5 files changed, 12 insertions(+), 1 deletion(-)

The root problem here, as I discovered today digging in another patch is that in essence CONFIG_SPL_USB_SUPPORT is mis-named and should be CONFIG_SPL_USB_STORAGE and all cases in Makefiles of obj-$(CONFIG_USB_STORAGE) should be obj-$(CONFIG_$(SPL_)USB_STORAGE) and common/spl/spl_usb.c have its ifdef's cleaned slightly as that code cannot function without CONFIG_USB_STORAGE set (stor_dev will be NULL and that _will_ oops later on).

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190115/cb3701bd/attachment.sig>
author
#7 lore raw

PATCH 1/1 common: Break USB_STORAGE dependency between SPL and u-boot proper

Quoted 14 lines · Tom Rini
Quoted 11 lines · Abel Vesa

Some boards might need USB_STORAGE enabled in u-boot proper but not in SPL. Make a separate config for SPL and keep the same depends on conditions but for SPL.

---
 common/Makefile                | 2 +-
 configs/apalis_imx6_defconfig  | 1 +
 configs/colibri_imx6_defconfig | 1 +
 configs/mx6sabresd_defconfig   | 1 +
 drivers/usb/Kconfig            | 8 ++++++++
 5 files changed, 12 insertions(+), 1 deletion(-)
Quoted 3 lines

The root problem here, as I discovered today digging in another patch is that in essence CONFIG_SPL_USB_SUPPORT is mis-named and should be CONFIG_SPL_USB_STORAGE and all cases in Makefiles of

Ithink those too are two separete thing. You can have SPL_USB_SUPPORT enabled, but the SPL_USB_STORAGE disabled. For example, for SDP support in SPL you need SPL_USB_SUPPORT, but you don't need the SPL_USB_STORAGE. So, IMO, they need to remain two separate things.

Quoted 7 lines

obj-$(CONFIG_USB_STORAGE) should be obj-$(CONFIG_$(SPL_)USB_STORAGE) and common/spl/spl_usb.c have its ifdef's cleaned slightly as that code cannot function without CONFIG_USB_STORAGE set (stor_dev will be NULL and that _will_ oops later on).

Signature · 1 line
Tom
#8 lore raw

PATCH 1/1 common: Break USB_STORAGE dependency between SPL and u-boot proper

Quoted 15 lines · Abel Vesa
Quoted 14 lines · Tom Rini
Quoted 11 lines · Abel Vesa

Some boards might need USB_STORAGE enabled in u-boot proper but not in SPL. Make a separate config for SPL and keep the same depends on conditions but for SPL.

---
 common/Makefile                | 2 +-
 configs/apalis_imx6_defconfig  | 1 +
 configs/colibri_imx6_defconfig | 1 +
 configs/mx6sabresd_defconfig   | 1 +
 drivers/usb/Kconfig            | 8 ++++++++
 5 files changed, 12 insertions(+), 1 deletion(-)
Quoted 8 lines
Quoted 3 lines

The root problem here, as I discovered today digging in another patch is that in essence CONFIG_SPL_USB_SUPPORT is mis-named and should be CONFIG_SPL_USB_STORAGE and all cases in Makefiles of

I think those too are two separete thing. You can have SPL_USB_SUPPORT enabled, but the SPL_USB_STORAGE disabled. For example, for SDP support in SPL you need SPL_USB_SUPPORT, but you don't need the SPL_USB_STORAGE. So, IMO, they need to remain two separate things.

No, you can't. Or rather, the option names are a bit confusing. CONFIG_SPL_USB_SUPPORT controls common/spl/spl_usb.c and that will not function without CONFIG_USB_STORAGE support as it's specifically about loading from a device. It's also only set for some TI AM43xx platforms as the ROM there supports booting from USB sticks and in turn we have SPL doing so. CONFIG_SPL_USB_HOST_SUPPORT is different and is set on both AM43xx and various NXP platforms and is what you're after, without the storage support side.

Aside, what is the USB host case on i.MX? It's not acting in host mode when being passed U-Boot via imx_usb, is it?

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190115/0c8dbd71/attachment.sig>
author
#9 lore raw

PATCH 1/1 common: Break USB_STORAGE dependency between SPL and u-boot proper

Quoted 34 lines · Tom Rini
Quoted 15 lines · Abel Vesa
Quoted 14 lines · Tom Rini
Quoted 11 lines · Abel Vesa

Some boards might need USB_STORAGE enabled in u-boot proper but not in SPL. Make a separate config for SPL and keep the same depends on conditions but for SPL.

---
 common/Makefile                | 2 +-
 configs/apalis_imx6_defconfig  | 1 +
 configs/colibri_imx6_defconfig | 1 +
 configs/mx6sabresd_defconfig   | 1 +
 drivers/usb/Kconfig            | 8 ++++++++
 5 files changed, 12 insertions(+), 1 deletion(-)
Quoted 8 lines
Quoted 3 lines

The root problem here, as I discovered today digging in another patch is that in essence CONFIG_SPL_USB_SUPPORT is mis-named and should be CONFIG_SPL_USB_STORAGE and all cases in Makefiles of

I think those too are two separete thing. You can have SPL_USB_SUPPORT enabled, but the SPL_USB_STORAGE disabled. For example, for SDP support in SPL you need SPL_USB_SUPPORT, but you don't need the SPL_USB_STORAGE. So, IMO, they need to remain two separate things.

No, you can't. Or rather, the option names are a bit confusing. CONFIG_SPL_USB_SUPPORT controls common/spl/spl_usb.c and that will not function without CONFIG_USB_STORAGE support as it's specifically about loading from a device. It's also only set for some TI AM43xx platforms as the ROM there supports booting from USB sticks and in turn we have SPL doing so. CONFIG_SPL_USB_HOST_SUPPORT is different and is set on both AM43xx and various NXP platforms and is what you're after, without the storage support side.

Quoted 2 lines

Aside, what is the USB host case on i.MX? It's not acting in host mode when being passed U-Boot via imx_usb, is it?

For imx_usb, SDP is used (CONFIG_SPL_USB_SDP_SUPPORT) which is under CONFIG_SPL_USB_GADGET (not CONFIG_SPL_USB_SUPPORT or CONFIG_SPL_USB_HOST_SUPPORT).

So you're right, CONFIG_SPL_USB_SUPPORT has nothing to do with SDP.

Quoted 3 lines
Signature · 2 lines
-- 
Tom