Merge "fix(plat/arm): fix a VERBOSE trace" into integration
This commit is contained in:
commit
c0db39cefc
|
@ -66,6 +66,15 @@ int fconf_populate_arm_sp(uintptr_t config)
|
||||||
}
|
}
|
||||||
|
|
||||||
arm_sp.uuids[index] = uuid_helper;
|
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"
|
VERBOSE("FCONF: %s UUID"
|
||||||
" %02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
|
" %02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
|
||||||
" load_addr=%lx\n",
|
" 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],
|
uuid_helper.uuid_struct.node[4], uuid_helper.uuid_struct.node[5],
|
||||||
arm_sp.load_addr[index]);
|
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 */
|
/* Read owner field only for dualroot CoT */
|
||||||
#if defined(ARM_COT_dualroot)
|
#if defined(ARM_COT_dualroot)
|
||||||
/* Owner is an optional field, no need to catch error */
|
/* Owner is an optional field, no need to catch error */
|
||||||
|
|
Loading…
Reference in New Issue