[PATCH u-boot-marvell v2 19/20] tools: kwbimage: Extract main data image without -p arg for dumpimage

[Stefan Roese]

On 1/12/22 18:20, Pali Rohár wrote:
> When there is no -p argument for dumpimage tool specified, extract the main
> data image from kwbimage file. This makes dumpimage consistent with other
> image formats.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>
> Reviewed-by: Marek Behún <marek.behun at nic.cz>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   tools/kwbimage.c | 67 +++++++++++++++++++++++++++++-------------------
>   1 file changed, 40 insertions(+), 27 deletions(-)
> 
> diff --git a/tools/kwbimage.c b/tools/kwbimage.c
> index 92d163b6050e..d159087d9dd6 100644
> --- a/tools/kwbimage.c
> +++ b/tools/kwbimage.c
> @@ -2266,7 +2266,7 @@ static int kwbimage_extract_subimage(void *ptr, struct image_tool_params *params
>   	size_t header_size = kwbheader_size(ptr);
>   	struct opt_hdr_v1 *ohdr;
>   	int idx = params->pflag;
> -	int cur_idx = 0;
> +	int cur_idx;
>   	uint32_t offset;
>   	ulong image;
>   	ulong size;
> @@ -2275,41 +2275,54 @@ static int kwbimage_extract_subimage(void *ptr, struct image_tool_params *params
>   	if (idx == -1)
>   		return kwbimage_generate_config(ptr, params);
>   
> -	for_each_opt_hdr_v1 (ohdr, ptr) {
> -		if (ohdr->headertype != OPT_HDR_V1_BINARY_TYPE)
> -			continue;
> +	image = 0;
> +	size = 0;
> +
> +	if (idx == 0) {
> +		/* Extract data image when -p is not specified or when '-p 0' is specified */
> +		offset = le32_to_cpu(mhdr->srcaddr);
>   
> -		if (idx == cur_idx) {
> -			image = (ulong)&ohdr->data[4 + 4 * ohdr->data[0]];
> -			size = opt_hdr_v1_size(ohdr) - 12 - 4 * ohdr->data[0];
> -			goto extract;
> +		if (mhdr->blockid == IBR_HDR_SATA_ID) {
> +			offset -= 1;
> +			offset *= 512;
>   		}
>   
> -		++cur_idx;
> -	}
> +		if (mhdr->blockid == IBR_HDR_SDIO_ID)
> +			offset *= 512;
>   
> -	if (idx != cur_idx) {
> -		printf("Image %d is not present\n", idx);
> -		return -1;
> -	}
> -
> -	offset = le32_to_cpu(mhdr->srcaddr);
> +		if (mhdr->blockid == IBR_HDR_PEX_ID && offset == 0xFFFFFFFF)
> +			offset = header_size;
>   
> -	if (mhdr->blockid == IBR_HDR_SATA_ID) {
> -		offset -= 1;
> -		offset *= 512;
> -	}
> +		image = (ulong)((uint8_t *)ptr + offset);
> +		size = le32_to_cpu(mhdr->blocksize) - 4;
> +	} else {
> +		/* Extract N-th binary header executabe image when other '-p N' is specified */
> +		cur_idx = 1;
> +		for_each_opt_hdr_v1(ohdr, ptr) {
> +			if (ohdr->headertype != OPT_HDR_V1_BINARY_TYPE)
> +				continue;
>   
> -	if (mhdr->blockid == IBR_HDR_SDIO_ID)
> -		offset *= 512;
> +			if (idx == cur_idx) {
> +				image = (ulong)&ohdr->data[4 + 4 * ohdr->data[0]];
> +				size = opt_hdr_v1_size(ohdr) - 12 - 4 * ohdr->data[0];
> +				break;
> +			}
>   
> -	if (mhdr->blockid == IBR_HDR_PEX_ID && offset == 0xFFFFFFFF)
> -		offset = header_size;
> +			++cur_idx;
> +		}
>   
> -	image = (ulong)((uint8_t *)ptr + offset);
> -	size = le32_to_cpu(mhdr->blocksize) - 4;
> +		if (!image) {
> +			fprintf(stderr, "Argument -p %d is invalid\n", idx);
> +			fprintf(stderr, "Available subimages:\n");
> +			fprintf(stderr, " -p -1  - kwbimage config file\n");
> +			fprintf(stderr, " -p 0   - data image\n");
> +			if (cur_idx - 1 > 0)
> +				fprintf(stderr, " -p N   - Nth binary header image (totally: %d)\n",
> +					cur_idx - 1);
> +			return -1;
> +		}
> +	}
>   
> -extract:
>   	return imagetool_save_subimage(params->outfile, image, size);
>   }
>   
> 

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de