aboutsummaryrefslogtreecommitdiff
path: root/bl2/src
diff options
context:
space:
mode:
authorDavid Vincze <david.vincze@arm.com>2019-10-28 11:08:56 +0100
committerTamas Ban <tamas.ban@arm.com>2019-12-16 13:39:25 +0000
commit7673e595d101eaf31b6934cc8d5c2c407c40fda7 (patch)
tree38f506ce1096e15a07b05f78438bef8fbd5f9cf8 /bl2/src
parentc256612e0e773c76ae07dc8de7f776e3c029d7b0 (diff)
downloadtrusted-firmware-m-7673e595d101eaf31b6934cc8d5c2c407c40fda7.tar.gz
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>
Diffstat (limited to 'bl2/src')
-rw-r--r--bl2/src/boot_record.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/bl2/src/boot_record.c b/bl2/src/boot_record.c
index f7b2539fd0..ba98ebaab8 100644
--- a/bl2/src/boot_record.c
+++ b/bl2/src/boot_record.c
@@ -117,7 +117,7 @@ boot_save_sw_measurements(uint8_t sw_module,
* - public key hash: Signer ID
*/
for (; offset < tlv_end; offset += sizeof(tlv_entry) + tlv_entry.it_len) {
- res = LOAD_IMAGE_DATA(fap, offset, &tlv_entry, sizeof(tlv_entry));
+ res = LOAD_IMAGE_DATA(hdr, fap, offset, &tlv_entry, sizeof(tlv_entry));
if (res) {
return BOOT_STATUS_ERROR;
}
@@ -128,7 +128,7 @@ boot_save_sw_measurements(uint8_t sw_module,
return BOOT_STATUS_ERROR;
}
- res = LOAD_IMAGE_DATA(fap, offset + sizeof(tlv_entry),
+ res = LOAD_IMAGE_DATA(hdr, fap, offset + sizeof(tlv_entry),
buf, tlv_entry.it_len);
if (res) {
return BOOT_STATUS_ERROR;
@@ -162,7 +162,7 @@ boot_save_sw_measurements(uint8_t sw_module,
return BOOT_STATUS_ERROR;
}
- res = LOAD_IMAGE_DATA(fap, offset + sizeof(tlv_entry),
+ res = LOAD_IMAGE_DATA(hdr, fap, offset + sizeof(tlv_entry),
buf, tlv_entry.it_len);
if (res) {
return BOOT_STATUS_ERROR;
@@ -173,7 +173,7 @@ boot_save_sw_measurements(uint8_t sw_module,
if (tlv_entry.it_len > sizeof(key_buf)) {
return BOOT_STATUS_ERROR;
}
- res = LOAD_IMAGE_DATA(fap, offset + sizeof(tlv_entry),
+ res = LOAD_IMAGE_DATA(hdr, fap, offset + sizeof(tlv_entry),
key_buf, tlv_entry.it_len);
if (res) {
return BOOT_STATUS_ERROR;
@@ -411,7 +411,7 @@ boot_save_boot_status(uint8_t sw_module,
* and image hash TLVs.
*/
while (offset < tlv_end) {
- res = LOAD_IMAGE_DATA(fap, offset, &tlv_entry, sizeof(tlv_entry));
+ res = LOAD_IMAGE_DATA(hdr, fap, offset, &tlv_entry, sizeof(tlv_entry));
if (res) {
return BOOT_STATUS_ERROR;
}
@@ -420,7 +420,7 @@ boot_save_boot_status(uint8_t sw_module,
if (tlv_entry.it_len > sizeof(buf)) {
return BOOT_STATUS_ERROR;
}
- res = LOAD_IMAGE_DATA(fap, offset + sizeof(tlv_entry),
+ res = LOAD_IMAGE_DATA(hdr, fap, offset + sizeof(tlv_entry),
buf, tlv_entry.it_len);
if (res) {
return BOOT_STATUS_ERROR;
@@ -434,7 +434,7 @@ boot_save_boot_status(uint8_t sw_module,
if (tlv_entry.it_len > sizeof(image_hash)) {
return BOOT_STATUS_ERROR;
}
- res = LOAD_IMAGE_DATA(fap, offset + sizeof(tlv_entry),
+ res = LOAD_IMAGE_DATA(hdr, fap, offset + sizeof(tlv_entry),
image_hash, tlv_entry.it_len);
if (res) {
return BOOT_STATUS_ERROR;