aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2021-11-08 18:12:42 +0100
committerStefan Roese <sr@denx.de>2021-11-10 12:08:06 +0100
commit01bdac6df6815b9f0b5d69b7e0b543923cfe4c15 (patch)
treeaa40de87efc45574afbc704ca4abb33132066116
parent12f2c03f4d1f7a7ef768f3358b0326cd8af54509 (diff)
downloadu-boot-01bdac6df6815b9f0b5d69b7e0b543923cfe4c15.zip
u-boot-01bdac6df6815b9f0b5d69b7e0b543923cfe4c15.tar.gz
u-boot-01bdac6df6815b9f0b5d69b7e0b543923cfe4c15.tar.bz2
tools: kwbimage: Explicitly set version also for kwbimage v0
For documentation purposes update struct main_hdr_v0 to include information where version of the image must be stored. For kwbimage v0 it obviously must be 0. By default all image header memory is initialized to zero, therefore this change has no functional effect. Signed-off-by: Pali Rohár <pali@kernel.org> Signed-off-by: Marek Behún <marek.behun@nic.cz> Reviewed-by: Stefan Roese <sr@denx.de>
-rw-r--r--tools/kwbimage.c1
-rw-r--r--tools/kwbimage.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index f24d494..d29f2cf 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -881,6 +881,7 @@ static void *image_create_v0(size_t *imagesz, struct image_tool_params *params,
cpu_to_le32(payloadsz - headersz);
main_hdr->srcaddr = cpu_to_le32(headersz);
main_hdr->ext = has_ext;
+ main_hdr->version = 0;
main_hdr->destaddr = cpu_to_le32(params->addr);
main_hdr->execaddr = cpu_to_le32(params->ep);
diff --git a/tools/kwbimage.h b/tools/kwbimage.h
index f1ba95c..f74767e 100644
--- a/tools/kwbimage.h
+++ b/tools/kwbimage.h
@@ -42,7 +42,8 @@ struct main_hdr_v0 {
uint8_t nandeccmode; /* 0x1 */
uint16_t nandpagesize; /* 0x2-0x3 */
uint32_t blocksize; /* 0x4-0x7 */
- uint32_t rsvd1; /* 0x8-0xB */
+ uint8_t version; /* 0x8 */
+ uint8_t rsvd1[3]; /* 0x9-0xB */
uint32_t srcaddr; /* 0xC-0xF */
uint32_t destaddr; /* 0x10-0x13 */
uint32_t execaddr; /* 0x14-0x17 */