diff options
| author | Juan Castillo <juan.castillo@arm.com> | 2015-12-10 15:49:17 +0000 |
|---|---|---|
| committer | Juan Castillo <juan.castillo@arm.com> | 2015-12-14 12:31:16 +0000 |
| commit | f59821d51255f14e0ac00eef7bc98ef75c686876 (patch) | |
| tree | 2a62aec945a1c30ed695ba2a3336c08d94183ab3 /include/plat/arm/css/common | |
| parent | 516beb585c23056820a854b12c77a6f62cbc5c8b (diff) | |
Replace all SCP FW (BL0, BL3-0) references
This patch replaces all references to the SCP Firmware (BL0, BL30,
BL3-0, bl30) with the image terminology detailed in the TF wiki
(https://github.com/ARM-software/arm-trusted-firmware/wiki):
BL0 --> SCP_BL1
BL30, BL3-0 --> SCP_BL2
bl30 --> scp_bl2
This change affects code, documentation, build system, tools and
platform ports that load SCP firmware. ARM plaforms have been
updated to the new porting API.
IMPORTANT: build option to specify the SCP FW image has changed:
BL30 --> SCP_BL2
IMPORTANT: This patch breaks compatibility for platforms that use BL2
to load SCP firmware. Affected platforms must be updated as follows:
BL30_IMAGE_ID --> SCP_BL2_IMAGE_ID
BL30_BASE --> SCP_BL2_BASE
bl2_plat_get_bl30_meminfo() --> bl2_plat_get_scp_bl2_meminfo()
bl2_plat_handle_bl30() --> bl2_plat_handle_scp_bl2()
Change-Id: I24c4c1a4f0e4b9f17c9e4929da815c4069549e58
Diffstat (limited to 'include/plat/arm/css/common')
| -rw-r--r-- | include/plat/arm/css/common/css_def.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h index 3fa4c153..dcc7790e 100644 --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@ -82,7 +82,7 @@ * primary, according to the shift and mask definitions below. * * Note that the value stored at this address is only valid at boot time, before - * the BL3-0 image is transferred to SCP. + * the SCP_BL2 image is transferred to SCP. */ #define SCP_BOOT_CFG_ADDR (ARM_TRUSTED_SRAM_BASE + 0x80) #define PRIMARY_CPU_SHIFT 8 @@ -110,11 +110,11 @@ ************************************************************************/ /* - * Load address of BL3-0 in CSS platform ports - * BL3-0 is loaded to the same place as BL3-1. Once BL3-0 is transferred to the + * Load address of SCP_BL2 in CSS platform ports + * SCP_BL2 is loaded to the same place as BL3-1. Once SCP_BL2 is transferred to the * SCP, it is discarded and BL3-1 is loaded over the top. */ -#define BL30_BASE BL31_BASE +#define SCP_BL2_BASE BL31_BASE #define SCP_BL2U_BASE BL31_BASE |