[PATCH 17/18] stm32mp: stm32prog: support for script

[Patrice CHOTARD]

Hi

On 3/18/20 9:25 AM, Patrick Delaunay wrote:
> Support an U-Boot script included in uimage instead of flashlayout file
> (text file in tsv format).
>
> This feature is used to execute this script directly when U-Boot is
> loaded in DDR (for update without STM32CubeProgrammer for example).
>
> A simple example with dfu-util only is:
>
> $> echo "dfu 0" > script.cmd
> $> mkimage -C none -A arm -T script -d script.cmd script.uimg
> $> mkimage -T stm32image -a 0xC0000000 -e 0xC0000000 -d script.uimg \
>   script.stm32
>
> $> dfu-util -d 0483:df11 -a 1 -D tf-a.stm32
> $> dfu-util -d 0483:df11 -a 0 -D script.stm32
> $> dfu-util -d 0483:df11 -a 0 -D u-boot.stm32
> $> dfu-util -d 0483:df11 -a 0 -e
>
> Then you can used dfu-utils to update your device
>
> To increase speed, you can also switch to fastboot protocol with:
>   echo "fastboot 0" > script.cmd
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
> ---
>
>  .../arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
>
> diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
> index 15bbdc2cb6..baf9b6bd1e 100644
> --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
> +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <command.h>
>  #include <dfu.h>
> +#include <image.h>
>  #include <asm/arch/stm32prog.h>
>  #include "stm32prog.h"
>  
> @@ -44,6 +45,7 @@ static int do_stm32prog(cmd_tbl_t *cmdtp, int flag, int argc,
>  	int dev, ret;
>  	enum stm32prog_link_t link = LINK_UNDEFINED;
>  	bool reset = false;
> +	struct image_header_s header;
>  	struct stm32prog_data *data;
>  
>  	if (argc < 3 ||  argc > 5)
> @@ -71,6 +73,18 @@ static int do_stm32prog(cmd_tbl_t *cmdtp, int flag, int argc,
>  	if (argc > 4)
>  		size = simple_strtoul(argv[4], NULL, 16);
>  
> +	/* check STM32IMAGE presence */
> +	if (size == 0 &&
> +	    !stm32prog_header_check((struct raw_header_s *)addr, &header)) {
> +		size = header.image_length + BL_HEADER_SIZE;
> +
> +		/* uImage detected in STM32IMAGE, execute the script */
> +		if (IMAGE_FORMAT_LEGACY ==
> +		    genimg_get_format((void *)(addr + BL_HEADER_SIZE)))
> +			return image_source_script(addr + BL_HEADER_SIZE,
> +						   "script at 1");
> +	}
> +
>  	enable_vidconsole();
>  
>  	data = (struct stm32prog_data *)malloc(sizeof(*data));

Reviewed-by: Patrice Chotard <patrice.chotard at st.com>

Thanks

Patrice