diff options
| author | Tom Rini <trini@konsulko.com> | 2022-12-31 16:30:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-12-31 16:30:31 -0500 |
| commit | 3aa14d76182dbbaf9fed4deeaf362f083b9d2f5b (patch) | |
| tree | 9a4c733db8ec3b99444a5ff9177aeb709459ad07 /arch/arm/mach-stm32mp/cmd_stm32prog | |
| parent | 3e4cbe184a0f6537abb457d6afa61224396c4e46 (diff) | |
| parent | bcc85b96b5ffbbce19a89747138feb873d918915 (diff) | |
Merge branch '2022-12-31-cmd-source-support-specifying-config-name' into next
To quote the author:
This series adds support for using configs with the source command.
And to paraphrase the rest, see the patch commit messages for more
details.
Diffstat (limited to 'arch/arm/mach-stm32mp/cmd_stm32prog')
| -rw-r--r-- | arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c index 007f7131306..cb13a14d829 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c @@ -154,7 +154,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc, do_bootz(cmdtp, 0, 4, bootm_argv); } if (data->script) - image_source_script(data->script, "script@stm32prog"); + image_source_script(data->script, NULL, NULL); if (reset) { puts("Reset...\n"); |