[U-Boot] [PATCH v2 04/12] dfu: fix boards wo USB cable detection

Marek Vasut marex at denx.de
Sat Feb 22 06:06:18 CET 2014


On Tuesday, February 04, 2014 at 06:02:36 PM, Mateusz Zalega wrote:
> Former usb_cable_connected() patch broke compilation of boards which do
> not support this feature.
> 
> Signed-off-by: Mateusz Zalega <m.zalega at samsung.com>
> Cc: Lukasz Majewski <l.majewski at samsung.com>
> ---
>  common/cmd_usb_mass_storage.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c
> index 5f557d5..5175bd5 100644
> --- a/common/cmd_usb_mass_storage.c
> +++ b/common/cmd_usb_mass_storage.c
> @@ -45,6 +45,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
>  	/* Timeout unit: seconds */
>  	int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT;
> 
> +#ifdef CONFIG_USB_CABLE_CHECK

This new CONFIG_USB_CABLE_CHECK macro doesn't work. Why don't you introduce a 
__weak version of usb_cable_connected() instead and drop this macro altogether ?

>  	if (!usb_cable_connected()) {
>  		puts("Please connect USB cable.\n");
> 
> @@ -65,6 +66,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
>  		}
>  		puts("\r\n");
>  	}
> +#endif
> 
>  	while (1) {
>  		usb_gadget_handle_interrupts();

Best regards,
Marek Vasut


More information about the U-Boot mailing list