diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-21 19:00:04 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-21 19:00:04 -0400 |
| commit | 6c5f8dd540d7a8eff244d4c27a09451ca12c8d20 (patch) | |
| tree | 9eaba554d99f15aa5dfc302c338f59895f9b43e4 /cmd | |
| parent | b4fde1633e67bb618fd33aad6e6322b7cecf1154 (diff) | |
| parent | 7fd9f31c6bd13609da61b985cf8f5f65ebebd913 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Various fastboot, dwc2/stm32 updates
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/dfu.c | 3 | ||||
| -rw-r--r-- | cmd/usb_mass_storage.c | 3 |
2 files changed, 6 insertions, 0 deletions
@@ -27,8 +27,10 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef CONFIG_DFU_OVER_USB char *usb_controller = argv[1]; #endif +#if defined(CONFIG_DFU_OVER_USB) || defined(CONFIG_DFU_OVER_TFTP) char *interface = argv[2]; char *devstring = argv[3]; +#endif int ret = 0; #ifdef CONFIG_DFU_OVER_TFTP @@ -63,6 +65,7 @@ done: U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu, "Device Firmware Upgrade", + "" #ifdef CONFIG_DFU_OVER_USB "<USB_controller> <interface> <dev> [list]\n" " - device firmware upgrade via <USB_controller>\n" diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c index 753ae4f42a..570cf3aa50 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -14,6 +14,7 @@ #include <part.h> #include <usb.h> #include <usb_mass_storage.h> +#include <watchdog.h> static int ums_read_sector(struct ums *ums_dev, ulong start, lbaint_t blkcnt, void *buf) @@ -226,6 +227,8 @@ static int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, rc = CMD_RET_SUCCESS; goto cleanup_register; } + + WATCHDOG_RESET(); } cleanup_register: |