From: Stefan Roese Date: Tue, 24 Nov 2015 08:14:59 +0000 (+0100) Subject: tools/kwbimage.c: Make sure that the resulting image is 4-byte aligned X-Git-Tag: v2016.01-rc2~117 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=777208593012d03a8b839bd03f0e7f2129bf1b83;p=oweals%2Fu-boot.git 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 Cc: Luka Perkov Cc: Dirk Eibach --- diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 5f6d91c486..8fe3bf41e9 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; } /*