From d5d6b896114c06e2632c2965fca0efc869f1969c Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Wed, 6 Apr 2016 15:05:54 +0100 Subject: [PATCH] Fix BL33_BASE option to work with RESET_TO_BL31 The BL33 address is now set in arm_bl31_early_platform_setup() so that the preloaded BL33 boot option is available when RESET_TO_BL31 is also used. Change-Id: Iab93e3916f9199c3387886b055c7cd2315efed29 --- plat/arm/common/arm_bl31_setup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c index 5cc8bfb1d..deb961292 100644 --- a/plat/arm/common/arm_bl31_setup.c +++ b/plat/arm/common/arm_bl31_setup.c @@ -142,7 +142,11 @@ void arm_bl31_early_platform_setup(bl31_params_t *from_bl2, * Tell BL31 where the non-trusted software image * is located and the entry state information */ +#ifdef BL33_BASE + bl33_image_ep_info.pc = BL33_BASE; +#else bl33_image_ep_info.pc = plat_get_ns_image_entrypoint(); +#endif bl33_image_ep_info.spsr = arm_get_spsr_for_bl33_entry(); SET_SECURITY_STATE(bl33_image_ep_info.h.attr, NON_SECURE);