Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Reinitialize dfu_env_entities 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>
This commit is contained in:
Marek Szyprowski 2020-12-22 11:32:24 +01:00 committed by Marek Vasut
parent 9129f2f164
commit e47431aa5c
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cmd/thordown.c
View file

@ -52,13 +52,18 @@ int do_thor_down(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
goto exit; goto exit;
} }
ret = thor_handle(); do {
if (ret) { ret = thor_handle();
pr_err("THOR failed: %d\n", ret); if (ret == THOR_DFU_REINIT_NEEDED) {
ret = CMD_RET_FAILURE; dfu_free_entities();
goto exit; ret = dfu_init_env_entities(interface, devstring);
} }
if (ret) {
pr_err("THOR failed: %d\n", ret);
ret = CMD_RET_FAILURE;
goto exit;
}
} while (ret == 0);
exit: exit:
g_dnl_unregister(); g_dnl_unregister();
usb_gadget_release(controller_index); usb_gadget_release(controller_index);

3
drivers/usb/gadget/f_thor.c
View file

@ -30,6 +30,7 @@
#include <linux/usb/cdc.h> #include <linux/usb/cdc.h>
#include <g_dnl.h> #include <g_dnl.h>
#include <dfu.h> #include <dfu.h>
#include <thor.h>
#include "f_thor.h" #include "f_thor.h"
@ -735,6 +736,8 @@ int thor_handle(void)
printf("%s: No data received!\n", __func__); printf("%s: No data received!\n", __func__);
break; break;
} }
if (dfu_reinit_needed)
return THOR_DFU_REINIT_NEEDED;
} }
return 0; return 0;

2
include/thor.h
View file

@ -12,6 +12,8 @@
#include <linux/usb/composite.h> #include <linux/usb/composite.h>
#define THOR_DFU_REINIT_NEEDED 0xFFFFFFFE
int thor_handle(void); int thor_handle(void);
int thor_init(void); int thor_init(void);
int thor_add(struct usb_configuration *c); int thor_add(struct usb_configuration *c);