diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/common/firmware_image_package.h | 2 | ||||
| -rw-r--r-- | include/common/tbbr/tbbr_img_def.h | 4 | ||||
| -rw-r--r-- | include/plat/arm/board/common/board_arm_oid.h | 4 | ||||
| -rw-r--r-- | include/plat/arm/css/common/css_def.h | 8 | ||||
| -rw-r--r-- | include/plat/common/platform.h | 10 |
5 files changed, 14 insertions, 14 deletions
diff --git a/include/common/firmware_image_package.h b/include/common/firmware_image_package.h index 30c55025..b9723957 100644 --- a/include/common/firmware_image_package.h +++ b/include/common/firmware_image_package.h @@ -49,7 +49,7 @@ {0xb28a4071, 0xd618, 0x4c87, 0x8b, 0x2e, {0xc6, 0xdc, 0xcd, 0x50, 0xf0, 0x96} } #define UUID_TRUSTED_BOOT_FIRMWARE_BL2 \ {0x0becf95f, 0x224d, 0x4d3e, 0xa5, 0x44, {0xc3, 0x9d, 0x81, 0xc7, 0x3f, 0x0a} } -#define UUID_SCP_FIRMWARE_BL30 \ +#define UUID_SCP_FIRMWARE_SCP_BL2 \ {0x3dfd6697, 0xbe89, 0x49e8, 0xae, 0x5d, {0x78, 0xa1, 0x40, 0x60, 0x82, 0x13} } #define UUID_EL3_RUNTIME_FIRMWARE_BL31 \ {0x6d08d447, 0xfe4c, 0x4698, 0x9b, 0x95, {0x29, 0x50, 0xcb, 0xbd, 0x5a, 0x00} } diff --git a/include/common/tbbr/tbbr_img_def.h b/include/common/tbbr/tbbr_img_def.h index 8b16639a..ad10e2e5 100644 --- a/include/common/tbbr/tbbr_img_def.h +++ b/include/common/tbbr/tbbr_img_def.h @@ -37,8 +37,8 @@ /* Trusted Boot Firmware BL2 */ #define BL2_IMAGE_ID 1 -/* SCP Firmware BL3-0 */ -#define BL30_IMAGE_ID 2 +/* SCP Firmware SCP_BL2 */ +#define SCP_BL2_IMAGE_ID 2 /* EL3 Runtime Firmware BL31 */ #define BL31_IMAGE_ID 3 diff --git a/include/plat/arm/board/common/board_arm_oid.h b/include/plat/arm/board/common/board_arm_oid.h index bf26a48b..cbf22900 100644 --- a/include/plat/arm/board/common/board_arm_oid.h +++ b/include/plat/arm/board/common/board_arm_oid.h @@ -127,9 +127,9 @@ * SCP Firmware Content Certificate */ -/* SCPFirmwareHash - BL30 */ +/* SCPFirmwareHash - SCP_BL2 */ #define SCP_FW_HASH_OID "1.3.6.1.4.1.4128.2100.801" -/* SCPRomPatchHash - BL0_PATCH */ +/* SCPRomPatchHash - SCP_BL1_PATCH */ #define SCP_ROM_PATCH_HASH_OID "1.3.6.1.4.1.4128.2100.802" 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 diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h index b3213b8f..b6a037f2 100644 --- a/include/plat/common/platform.h +++ b/include/plat/common/platform.h @@ -166,17 +166,17 @@ void bl2_plat_set_bl33_ep_info(struct image_info *image, void bl2_plat_get_bl33_meminfo(struct meminfo *mem_info); /******************************************************************************* - * Conditionally mandatory BL2 functions: must be implemented if BL3-0 image + * Conditionally mandatory BL2 functions: must be implemented if SCP_BL2 image * is supported ******************************************************************************/ -/* Gets the memory layout for BL3-0 */ -void bl2_plat_get_bl30_meminfo(struct meminfo *mem_info); +/* Gets the memory layout for SCP_BL2 */ +void bl2_plat_get_scp_bl2_meminfo(struct meminfo *mem_info); /* - * This function is called after loading BL3-0 image and it is used to perform + * This function is called after loading SCP_BL2 image and it is used to perform * any platform-specific actions required to handle the SCP firmware. */ -int bl2_plat_handle_bl30(struct image_info *bl30_image_info); +int bl2_plat_handle_scp_bl2(struct image_info *scp_bl2_image_info); /******************************************************************************* * Conditionally mandatory BL2 functions: must be implemented if BL3-2 image |