[U-Boot] [PATCH] common: Break USB_STORAGE dependency between SPL and u-boot proper

[Vignesh R]

On 15/01/19 9:12 PM, Abel Vesa wrote:
> On 19-01-15 18:38:00, Vignesh R wrote:
>>
>>
>> On 15/01/19 4:37 PM, Abel Vesa wrote:
>>> 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.
>>>
>>> Signed-off-by: Abel Vesa <abel.vesa at nxp.com>
>>> ---
>>>  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.
>>
> 
> 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


>>
>>>
>>> diff --git a/common/Makefile b/common/Makefile
>>> index 0de60b3..34931f3 100644
>>> --- a/common/Makefile
>>> +++ b/common/Makefile
>>> @@ -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
>>> diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
>>> index e02d9bc..c4916ad 100644
>>> --- a/configs/apalis_imx6_defconfig
>>> +++ b/configs/apalis_imx6_defconfig
>>> @@ -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
>>> diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
>>> index 68f0746..441a4e7 100644
>>> --- a/configs/colibri_imx6_defconfig
>>> +++ b/configs/colibri_imx6_defconfig
>>> @@ -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
>>> diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
>>> index 1857c18..3532fce 100644
>>> --- a/configs/mx6sabresd_defconfig
>>> +++ b/configs/mx6sabresd_defconfig
>>> @@ -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
>>> diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
>>> index 3b53bf2..4185e16 100644
>>> --- a/drivers/usb/Kconfig
>>> +++ b/drivers/usb/Kconfig
>>> @@ -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
>>>
>>
>> -- 
>> Regards
>> Vignesh