Merge branch 'tx6-bugfix'

[karo-tx-uboot.git] / common / cmd_dfu.c

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c
index 433bddd5d2bdc83d9cf06fa943a44c08d9bba701..857148f8afef2562098358bc6615506d14716fc3 100644 (file)
--- a/common/cmd_dfu.c
+++ b/common/cmd_dfu.c
@@ -9,12 +9,15 @@
  */
 
 #include <common.h>
+#include <watchdog.h>
 #include <dfu.h>
 #include <g_dnl.h>
 #include <usb.h>
 
 static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
+       bool dfu_reset = false;
+
        if (argc < 4)
                return CMD_RET_USAGE;
 
@@ -24,8 +27,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        int ret, i = 0;
 
-       ret = dfu_init_env_entities(interface, simple_strtoul(devstring,
-                                                             NULL, 10));
+       ret = dfu_init_env_entities(interface, devstring);
        if (ret)
                goto done;
 
@@ -37,31 +39,46 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        int controller_index = simple_strtoul(usb_controller, NULL, 0);
        board_usb_init(controller_index, USB_INIT_DEVICE);
-
+       g_dnl_clear_detach();
        g_dnl_register("usb_dnl_dfu");
        while (1) {
-               if (dfu_reset())
+               if (g_dnl_detach()) {
+                       /*
+                        * Check if USB bus reset is performed after detach,
+                        * which indicates that -R switch has been passed to
+                        * dfu-util. In this case reboot the device
+                        */
+                       if (dfu_usb_get_reset()) {
+                               dfu_reset = true;
+                               goto exit;
+                       }
+
                        /*
                         * This extra number of usb_gadget_handle_interrupts()
                         * calls is necessary to assure correct transmission
                         * completion with dfu-util
                         */
-                       if (++i == 10)
+                       if (++i == 10000)
                                goto exit;
+               }
 
                if (ctrlc())
                        goto exit;
 
-               usb_gadget_handle_interrupts();
+               WATCHDOG_RESET();
+               usb_gadget_handle_interrupts(controller_index);
        }
 exit:
        g_dnl_unregister();
+       board_usb_cleanup(controller_index, USB_INIT_DEVICE);
 done:
        dfu_free_entities();
 
-       if (dfu_reset())
+       if (dfu_reset)
                run_command("reset", 0);
 
+       g_dnl_clear_detach();
+
        return ret;
 }