diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cert_create/include/cert.h | 2 | ||||
| -rw-r--r-- | tools/cert_create/include/ext.h | 2 | ||||
| -rw-r--r-- | tools/cert_create/include/key.h | 2 | ||||
| -rw-r--r-- | tools/fip_create/fip_create.c | 16 |
4 files changed, 11 insertions, 11 deletions
diff --git a/tools/cert_create/include/cert.h b/tools/cert_create/include/cert.h index d38353a1..6b1ae954 100644 --- a/tools/cert_create/include/cert.h +++ b/tools/cert_create/include/cert.h @@ -77,7 +77,7 @@ int cert_new(cert_t *cert, int days, int ca, STACK_OF(X509_EXTENSION) * sk); /* Macro to register the certificates used in the CoT */ #define REGISTER_COT(_certs) \ cert_t *certs = &_certs[0]; \ - const unsigned int num_certs = sizeof(_certs)/sizeof(_certs[0]); + const unsigned int num_certs = sizeof(_certs)/sizeof(_certs[0]) /* Exported variables */ extern cert_t *certs; diff --git a/tools/cert_create/include/ext.h b/tools/cert_create/include/ext.h index 52092b50..82a4bcb9 100644 --- a/tools/cert_create/include/ext.h +++ b/tools/cert_create/include/ext.h @@ -93,7 +93,7 @@ X509_EXTENSION *ext_new_key(int nid, int crit, EVP_PKEY *k); /* Macro to register the extensions used in the CoT */ #define REGISTER_EXTENSIONS(_ext) \ ext_t *extensions = &_ext[0]; \ - const unsigned int num_extensions = sizeof(_ext)/sizeof(_ext[0]); + const unsigned int num_extensions = sizeof(_ext)/sizeof(_ext[0]) /* Exported variables */ extern ext_t *extensions; diff --git a/tools/cert_create/include/key.h b/tools/cert_create/include/key.h index 2171679c..f60997f0 100644 --- a/tools/cert_create/include/key.h +++ b/tools/cert_create/include/key.h @@ -80,7 +80,7 @@ int key_store(key_t *key); /* Macro to register the keys used in the CoT */ #define REGISTER_KEYS(_keys) \ key_t *keys = &_keys[0]; \ - const unsigned int num_keys = sizeof(_keys)/sizeof(_keys[0]); + const unsigned int num_keys = sizeof(_keys)/sizeof(_keys[0]) /* Exported variables */ extern key_t *keys; diff --git a/tools/fip_create/fip_create.c b/tools/fip_create/fip_create.c index f0d07910..19afc748 100644 --- a/tools/fip_create/fip_create.c +++ b/tools/fip_create/fip_create.c @@ -56,23 +56,23 @@ uuid_t uuid_null = {0}; /* The images used depends on the platform. */ static entry_lookup_list_t toc_entry_lookup_list[] = { { "SCP Firmware Updater Configuration FWU SCP_BL2U", UUID_TRUSTED_UPDATE_FIRMWARE_SCP_BL2U, - "scp_bl2u", NULL, FLAG_FILENAME }, + "scp-fwu-cfg", NULL, FLAG_FILENAME }, { "AP Firmware Updater Configuration BL2U", UUID_TRUSTED_UPDATE_FIRMWARE_BL2U, - "bl2u", NULL, FLAG_FILENAME }, + "ap-fwu-cfg", NULL, FLAG_FILENAME }, { "Firmware Updater NS_BL2U", UUID_TRUSTED_UPDATE_FIRMWARE_NS_BL2U, - "ns_bl2u", NULL, FLAG_FILENAME }, + "fwu", NULL, FLAG_FILENAME }, { "Non-Trusted Firmware Updater certificate", UUID_TRUSTED_FWU_CERT, "fwu-cert", NULL, FLAG_FILENAME}, { "Trusted Boot Firmware BL2", UUID_TRUSTED_BOOT_FIRMWARE_BL2, - "bl2", NULL, FLAG_FILENAME }, + "tb-fw", NULL, FLAG_FILENAME }, { "SCP Firmware SCP_BL2", UUID_SCP_FIRMWARE_SCP_BL2, - "scp_bl2", NULL, FLAG_FILENAME}, + "scp-fw", NULL, FLAG_FILENAME}, { "EL3 Runtime Firmware BL31", UUID_EL3_RUNTIME_FIRMWARE_BL31, - "bl31", NULL, FLAG_FILENAME}, + "soc-fw", NULL, FLAG_FILENAME}, { "Secure Payload BL32 (Trusted OS)", UUID_SECURE_PAYLOAD_BL32, - "bl32", NULL, FLAG_FILENAME}, + "tos-fw", NULL, FLAG_FILENAME}, { "Non-Trusted Firmware BL33", UUID_NON_TRUSTED_FIRMWARE_BL33, - "bl33", NULL, FLAG_FILENAME}, + "nt-fw", NULL, FLAG_FILENAME}, /* Key Certificates */ { "Root Of Trust key certificate", UUID_ROT_KEY_CERT, "rot-cert", NULL, FLAG_FILENAME }, |