diff options
| author | danh-arm <dan.handley@arm.com> | 2015-12-14 18:00:27 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2015-12-14 18:00:27 +0000 |
| commit | 31d5e7f56ea66d2b540fcb25fb27b930dfc45221 (patch) | |
| tree | d5cc70b9270853267cfbb213b1d65b39c0d2899d /include/common/firmware_image_package.h | |
| parent | a84deb9c3fe5396d580b695acc09a75d67332559 (diff) | |
| parent | d178637d2bac46ef0d227395663c55cc46a25d73 (diff) | |
Merge pull request #467 from jcastillo-arm/jc/tbb_oid
Apply new image terminology
Diffstat (limited to 'include/common/firmware_image_package.h')
| -rw-r--r-- | include/common/firmware_image_package.h | 20 |
1 files changed, 10 insertions, 10 deletions
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 { |