qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <jason.zhu@rock-chips.com>
Change-Id: I625d135d219cfbfb620ff1e3d0de5278143f4079
This commit is contained in:
Jason Zhu 2020-03-11 19:24:34 +08:00 committed by Jianhong Chen
parent a64fd729d4
commit 78628ac9a9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/spl/spl.c
View File

@ -517,7 +517,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
#if CONFIG_IS_ENABLED(OPTEE) #if CONFIG_IS_ENABLED(OPTEE)
case IH_OS_OP_TEE: case IH_OS_OP_TEE:
debug("Jumping to U-Boot via OP-TEE\n"); 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); (void *)spl_image.entry_point);
break; break;
#endif #endif

3
common/spl/spl_optee.S
View File

@ -8,7 +8,6 @@
#include <asm/assembler.h> #include <asm/assembler.h>
ENTRY(spl_optee_entry) ENTRY(spl_optee_entry)
ldr lr, =CONFIG_SYS_TEXT_BASE mov lr, r1
ldr r1, =CONFIG_SYS_TEXT_BASE
mov pc, r3 mov pc, r3
ENDPROC(spl_optee_entry) ENDPROC(spl_optee_entry)