Browse Source

Merge "fix(versal-net): remove check for bl32 load address" into integration

pull/2000/merge
Joanna Farley 5 months ago
committed by TrustedFirmware Code Review
parent
commit
6869d9d82c
  1. 12
      plat/xilinx/versal_net/bl31_versal_net_setup.c

12
plat/xilinx/versal_net/bl31_versal_net_setup.c

@ -153,18 +153,6 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
INFO("BL31: PLM to TF-A handover success\n");
/*
* The BL32 load address is indicated as 0x0 in the handoff
* parameters, which is different from the default/user-provided
* load address of 0x60000000 but the flags are correctly
* configured. Consequently, in this scenario, set the PC
* to the requested BL32_BASE address.
*/
/* TODO: Remove the following check once this is fixed from PLM */
if (bl32_image_ep_info.pc == 0 && bl32_image_ep_info.spsr != 0) {
bl32_image_ep_info.pc = (uintptr_t)BL32_BASE;
}
} else {
INFO("BL31: setting up default configs\n");

Loading…
Cancel
Save