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

ARM: kwimage: fix v0 format

Browse Source 
This patch fix the kwimage tools for version 0 fileformat used for kirkwood
Tested on sheevaplug

Signed-off-by: Gerald Kerma <drEagle@doukki.net>
Tested-by: Stefan Roese <sr@denx.de>
Reviewed-by: Stefan Roese <sr@denx.de>
Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
This commit is contained in:
Gerald Kerma 2014-10-31 01:03:27 +01:00 committed by Tom Rini
parent 336be76228
commit 26f195c712
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/kwbimage.c
View File

@ -325,7 +325,7 @@ static void *image_create_v0(size_t *imagesz, struct image_tool_params *params,
main_hdr = image; main_hdr = image;
/* Fill in the main header */ /* Fill in the main header */
main_hdr->blocksize = payloadsz + sizeof(uint32_t); main_hdr->blocksize = payloadsz + sizeof(uint32_t) - headersz;
main_hdr->srcaddr = headersz; main_hdr->srcaddr = headersz;
main_hdr->ext = has_ext; main_hdr->ext = has_ext;
main_hdr->destaddr = params->addr; main_hdr->destaddr = params->addr;
@ -811,8 +811,8 @@ static void kwbimage_print_header(const void *ptr)
printf("Image Type: MVEBU Boot from %s Image\n", printf("Image Type: MVEBU Boot from %s Image\n",
image_boot_mode_name(mhdr->blockid)); image_boot_mode_name(mhdr->blockid));
printf("Data Size: ");
printf("Image version:%d\n", image_version((void *)ptr)); printf("Image version:%d\n", image_version((void *)ptr));
printf("Data Size: ");
genimg_print_size(mhdr->blocksize - sizeof(uint32_t)); genimg_print_size(mhdr->blocksize - sizeof(uint32_t));
printf("Load Address: %08x\n", mhdr->destaddr); printf("Load Address: %08x\n", mhdr->destaddr);
printf("Entry Point: %08x\n", mhdr->execaddr); printf("Entry Point: %08x\n", mhdr->execaddr);
@ -835,7 +835,8 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
main_hdr = (void *)ptr; main_hdr = (void *)ptr;
checksum = image_checksum8(ptr, checksum = image_checksum8(ptr,
sizeof(struct main_hdr_v0)); sizeof(struct main_hdr_v0)
- sizeof(uint8_t));
if (checksum != main_hdr->checksum) if (checksum != main_hdr->checksum)
return -FDT_ERR_BADSTRUCTURE; return -FDT_ERR_BADSTRUCTURE;
@ -843,7 +844,8 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
if (image_version((void *)ptr) == 0) { if (image_version((void *)ptr) == 0) {
ext_hdr = (void *)ptr + sizeof(struct main_hdr_v0); ext_hdr = (void *)ptr + sizeof(struct main_hdr_v0);
checksum = image_checksum8(ext_hdr, checksum = image_checksum8(ext_hdr,
sizeof(struct ext_hdr_v0)); sizeof(struct ext_hdr_v0)
- sizeof(uint8_t));
if (checksum != ext_hdr->checksum) if (checksum != ext_hdr->checksum)
return -FDT_ERR_BADSTRUCTURE; return -FDT_ERR_BADSTRUCTURE;
} }