From f8ca32e1ca9a3df6a1e6fb6997721307c33f354e Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Fri, 13 Mar 2020 09:32:01 +0800 Subject: [PATCH] common: spl: set default address for entry_point_os Could be override in boot_from_devices(). Signed-off-by: Joseph Chen Change-Id: Ifbfac5903ec61e65739732949f9e6b8a2704155d --- common/spl/spl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/spl/spl.c b/common/spl/spl.c index 2dd8608533..675ba6129f 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -487,6 +487,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2) spl_image.entry_point_bl33 = CONFIG_SYS_TEXT_BASE; #endif +#if CONFIG_IS_ENABLED(OPTEE) + /* default address */ + spl_image.entry_point_os = CONFIG_SYS_TEXT_BASE; +#endif + #ifdef CONFIG_SYS_SPL_ARGS_ADDR spl_image.arg = (void *)CONFIG_SYS_SPL_ARGS_ADDR; #endif