summaryrefslogtreecommitdiff
path: root/tools/kwbimage.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-11-24 09:14:59 +0100
committerLuka Perkov <luka.perkov@sartura.hr>2015-11-29 16:02:44 +0100
commit777208593012d03a8b839bd03f0e7f2129bf1b83 (patch)
tree9328ce0c31e774c9e073ef922bf9d60408a36614 /tools/kwbimage.c
parent9eb14cc443d0ae846ba72434e6c749222404be3d (diff)
tools/kwbimage.c: Make sure that the resulting image is 4-byte aligned
With the dtb added to the main U-Boot image, it can happen, that the resulting image is not 4-byte aligned. As the dtb tends to be unaligned. But the image needs to be 4-byte aligned. At least the Marvell hdrparser tool complains if its unaligned. By returning 1 here in kwbimage_generate(), called via tparams->vrec_header() in mkimage.c, mkimage will automatically pad the resulting image to a 4-byte size if necessary. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Luka Perkov <luka.perkov@sartura.hr> Cc: Dirk Eibach <eibach@gdsys.de>
Diffstat (limited to 'tools/kwbimage.c')
-rw-r--r--tools/kwbimage.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 5f6d91c4865..8fe3bf41e9d 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -810,7 +810,15 @@ static int kwbimage_generate(struct image_tool_params *params,
tparams->header_size = alloc_len;
tparams->hdr = hdr;
- return 0;
+ /*
+ * The resulting image needs to be 4-byte aligned. At least
+ * the Marvell hdrparser tool complains if its unaligned.
+ * By returning 1 here in this function, called via
+ * tparams->vrec_header() in mkimage.c, mkimage will
+ * automatically pad the the resulting image to a 4-byte
+ * size if necessary.
+ */
+ return 1;
}
/*