*/
#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[])
{
- char *s = "dfu";
- int ret, i = 0;
+ bool dfu_reset = false;
- if (argc < 3)
+ if (argc < 4)
return CMD_RET_USAGE;
- ret = dfu_init_env_entities(argv[1], simple_strtoul(argv[2], NULL, 10));
+ char *usb_controller = argv[1];
+ char *interface = argv[2];
+ char *devstring = argv[3];
+
+ int ret, i = 0;
+
+ ret = dfu_init_env_entities(interface, devstring);
if (ret)
- return ret;
+ goto done;
- if (argc > 3 && strcmp(argv[3], "list") == 0) {
+ ret = CMD_RET_SUCCESS;
+ if (argc > 4 && strcmp(argv[4], "list") == 0) {
dfu_show_entities();
goto done;
}
-#ifdef CONFIG_TRATS
- board_usb_init();
-#endif
-
- g_dnl_register(s);
+ 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);
- return CMD_RET_SUCCESS;
+ g_dnl_clear_detach();
+
+ return ret;
}
U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
"Device Firmware Upgrade",
- "<interface> <dev> [list]\n"
- " - device firmware upgrade on a device <dev>\n"
- " attached to interface <interface>\n"
- " [list] - list available alt settings"
+ "<USB_controller> <interface> <dev> [list]\n"
+ " - device firmware upgrade via <USB_controller>\n"
+ " on device <dev>, attached to interface\n"
+ " <interface>\n"
+ " [list] - list available alt settings\n"
);