diff mbox series

[4/5] dfu: add support for the dfu_alt_info reintialization from the flashed script

Message ID 20201217121030.6352-5-m.szyprowski@samsung.com
State Superseded
Headers show
Series DFU: new entity types and minor improvements | expand

Commit Message

Marek Szyprowski Dec. 17, 2020, 12:10 p.m. UTC 
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>

---
 cmd/dfu.c    | 14 +++++++++++++-
 common/dfu.c |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

-- 
2.17.1
diff mbox series

Patch

diff --git a/cmd/dfu.c b/cmd/dfu.c
index 7310595a02..89b1b2268e 100644
--- a/cmd/dfu.c
+++ b/cmd/dfu.c
@@ -34,6 +34,7 @@  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
+	bool retry = false;
 
 	if (argc >= 4) {
 		interface = argv[2];
@@ -68,7 +69,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);
 
-	run_usb_dnl_gadget(controller_index, "usb_dnl_dfu");
+	do {
+		retry = false;
+		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();
diff --git a/common/dfu.c b/common/dfu.c
index d23cf67f19..16bd1ba588 100644
--- a/common/dfu.c
+++ b/common/dfu.c
@@ -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);
 	}