GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools: kwbimage: Extract main data image without -p arg for dumpimage

Browse source 
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@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Pali Rohár 2022-01-12 18:20:53 +01:00 • committed by Stefan Roese
parent 44691034e1
commit 1972c7e308
1 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
tools/kwbimage.c
View file

@ -2266,7 +2266,7 @@ static int kwbimage_extract_subimage(void *ptr, struct image_tool_params *params
size_t header_size = kwbheader_size(ptr); size_t header_size = kwbheader_size(ptr);
struct opt_hdr_v1 *ohdr; struct opt_hdr_v1 *ohdr;
int idx = params->pflag; int idx = params->pflag;
int cur_idx = 0; int cur_idx;
uint32_t offset; uint32_t offset;
ulong image; ulong image;
ulong size; ulong size;
@ -2275,41 +2275,54 @@ static int kwbimage_extract_subimage(void *ptr, struct image_tool_params *params
if (idx == -1) if (idx == -1)
return kwbimage_generate_config(ptr, params); return kwbimage_generate_config(ptr, params);
for_each_opt_hdr_v1 (ohdr, ptr) { image = 0;
if (ohdr->headertype != OPT_HDR_V1_BINARY_TYPE) size = 0;
continue;
if (idx == cur_idx) { if (idx == 0) {
image = (ulong)&ohdr->data[4 + 4 * ohdr->data[0]]; /* Extract data image when -p is not specified or when '-p 0' is specified */
size = opt_hdr_v1_size(ohdr) - 12 - 4 * ohdr->data[0]; offset = le32_to_cpu(mhdr->srcaddr);
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 (mhdr->blockid == IBR_HDR_PEX_ID && offset == 0xFFFFFFFF)
offset = header_size;
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 (idx == cur_idx) {
image = (ulong)&ohdr->data[4 + 4 * ohdr->data[0]];
size = opt_hdr_v1_size(ohdr) - 12 - 4 * ohdr->data[0];
break;
}
++cur_idx;
}
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;
}
} }
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_SATA_ID) {
offset -= 1;
offset *= 512;
}
if (mhdr->blockid == IBR_HDR_SDIO_ID)
offset *= 512;
if (mhdr->blockid == IBR_HDR_PEX_ID && offset == 0xFFFFFFFF)
offset = header_size;
image = (ulong)((uint8_t *)ptr + offset);
size = le32_to_cpu(mhdr->blocksize) - 4;
extract:
return imagetool_save_subimage(params->outfile, image, size); return imagetool_save_subimage(params->outfile, image, size);
} }