[PATCH v2 2/4] treewide: Use NULL for script image name

Patrick DELAUNAY patrick.delaunay at foss.st.com
Wed Oct 26 14:53:35 CEST 2022


Hi,

On 10/20/22 21:24, Sean Anderson wrote:
> 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 152576a598c ("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 at seco.com>
> Reviewed-by: Simon Glass <sjg at chromium.org>
> ---
> This has a non-zero chance of breaking something, especially for SDP.
> It's not strictly necessary for the following patches, so I can drop it
> if there are any issues.
>
> (no changes since v1)
>
>   arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 +-
>   drivers/usb/gadget/f_sdp.c                          | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
> index f59414e716f..9b4098da461 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 at stm32prog");
> +		image_source_script(data->script, NULL);
>   
>   	if (reset) {
>   		puts("Reset...\n");
> diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
> index 0fa7230b992..c80698663cd 100644
> --- a/drivers/usb/gadget/f_sdp.c
> +++ b/drivers/usb/gadget/f_sdp.c
> @@ -868,7 +868,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image,
>   			jump_to_image_no_args(&spl_image);
>   #else
>   			/* In U-Boot, allow jumps to scripts */
> -			image_source_script(sdp_func->jmp_address, "script at 1");
> +			image_source_script(sdp_func->jmp_address, NULL);
>   #endif
>   		}
>   
>
Reviewed-by: Patrick Delaunay <patrick.delaunay at foss.st.com>

for the stm32mp part: arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c

Thanks
Patrick



More information about the U-Boot mailing list