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

Merge "fconf: spm: minor bug fix" into integration

This commit is contained in:
Madhukar Pappireddy 2020-07-30 23:57:25 +00:00 committed by TrustedFirmware Code Review
parent f0b1864f8e bef0192a2e
commit 499f192c1d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,11 @@ int fconf_populate_arm_sp(uintptr_t config)
}
fdt_for_each_subnode(sp_node, dtb, node) {
if (index == MAX_SP_IDS) {
ERROR("FCONF: Reached max number of SPs\n");
return -1;
}
err = fdt_read_uint32_array(dtb, sp_node, "uuid", 4,
uuid_helper.word);
if (err < 0) {
@ -87,15 +92,10 @@ int fconf_populate_arm_sp(uintptr_t config)
policies[sp_start_index + index].check = open_fip;
index++;
if (index >= MAX_SP_IDS) {
ERROR("FCONF: reached max number of SPs\n");
return -1;
}
}
if ((sp_node < 0) && (sp_node != -FDT_ERR_NOTFOUND)) {
ERROR("%d: fdt_for_each_subnode(): %d\n", __LINE__, node);
ERROR("%u: fdt_for_each_subnode(): %d\n", __LINE__, node);
return sp_node;
}