| Message ID | 163876951112.38238.16417526355275476416.stgit@localhost |
|---|---|
| State | Superseded |
| Headers | show |
| Series | DFU: Update dfu_alt_info parser etc. | expand |
On Mon, Dec 06, 2021 at 02:45:11PM +0900, Masami Hiramatsu wrote: > Since dfu is not only used for USB, and some platform only > supports DFU_OVER_TFTP or EFI capsule update, dfu_alt_info > is defined on such platforms too. > > For such platform, 'dfu list' command is useful to check > how the current dfu_alt_info setting is parsed. > > Signed-off-by: Masami Hiramatsu <masami.hiramatsu@linaro.org> This patch breaks at least smegw01 and likely warp and iot2050 as well, please update the series and repost, thanks!
Hi Tom,
Thanks for testing, I confirmed the error.
CC cmd/dfu.o
cmd/dfu.c: In function ‘do_dfu’:
cmd/dfu.c:53:30: error: ‘interface’ undeclared (first use in this
function); did you mean ‘usb_interface’?
53 | ret = dfu_init_env_entities(interface, devstring);
| ^~~~~~~~~
| usb_interface
cmd/dfu.c:53:30: note: each undeclared identifier is reported only
once for each function it appears in
cmd/dfu.c:53:41: error: ‘devstring’ undeclared (first use in this
function); did you mean ‘fdt_string’?
53 | ret = dfu_init_env_entities(interface, devstring);
| ^~~~~~~~~
| fdt_string
Let me fix it.
Thank you!
2022年1月29日(土) 1:30 Tom Rini <trini@konsulko.com>:
>
> On Mon, Dec 06, 2021 at 02:45:11PM +0900, Masami Hiramatsu wrote:
>
> > Since dfu is not only used for USB, and some platform only
> > supports DFU_OVER_TFTP or EFI capsule update, dfu_alt_info
> > is defined on such platforms too.
> >
> > For such platform, 'dfu list' command is useful to check
> > how the current dfu_alt_info setting is parsed.
> >
> > Signed-off-by: Masami Hiramatsu <masami.hiramatsu@linaro.org>
>
> This patch breaks at least smegw01 and likely warp and iot2050 as well,
> please update the series and repost, thanks!
>
> --
> Tom
diff --git a/cmd/dfu.c b/cmd/dfu.c index 4a288f74c2..208555c888 100644 --- a/cmd/dfu.c +++ b/cmd/dfu.c @@ -50,7 +50,6 @@ static int do_dfu(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) if (!strcmp(argv[1], "tftp")) return update_tftp(value, interface, devstring); #endif -#ifdef CONFIG_DFU_OVER_USB ret = dfu_init_env_entities(interface, devstring); if (ret) goto done; @@ -65,6 +64,7 @@ static int do_dfu(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) goto done; } +#ifdef CONFIG_DFU_OVER_USB int controller_index = simple_strtoul(usb_controller, NULL, 0); bool retry = false; do { @@ -79,9 +79,9 @@ static int do_dfu(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) } } while (retry); +#endif done: dfu_free_entities(); -#endif return ret; } @@ -100,8 +100,8 @@ U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu, #ifdef CONFIG_DFU_TIMEOUT " [<timeout>] - specify inactivity timeout in seconds\n" #endif - " [list] - list available alt settings\n" #endif + " [list] - list available alt settings\n" #ifdef CONFIG_DFU_OVER_TFTP #ifdef CONFIG_DFU_OVER_USB "dfu "
Since dfu is not only used for USB, and some platform only supports DFU_OVER_TFTP or EFI capsule update, dfu_alt_info is defined on such platforms too. For such platform, 'dfu list' command is useful to check how the current dfu_alt_info setting is parsed. Signed-off-by: Masami Hiramatsu <masami.hiramatsu@linaro.org> --- cmd/dfu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)