From: Tom Rini Date: Wed, 6 May 2020 15:05:17 +0000 (-0400) Subject: Revert "mkimage: fit: Do not tail-pad fitImage with external data" X-Git-Tag: v2020.07-rc2~9^2~11 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7946a814a31989998120b4b4aa417222ba21b2fa;p=oweals%2Fu-boot.git Revert "mkimage: fit: Do not tail-pad fitImage with external data" This has been reported to break booting of U-Boot from SPL on a number of platforms due to a lack of alignment of the external data. The issues this commit is addressing will need to be resolved another way. Re-introduce a data leak in the padding for now. This reverts commit 20a154f95bfe0a3b5bfba90bea7f001c58217536. Reported-by: Alex Kiernan Reported-by: Michael Walle Tested-by: Jan Kiszka Signed-off-by: Tom Rini --- diff --git a/tools/fit_image.c b/tools/fit_image.c index 1e0f1e9fce..88ff093d05 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -435,7 +435,7 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname) int image_number; int align_size; - align_size = params->bl_len ? params->bl_len : 1; + align_size = params->bl_len ? params->bl_len : 4; fd = mmap_fdt(params->cmdname, fname, 0, &fdt, &sbuf, false, false); if (fd < 0) return -EIO; @@ -493,6 +493,7 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname) fdt_pack(fdt); new_size = fdt_totalsize(fdt); + new_size = ALIGN(new_size, align_size); fdt_set_totalsize(fdt, new_size); debug("Size reduced from %x to %x\n", fit_size, fdt_totalsize(fdt)); debug("External data size %x\n", buf_ptr);