commit 7673e595d101eaf31b6934cc8d5c2c407c40fda7
author David Vincze <david.vincze@arm.com> Mon Oct 28 11:08:56 2019 +0100
committer Tamas Ban <tamas.ban@arm.com> Mon Dec 16 13:39:25 2019 +0000
tree 38f506ce1096e15a07b05f78438bef8fbd5f9cf8
parent c256612e0e773c76ae07dc8de7f776e3c029d7b0

Boot: Pass image header to LOAD_IMAGE_DATA macro

Pass the image header pointer as an argument to the LOAD_IMAGE_DATA
macro instead of assuming it exists in the given scope with the
name "hdr".

Change-Id: I169d18427ba908f5b169ff276147dd9098afd9f6
Signed-off-by: David Vincze <david.vincze@arm.com>

bl2/ext/mcuboot/bootutil/src/loader.c

diff --git a/bl2/ext/mcuboot/bootutil/src/loader.c b/bl2/ext/mcuboot/bootutil/src/loader.c
index 9f47591..d5514cd 100644
--- a/bl2/ext/mcuboot/bootutil/src/loader.c
+++ b/bl2/ext/mcuboot/bootutil/src/loader.c
@@ -177,7 +177,7 @@
 
     off_ = BOOT_TLV_OFF(hdr);
 
-    if (LOAD_IMAGE_DATA(fap, off_, &info, sizeof(info))) {
+    if (LOAD_IMAGE_DATA(hdr, fap, off_, &info, sizeof(info))) {
         return BOOT_EFLASH;
     }