From 78628ac9a95ec2bb6bffa049323beb6af3eb3f37 Mon Sep 17 00:00:00 2001 From: Jason Zhu Date: Wed, 11 Mar 2020 19:24:34 +0800 Subject: [PATCH] common: spl: jump next process depend on entry_point_os The spl can bring up uboot & kernel, and their entry points are diffirent, so pass their entry points by entry_point_os. Signed-off-by: Jason Zhu Change-Id: I625d135d219cfbfb620ff1e3d0de5278143f4079 --- common/spl/spl.c | 3 ++- common/spl/spl_optee.S | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index a8c75888fa..2dd8608533 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -517,7 +517,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2) #if CONFIG_IS_ENABLED(OPTEE) case IH_OS_OP_TEE: debug("Jumping to U-Boot via OP-TEE\n"); - spl_optee_entry(NULL, NULL, (void *)spl_image.fdt_addr, + spl_optee_entry(NULL, (void *)spl_image.entry_point_os, + (void *)spl_image.fdt_addr, (void *)spl_image.entry_point); break; #endif diff --git a/common/spl/spl_optee.S b/common/spl/spl_optee.S index 64b24956ee..ddeb2ca892 100644 --- a/common/spl/spl_optee.S +++ b/common/spl/spl_optee.S @@ -8,7 +8,6 @@ #include ENTRY(spl_optee_entry) - ldr lr, =CONFIG_SYS_TEXT_BASE - ldr r1, =CONFIG_SYS_TEXT_BASE + mov lr, r1 mov pc, r3 ENDPROC(spl_optee_entry)