diff options
Diffstat (limited to 'include/common')
| -rw-r--r-- | include/common/bl_common.h | 10 | ||||
| -rw-r--r-- | include/common/el3_common_macros.S | 2 | ||||
| -rw-r--r-- | include/common/firmware_image_package.h | 20 | ||||
| -rw-r--r-- | include/common/tbbr/tbbr_img_def.h | 22 |
4 files changed, 27 insertions, 27 deletions
diff --git a/include/common/bl_common.h b/include/common/bl_common.h index b7cb95aa..0ec7a8d8 100644 --- a/include/common/bl_common.h +++ b/include/common/bl_common.h @@ -245,14 +245,14 @@ typedef struct image_desc { * This structure represents the superset of information that can be passed to * BL31 e.g. while passing control to it from BL2. The BL32 parameters will be * populated only if BL2 detects its presence. A pointer to a structure of this - * type should be passed in X0 to BL3-1's cold boot entrypoint. + * type should be passed in X0 to BL31's cold boot entrypoint. * - * Use of this structure and the X0 parameter is not mandatory: the BL3-1 + * Use of this structure and the X0 parameter is not mandatory: the BL31 * platform code can use other mechanisms to provide the necessary information - * about BL3-2 and BL3-3 to the common and SPD code. + * about BL32 and BL33 to the common and SPD code. * - * BL3-1 image information is mandatory if this structure is used. If either of - * the optional BL3-2 and BL3-3 image information is not provided, this is + * BL31 image information is mandatory if this structure is used. If either of + * the optional BL32 and BL33 image information is not provided, this is * indicated by the respective image_info pointers being zero. ******************************************************************************/ typedef struct bl31_params { diff --git a/include/common/el3_common_macros.S b/include/common/el3_common_macros.S index 0514e2a2..6f7136f9 100644 --- a/include/common/el3_common_macros.S +++ b/include/common/el3_common_macros.S @@ -104,7 +104,7 @@ /* ----------------------------------------------------------------------------- * This is the super set of actions that need to be performed during a cold boot - * or a warm boot in EL3. This code is shared by BL1 and BL3-1. + * or a warm boot in EL3. This code is shared by BL1 and BL31. * * This macro will always perform reset handling, architectural initialisations * and stack setup. The rest of the actions are optional because they might not diff --git a/include/common/firmware_image_package.h b/include/common/firmware_image_package.h index daa043a8..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} } @@ -64,24 +64,24 @@ {0x90e87e82, 0x60f8, 0x11e4, 0xa1, 0xb4, {0x77, 0x7a, 0x21, 0xb4, 0xf9, 0x4c} } #define UUID_NON_TRUSTED_WORLD_KEY_CERT \ {0x3d87671c, 0x635f, 0x11e4, 0x97, 0x8d, {0x27, 0xc0, 0xc7, 0x14, 0x8a, 0xbd} } -#define UUID_SCP_FIRMWARE_BL30_KEY_CERT \ +#define UUID_SCP_FW_KEY_CERT \ {0xa1214202, 0x60f8, 0x11e4, 0x8d, 0x9b, {0xf3, 0x3c, 0x0e, 0x15, 0xa0, 0x14} } -#define UUID_EL3_RUNTIME_FIRMWARE_BL31_KEY_CERT \ +#define UUID_SOC_FW_KEY_CERT \ {0xccbeb88a, 0x60f9, 0x11e4, 0x9a, 0xd0, {0xeb, 0x48, 0x22, 0xd8, 0xdc, 0xf8} } -#define UUID_SECURE_PAYLOAD_BL32_KEY_CERT \ +#define UUID_TRUSTED_OS_FW_KEY_CERT \ {0x03d67794, 0x60fb, 0x11e4, 0x85, 0xdd, {0xb7, 0x10, 0x5b, 0x8c, 0xee, 0x04} } -#define UUID_NON_TRUSTED_FIRMWARE_BL33_KEY_CERT \ +#define UUID_NON_TRUSTED_FW_KEY_CERT \ {0x2a83d58a, 0x60fb, 0x11e4, 0x8a, 0xaf, {0xdf, 0x30, 0xbb, 0xc4, 0x98, 0x59} } /* Content certificates */ -#define UUID_TRUSTED_BOOT_FIRMWARE_BL2_CERT \ +#define UUID_TRUSTED_BOOT_FW_CERT \ {0xea69e2d6, 0x635d, 0x11e4, 0x8d, 0x8c, {0x9f, 0xba, 0xbe, 0x99, 0x56, 0xa5} } -#define UUID_SCP_FIRMWARE_BL30_CERT \ +#define UUID_SCP_FW_CONTENT_CERT \ {0x046fbe44, 0x635e, 0x11e4, 0xb2, 0x8b, {0x73, 0xd8, 0xea, 0xae, 0x96, 0x56} } -#define UUID_EL3_RUNTIME_FIRMWARE_BL31_CERT \ +#define UUID_SOC_FW_CONTENT_CERT \ {0x200cb2e2, 0x635e, 0x11e4, 0x9c, 0xe8, {0xab, 0xcc, 0xf9, 0x2b, 0xb6, 0x66} } -#define UUID_SECURE_PAYLOAD_BL32_CERT \ +#define UUID_TRUSTED_OS_FW_CONTENT_CERT \ {0x11449fa4, 0x635e, 0x11e4, 0x87, 0x28, {0x3f, 0x05, 0x72, 0x2a, 0xf3, 0x3d} } -#define UUID_NON_TRUSTED_FIRMWARE_BL33_CERT \ +#define UUID_NON_TRUSTED_FW_CONTENT_CERT \ {0xf3c1c48e, 0x635d, 0x11e4, 0xa7, 0xa9, {0x87, 0xee, 0x40, 0xb2, 0x3f, 0xa7} } typedef struct fip_toc_header { diff --git a/include/common/tbbr/tbbr_img_def.h b/include/common/tbbr/tbbr_img_def.h index fabe0b94..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 @@ -50,18 +50,18 @@ #define BL33_IMAGE_ID 5 /* Certificates */ -#define BL2_CERT_ID 6 +#define TRUSTED_BOOT_FW_CERT_ID 6 #define TRUSTED_KEY_CERT_ID 7 -#define BL30_KEY_CERT_ID 8 -#define BL31_KEY_CERT_ID 9 -#define BL32_KEY_CERT_ID 10 -#define BL33_KEY_CERT_ID 11 +#define SCP_FW_KEY_CERT_ID 8 +#define SOC_FW_KEY_CERT_ID 9 +#define TRUSTED_OS_FW_KEY_CERT_ID 10 +#define NON_TRUSTED_FW_KEY_CERT_ID 11 -#define BL30_CERT_ID 12 -#define BL31_CERT_ID 13 -#define BL32_CERT_ID 14 -#define BL33_CERT_ID 15 +#define SCP_FW_CONTENT_CERT_ID 12 +#define SOC_FW_CONTENT_CERT_ID 13 +#define TRUSTED_OS_FW_CONTENT_CERT_ID 14 +#define NON_TRUSTED_FW_CONTENT_CERT_ID 15 /* Non-Trusted ROM Firmware NS_BL1U */ #define NS_BL1U_IMAGE_ID 16 |