tools/kwbimage.c: Fix generation of binary header
PATCH 1/1 tools/kwbimage.c: Fix generation of binary header
The binary header ends with one lword, defining if another header follows this one. This additions 4 bytes need to be taken into account in the generation of the header size. And the complete 4 bytes at the end of this binary header need to get cleared.
Signed-off-by Stefan Roese <[email protected]>
Cc Luka Perkov <[email protected]>
Cc Kevin Smith <[email protected]>
--- tools/kwbimage.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
tools/kwbimage.c +9 -3
@@ -417,7 +417,13 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params, binhdrsz =sizeof (struct opt_hdr_v1 ) + (binarye->binary.nargs +1 ) *sizeof (unsigned int ) + s.st_size; - binhdrsz =ALIGN_SUP (binhdrsz,32 ); + +/* +* The size includes the binary image size, rounded +* up to a 4-byte boundary. Plus 4 bytes for the +* next-header byte and 3-byte alignment at the end. +*/ + binhdrsz =ALIGN_SUP (binhdrsz,4 ) +4 ; hdr->headersz_lsb = binhdrsz &0xFFFF ; hdr->headersz_msb = (binhdrsz &0xFFFF0000 ) >>16 ;
@@ -441,7 +447,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,fclose (bin); - cur += s.st_size; + cur +=ALIGN_SUP (s.st_size,4 );/* * For now, we don't support more than one binary
@@ -449,7 +455,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,* supported. So, the binary header is necessarily the * last one */ - *((unsigned char *)cur) =0 ; + *((uint32_t *)cur) =0x00000000 ; cur +=sizeof (uint32_t ); }
Signature · 1 line
2.6.2
Luka Perkov
AppliedPATCH 1/1 tools/kwbimage.c: Fix generation of binary header
Quoted 11 lines · Stefan Roese
The binary header ends with one lword, defining if another header follows this one. This additions 4 bytes need to be taken into account in the generation of the header size. And the complete 4 bytes at the end of this binary header need to get cleared.
Signed-off-by Stefan Roese <[email protected]>Cc Luka Perkov <[email protected]>Cc Kevin Smith <[email protected]>--- tools/kwbimage.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
Applied to marvell/master.
Luka