summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2016-01-06 14:51:07 +0000
committerdanh-arm <dan.handley@arm.com>2016-01-06 14:51:07 +0000
commit5773b5322d0b4067186d64af53a53409e3bf3e31 (patch)
treeb2444eaa95ae915a221b73901af7473f0be67af3 /tools
parentd37b2098f718a3df52da69bba6f22308d303c112 (diff)
parent8f0617ef9e469e47f6df077f2bb02e594594d3a7 (diff)
Merge pull request #479 from jcastillo-arm/jc/tbbr_fip
Apply TBBR naming convention to the fip_create options
Diffstat (limited to 'tools')
-rw-r--r--tools/fip_create/fip_create.c16
1 files changed, 8 insertions, 8 deletions
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 },