On 19.07.21 14:20, Marek Behún wrote:
From: Pali Rohár pali@kernel.org
Binary header consist of:
- 1 byte for header type
- 3 bytes for header size
- 1 byte for number of arguments
- 3 reserved bytes
- N*4 bytes for arguments
- M bytes (aligned to 4 bytes) for executable data
- 1 byte for information about next header
- 3 reserved bytes
The first four bytes are specified as sizeof(struct opt_hdr_v1) and the remaining bytes as ALIGN(s.st_size, 4) + (binarye->binary.nargs + 2) * sizeof(uint32_t)
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
Thanks, Stefan
tools/kwbimage.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 2d4574af7d..6c9f93ae8b 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -984,7 +984,7 @@ static size_t image_headersz_v1(int *hasext) }
headersz += sizeof(struct opt_hdr_v1) +
s.st_size +
ALIGN(s.st_size, 4) + (binarye->binary.nargs + 2) * sizeof(uint32_t);@@ -1051,14 +1051,7 @@ int add_binary_header_v1(uint8_t *cur)
binhdrsz = sizeof(struct opt_hdr_v1) + (binarye->binary.nargs + 2) * sizeof(uint32_t) +
s.st_size;- /*
* 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(binhdrsz, 4) + 4;
ALIGN(s.st_size, 4);
Viele Grüße, Stefan