diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2018-03-29 14:29:55 +0100 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2018-05-18 12:26:38 +0100 |
| commit | 17bc617e80e2b31ddaa65215526c556c23ca1374 (patch) | |
| tree | ee54f9ade643a8826921b3f054b182382d4c8f44 /include | |
| parent | 6e79f9fd4b65f473374391595e31c155e9e0ad85 (diff) | |
| download | platform_external_arm-trusted-firmware-17bc617e80e2b31ddaa65215526c556c23ca1374.tar.gz platform_external_arm-trusted-firmware-17bc617e80e2b31ddaa65215526c556c23ca1374.tar.bz2 platform_external_arm-trusted-firmware-17bc617e80e2b31ddaa65215526c556c23ca1374.zip | |
Dynamic cfg: Enable support on CoT for other configs
This patch implements support for adding dynamic configurations for
BL31 (soc_fw_config), BL32 (tos_fw_config) and BL33 (nt_fw_config). The
necessary cert tool support and changes to default chain of trust are made
for these configs.
Change-Id: I25f266277b5b5501a196d2f2f79639d838794518
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools_share/firmware_image_package.h | 6 | ||||
| -rw-r--r-- | include/tools_share/tbbr_oid.h | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/tools_share/firmware_image_package.h b/include/tools_share/firmware_image_package.h index b7fac07f6..f25855523 100644 --- a/include/tools_share/firmware_image_package.h +++ b/include/tools_share/firmware_image_package.h @@ -68,6 +68,12 @@ {0xd9f1b808, 0xcfc9, 0x4993, 0xa9, 0x62, {0x6f, 0xbc, 0x6b, 0x72, 0x65, 0xcc} } #define UUID_TB_FW_CONFIG \ {0xff58046c, 0x6baf, 0x4f7d, 0x82, 0xed, {0xaa, 0x27, 0xbc, 0x69, 0xbf, 0xd2} } +#define UUID_SOC_FW_CONFIG \ + {0x4b817999, 0x7603, 0x46fb, 0x8c, 0x8e, {0x8d, 0x26, 0x7f, 0x78, 0x59, 0xe0} } +#define UUID_TOS_FW_CONFIG \ + {0x1a7c2526, 0xc6bd, 0x477f, 0x8d, 0x96, {0xc4, 0xc4, 0xb0, 0x24, 0x80, 0x21} } +#define UUID_NT_FW_CONFIG \ + {0x1598da28, 0xe893, 0x447e, 0xac, 0x66, {0x1a, 0xaf, 0x80, 0x15, 0x50, 0xf9} } typedef struct fip_toc_header { uint32_t name; diff --git a/include/tools_share/tbbr_oid.h b/include/tools_share/tbbr_oid.h index 18ddbdc2a..b0b95e420 100644 --- a/include/tools_share/tbbr_oid.h +++ b/include/tools_share/tbbr_oid.h @@ -75,7 +75,6 @@ /* SoCFirmwareContentCertPK */ #define SOC_FW_CONTENT_CERT_PK_OID "1.3.6.1.4.1.4128.2100.501" - /* * SoC Firmware Content Certificate */ @@ -86,7 +85,8 @@ #define SOC_CONFIG_HASH_OID "1.3.6.1.4.1.4128.2100.602" /* SoCAPFirmwareHash - BL31 */ #define SOC_AP_FW_HASH_OID "1.3.6.1.4.1.4128.2100.603" - +/* SoCFirmwareConfigHash = SOC_FW_CONFIG */ +#define SOC_FW_CONFIG_HASH_OID "1.3.6.1.4.1.4128.2100.604" /* * SCP Firmware Key Certificate @@ -124,6 +124,8 @@ #define TRUSTED_OS_FW_EXTRA1_HASH_OID "1.3.6.1.4.1.4128.2100.1002" /* TrustedOSExtra2FirmwareHash - BL32 Extra2 */ #define TRUSTED_OS_FW_EXTRA2_HASH_OID "1.3.6.1.4.1.4128.2100.1003" +/* TrustedOSFirmwareConfigHash - TOS_FW_CONFIG */ +#define TRUSTED_OS_FW_CONFIG_HASH_OID "1.3.6.1.4.1.4128.2100.1004" /* @@ -140,5 +142,7 @@ /* NonTrustedWorldBootloaderHash - BL33 */ #define NON_TRUSTED_WORLD_BOOTLOADER_HASH_OID "1.3.6.1.4.1.4128.2100.1201" +/* NonTrustedFirmwareConfigHash - NT_FW_CONFIG */ +#define NON_TRUSTED_FW_CONFIG_HASH_OID "1.3.6.1.4.1.4128.2100.1202" #endif /* __TBBR_OID_H__ */ |