leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dfu: add support for the dfu_alt_info reintialization from the flashed script

Browse Source 
Reinitialize DFU USB gadget after flashing the 'SCRIPT' entity to ensure
that the potential changes to the 'dfu_alt_info' environment variable are
applied.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
[lukma - I've moved the bool retry to avoid build (CI) errors]
This commit is contained in:
Marek Szyprowski 2020-12-22 11:32:23 +01:00 committed by Marek Vasut
parent c533f94c10
commit 9129f2f164
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/dfu.c
View File

@ -34,7 +34,6 @@ static int do_dfu(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
#if defined(CONFIG_DFU_TIMEOUT) || defined(CONFIG_DFU_OVER_TFTP)
unsigned long value = 0;
#endif
if (argc >= 4) {
interface = argv[2];
devstring = argv[3];
@ -67,8 +66,18 @@ static int do_dfu(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
}
int controller_index = simple_strtoul(usb_controller, NULL, 0);
bool retry = false;
do {
run_usb_dnl_gadget(controller_index, "usb_dnl_dfu");
run_usb_dnl_gadget(controller_index, "usb_dnl_dfu");
if (dfu_reinit_needed) {
dfu_free_entities();
ret = dfu_init_env_entities(interface, devstring);
if (ret)
goto done;
retry = true;
}
} while (retry);
done:
dfu_free_entities();

3
common/dfu.c
View File

@ -98,6 +98,9 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)
}
#endif
if (dfu_reinit_needed)
goto exit;
WATCHDOG_RESET();
usb_gadget_handle_interrupts(usbctrl_index);
}