From: Patrick Oppenlander <patrick.oppenlander@gmail.com>
Date: Thu, 30 Jul 2020 04:31:48 +0000 (+1000)
Subject: mkimage: fit: fix import of external data
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=c995d854efcbf54ebd99a41f9a3c918340f16376;p=u-boot.git

mkimage: fit: fix import of external data

The external data is located after the mmapped FDT pointed to by
'old_fdt', not in the newly created FDT we are importing into at 'fdt'.

Signed-off-by: Patrick Oppenlander <patrick.oppenlander@gmail.com>
---

diff --git a/tools/fit_image.c b/tools/fit_image.c
index f7d2f56029..06faeda7c2 100644
--- a/tools/fit_image.c
+++ b/tools/fit_image.c
@@ -606,8 +606,8 @@ static int fit_import_data(struct image_tool_params *params, const char *fname)
 			continue;
 		debug("Importing data size %x\n", len);
 
-		ret = fdt_setprop(fdt, node, "data", fdt + data_base + buf_ptr,
-				  len);
+		ret = fdt_setprop(fdt, node, "data",
+				  old_fdt + data_base + buf_ptr, len);
 		if (ret) {
 			debug("%s: Failed to write property: %s\n", __func__,
 			      fdt_strerror(ret));