summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-09-02 16:37:57 -0400
committerTom Rini <trini@ti.com>2014-09-02 16:37:57 -0400
commit48f892dc7370a23882239be06b4ec2ce60273e57 (patch)
tree050d8d28ef207dc8a00cf3f763f4997c66dfaeb9 /common
parent2c19478e01ab145c8b3a1f5b1beca9958d942e98 (diff)
parent06fa91cd671eae291b05e2138d291c56ddd394df (diff)
downloadu-boot-imx-48f892dc7370a23882239be06b4ec2ce60273e57.zip
u-boot-imx-48f892dc7370a23882239be06b4ec2ce60273e57.tar.gz
u-boot-imx-48f892dc7370a23882239be06b4ec2ce60273e57.tar.bz2
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'common')
-rw-r--r--common/cmd_dfu.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c
index 2633b30..9e020b4 100644
--- a/common/cmd_dfu.c
+++ b/common/cmd_dfu.c
@@ -15,6 +15,8 @@
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;
@@ -36,17 +38,28 @@ 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);
-
+ dfu_clear_detach();
g_dnl_register("usb_dnl_dfu");
while (1) {
- if (dfu_reset())
+ if (dfu_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;
@@ -58,9 +71,11 @@ exit:
done:
dfu_free_entities();
- if (dfu_reset())
+ if (dfu_reset)
run_command("reset", 0);
+ dfu_clear_detach();
+
return ret;
}