Merge changes from topic "linux_as_bl33" into integration
* changes: plat/arm: Remove ARM_LINUX_KERNEL_AS_BL33 relying on RESET_TO_BL31 plat/arm: Always allow ARM_LINUX_KERNEL_AS_BL33
This commit is contained in:
commit
5491208afa
|
@ -156,19 +156,6 @@ void __init arm_bl31_early_platform_setup(void *from_bl2, uintptr_t soc_fw_confi
|
||||||
bl33_image_ep_info.args.arg0 = (u_register_t)ARM_DRAM1_BASE;
|
bl33_image_ep_info.args.arg0 = (u_register_t)ARM_DRAM1_BASE;
|
||||||
#endif
|
#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 */
|
#else /* RESET_TO_BL31 */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -206,6 +193,19 @@ void __init arm_bl31_early_platform_setup(void *from_bl2, uintptr_t soc_fw_confi
|
||||||
if (bl33_image_ep_info.pc == 0U)
|
if (bl33_image_ep_info.pc == 0U)
|
||||||
panic();
|
panic();
|
||||||
#endif /* RESET_TO_BL31 */
|
#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
|
||||||
}
|
}
|
||||||
|
|
||||||
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
|
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
|
||||||
|
|
|
@ -86,11 +86,7 @@ $(eval $(call assert_boolean,ARM_LINUX_KERNEL_AS_BL33))
|
||||||
$(eval $(call add_define,ARM_LINUX_KERNEL_AS_BL33))
|
$(eval $(call add_define,ARM_LINUX_KERNEL_AS_BL33))
|
||||||
|
|
||||||
ifeq (${ARM_LINUX_KERNEL_AS_BL33},1)
|
ifeq (${ARM_LINUX_KERNEL_AS_BL33},1)
|
||||||
ifeq (${ARCH},aarch64)
|
ifneq (${ARCH},aarch64)
|
||||||
ifneq (${RESET_TO_BL31},1)
|
|
||||||
$(error "ARM_LINUX_KERNEL_AS_BL33 is only available if RESET_TO_BL31=1.")
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
ifneq (${RESET_TO_SP_MIN},1)
|
ifneq (${RESET_TO_SP_MIN},1)
|
||||||
$(error "ARM_LINUX_KERNEL_AS_BL33 is only available if RESET_TO_SP_MIN=1.")
|
$(error "ARM_LINUX_KERNEL_AS_BL33 is only available if RESET_TO_SP_MIN=1.")
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue