summaryrefslogtreecommitdiff
path: root/plat/arm/common
diff options
context:
space:
mode:
authorAntonio Nino Diaz <antonio.ninodiaz@arm.com>2016-04-06 17:31:57 +0100
committerAntonio Nino Diaz <antonio.ninodiaz@arm.com>2016-04-08 09:36:48 +0100
commit68450a6d5bbe3b6a79bd42d508e2d6bb0ed4b6f6 (patch)
tree37740c15dd62bda3ea0c6529adcbdb247a33a915 /plat/arm/common
parentd5d6b896114c06e2632c2965fca0efc869f1969c (diff)
Rename BL33_BASE option to PRELOADED_BL33_BASE
To avoid confusion the build option BL33_BASE has been renamed to PRELOADED_BL33_BASE, which is more descriptive of what it does and doesn't get mistaken by similar names like BL32_BASE that work in a completely different way. NOTE: PLATFORMS USING BUILD OPTION `BL33_BASE` MUST CHANGE TO THE NEW BUILD OPTION `PRELOADED_BL33_BASE`. Change-Id: I658925ebe95406edf0325f15aa1752e1782aa45b
Diffstat (limited to 'plat/arm/common')
-rw-r--r--plat/arm/common/arm_bl31_setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c
index deb96129..8fcfa775 100644
--- a/plat/arm/common/arm_bl31_setup.c
+++ b/plat/arm/common/arm_bl31_setup.c
@@ -142,11 +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;
+#ifdef PRELOADED_BL33_BASE
+ bl33_image_ep_info.pc = PRELOADED_BL33_BASE;
#else
bl33_image_ep_info.pc = plat_get_ns_image_entrypoint();
-#endif
+#endif /* PRELOADED_BL33_BASE */
bl33_image_ep_info.spsr = arm_get_spsr_for_bl33_entry();
SET_SECURITY_STATE(bl33_image_ep_info.h.attr, NON_SECURE);