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

treewide: Use NULL for script image name

Browse Source 
Two callers of image_source_script specify an image name. However, both
use the deprecated @ syntax, indicating that they have not been updated
in a while. If CONFIG_FIT_SIGNATURE is enabled, we will reject such
names outright. Back in commit 152576a598 ("stm32mp: stm32prog: handle
U-Boot script in flashlayout alternate"), we even renamed one of the
nodes. Instead of hard-coding a script image name, just use the default
image.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
This commit is contained in:
Sean Anderson
2022-12-12 14:12:09 -05:00
committed by Tom Rini
parent 895999261c
commit 30fb045f2d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
View File

@@ -154,7 +154,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc,
do_bootz(cmdtp, 0, 4, bootm_argv); do_bootz(cmdtp, 0, 4, bootm_argv);
} }
if (data->script) if (data->script)
image_source_script(data->script, "script@stm32prog"); image_source_script(data->script, NULL);
if (reset) { if (reset) {
puts("Reset...\n"); puts("Reset...\n");

2
drivers/usb/gadget/f_sdp.c
View File

@@ -868,7 +868,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image,
jump_to_image_no_args(&spl_image); jump_to_image_no_args(&spl_image);
#else #else
/* In U-Boot, allow jumps to scripts */ /* In U-Boot, allow jumps to scripts */
image_source_script(sdp_func->jmp_address, "script@1"); image_source_script(sdp_func->jmp_address, NULL);
#endif #endif
} }