andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fix(plat/arm): fix a VERBOSE trace" into integration

This commit is contained in:
Sandrine Bailleux 2021-11-18 10:28:20 +01:00 committed by TrustedFirmware Code Review
parent 637fd777bc 5869ebd0e8
commit c0db39cefc
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plat/arm/common/fconf/arm_fconf_sp.c
View File

@ -66,6 +66,15 @@ int fconf_populate_arm_sp(uintptr_t config)
}
arm_sp.uuids[index] = uuid_helper;
/* Read Load address */
err = fdt_read_uint32(dtb, sp_node, "load-address", &val32);
if (err < 0) {
ERROR("FCONF: cannot read SP load address\n");
return -1;
}
arm_sp.load_addr[index] = val32;
VERBOSE("FCONF: %s UUID"
" %02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
" load_addr=%lx\n",
@ -82,14 +91,6 @@ int fconf_populate_arm_sp(uintptr_t config)
uuid_helper.uuid_struct.node[4], uuid_helper.uuid_struct.node[5],
arm_sp.load_addr[index]);
/* Read Load address */
err = fdt_read_uint32(dtb, sp_node, "load-address", &val32);
if (err < 0) {
ERROR("FCONF: cannot read SP load address\n");
return -1;
}
arm_sp.load_addr[index] = val32;
/* Read owner field only for dualroot CoT */
#if defined(ARM_COT_dualroot)
/* Owner is an optional field, no need to catch error */