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

Merge "plat/arm: don't provide NT_FW_CONFIG when booting hafnium" into integration

This commit is contained in:
Olivier Deprez 2021-04-13 14:16:08 +02:00 committed by TrustedFirmware Code Review
parent c55497a207 2b6fc53584
commit 3b9e06a6dd
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plat/arm/board/fvp/fdts/fvp_fw_config.dts
View File

@ -42,10 +42,12 @@
id = <TOS_FW_CONFIG_ID>;
};
#if !defined(SPD_spmd)
nt_fw-config {
load-address = <0x0 0x80000000>;
max-size = <0x200>;
id = <NT_FW_CONFIG_ID>;
};
#endif
};
};

16
plat/arm/common/arm_bl31_setup.c
View File

@ -148,14 +148,6 @@ void __init arm_bl31_early_platform_setup(void *from_bl2, uintptr_t soc_fw_confi
bl33_image_ep_info.spsr = arm_get_spsr_for_bl33_entry();
SET_SECURITY_STATE(bl33_image_ep_info.h.attr, NON_SECURE);
#if defined(SPD_spmd) && !(ARM_LINUX_KERNEL_AS_BL33)
/*
* Hafnium in normal world expects its manifest address in x0, which
* is loaded at base of DRAM.
*/
bl33_image_ep_info.args.arg0 = (u_register_t)ARM_DRAM1_BASE;
#endif
#else /* RESET_TO_BL31 */
/*
@ -206,6 +198,14 @@ void __init arm_bl31_early_platform_setup(void *from_bl2, uintptr_t soc_fw_confi
bl33_image_ep_info.args.arg2 = 0U;
bl33_image_ep_info.args.arg3 = 0U;
# endif
#if defined(SPD_spmd)
/*
* Hafnium in normal world expects its manifest address in x0, In CI
* configuration manifest is preloaded at 0x80000000(start of DRAM).
*/
bl33_image_ep_info.args.arg0 = (u_register_t)ARM_DRAM1_BASE;
#endif
}
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,