From mboxrd@z Thu Jan 1 00:00:00 1970 From: patrick.oppenlander at gmail.com Date: Thu, 30 Jul 2020 14:31:48 +1000 Subject: [PATCH] mkimage: fit: fix import of external data Message-ID: <20200730043148.410020-1-patrick.oppenlander@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Patrick Oppenlander 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 --- tools/fit_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/fit_image.c b/tools/fit_image.c index df310b53da..793df54449 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)); -- 2.27.0