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

diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c
index 5cc8bfb1dc64776ee0f2069fb08cc8c0543e95fb..deb9612927d2dead2b9cc81674e49248b3c53d7f 100644 (file)
--- 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);