diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2016-04-06 17:31:57 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2016-04-08 09:36:48 +0100 |
| commit | 68450a6d5bbe3b6a79bd42d508e2d6bb0ed4b6f6 (patch) | |
| tree | 37740c15dd62bda3ea0c6529adcbdb247a33a915 /bl2 | |
| parent | d5d6b896114c06e2632c2965fca0efc869f1969c (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 'bl2')
| -rw-r--r-- | bl2/bl2_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c index 73781dd0..c8fd683c 100644 --- a/bl2/bl2_main.c +++ b/bl2/bl2_main.c @@ -169,7 +169,7 @@ static int load_bl32(bl31_params_t *bl2_to_bl31_params) return e; } -#ifndef BL33_BASE +#ifndef PRELOADED_BL33_BASE /******************************************************************************* * Load the BL33 image. * The bl2_to_bl31_params param will be updated with the relevant BL33 @@ -200,7 +200,7 @@ static int load_bl33(bl31_params_t *bl2_to_bl31_params) return e; } -#endif /* BL33_BASE */ +#endif /* PRELOADED_BL33_BASE */ #endif /* EL3_PAYLOAD_BASE */ @@ -277,13 +277,13 @@ void bl2_main(void) } } -#ifdef BL33_BASE +#ifdef PRELOADED_BL33_BASE /* * In this case, don't load the BL33 image as it's already loaded in * memory. Update BL33 entrypoint information. */ INFO("BL2: Populating the entrypoint info for the preloaded BL33\n"); - bl2_to_bl31_params->bl33_ep_info->pc = BL33_BASE; + bl2_to_bl31_params->bl33_ep_info->pc = PRELOADED_BL33_BASE; bl2_plat_set_bl33_ep_info(NULL, bl2_to_bl31_params->bl33_ep_info); #else e = load_bl33(bl2_to_bl31_params); @@ -291,7 +291,7 @@ void bl2_main(void) ERROR("Failed to load BL33 (%i)\n", e); plat_error_handler(e); } -#endif /* BL33_BASE */ +#endif /* PRELOADED_BL33_BASE */ #endif /* EL3_PAYLOAD_BASE */ |