diff mbox

[U-Boot,v3,04/13] dfu: fix boards wo USB cable detection

Message ID 1396280952-30636-5-git-send-email-m.zalega@samsung.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Mateusz Zalega March 31, 2014, 3:49 p.m. UTC 
Former usb_cable_connected() patch broke compilation of boards which do
not support this feature.

Signed-off-by: Mateusz Zalega <m.zalega@samsung.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
---
 common/cmd_usb_mass_storage.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Łukasz Majewski April 2, 2014, 6:33 a.m. UTC | #1 
Hi Mateusz,

> Former usb_cable_connected() patch broke compilation of boards which
> do not support this feature.
> 
> Signed-off-by: Mateusz Zalega <m.zalega@samsung.com>
> Cc: Lukasz Majewski <l.majewski@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
>  	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();

Acked-by: Lukasz Majewski <l.majewski@samsung.com>
diff mbox

Patch

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
 	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();