diff options
Diffstat (limited to 'plat/arm/common/arm_bl31_setup.c')
| -rw-r--r-- | plat/arm/common/arm_bl31_setup.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c index 81ef6e7b2..b819888d3 100644 --- a/plat/arm/common/arm_bl31_setup.c +++ b/plat/arm/common/arm_bl31_setup.c @@ -148,27 +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 - -# if ARM_LINUX_KERNEL_AS_BL33 - /* - * According to the file ``Documentation/arm64/booting.txt`` of the - * Linux kernel tree, Linux expects the physical address of the device - * tree blob (DTB) in x0, while x1-x3 are reserved for future use and - * must be 0. - */ - bl33_image_ep_info.args.arg0 = (u_register_t)ARM_PRELOADED_DTB_BASE; - bl33_image_ep_info.args.arg1 = 0U; - bl33_image_ep_info.args.arg2 = 0U; - bl33_image_ep_info.args.arg3 = 0U; -# endif - #else /* RESET_TO_BL31 */ /* @@ -206,6 +185,27 @@ void __init arm_bl31_early_platform_setup(void *from_bl2, uintptr_t soc_fw_confi if (bl33_image_ep_info.pc == 0U) panic(); #endif /* RESET_TO_BL31 */ + +# if ARM_LINUX_KERNEL_AS_BL33 + /* + * According to the file ``Documentation/arm64/booting.txt`` of the + * Linux kernel tree, Linux expects the physical address of the device + * tree blob (DTB) in x0, while x1-x3 are reserved for future use and + * must be 0. + */ + bl33_image_ep_info.args.arg0 = (u_register_t)ARM_PRELOADED_DTB_BASE; + bl33_image_ep_info.args.arg1 = 0U; + 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, |