diff options
author | Juan Castillo <juan.castillo@arm.com> | 2015-12-10 15:49:17 +0000 |
---|---|---|
committer | Juan Castillo <juan.castillo@arm.com> | 2015-12-14 12:31:16 +0000 |
commit | f59821d51255f14e0ac00eef7bc98ef75c686876 (patch) | |
tree | 2a62aec945a1c30ed695ba2a3336c08d94183ab3 /tools | |
parent | 516beb585c23056820a854b12c77a6f62cbc5c8b (diff) |
Replace all SCP FW (BL0, BL3-0) references
This patch replaces all references to the SCP Firmware (BL0, BL30,
BL3-0, bl30) with the image terminology detailed in the TF wiki
(https://github.com/ARM-software/arm-trusted-firmware/wiki):
BL0 --> SCP_BL1
BL30, BL3-0 --> SCP_BL2
bl30 --> scp_bl2
This change affects code, documentation, build system, tools and
platform ports that load SCP firmware. ARM plaforms have been
updated to the new porting API.
IMPORTANT: build option to specify the SCP FW image has changed:
BL30 --> SCP_BL2
IMPORTANT: This patch breaks compatibility for platforms that use BL2
to load SCP firmware. Affected platforms must be updated as follows:
BL30_IMAGE_ID --> SCP_BL2_IMAGE_ID
BL30_BASE --> SCP_BL2_BASE
bl2_plat_get_bl30_meminfo() --> bl2_plat_get_scp_bl2_meminfo()
bl2_plat_handle_bl30() --> bl2_plat_handle_scp_bl2()
Change-Id: I24c4c1a4f0e4b9f17c9e4929da815c4069549e58
Diffstat (limited to 'tools')
-rw-r--r-- | tools/cert_create/src/main.c | 4 | ||||
-rw-r--r-- | tools/fip_create/fip_create.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/cert_create/src/main.c b/tools/cert_create/src/main.c index 6d11a277..3e4f8c57 100644 --- a/tools/cert_create/src/main.c +++ b/tools/cert_create/src/main.c @@ -86,7 +86,7 @@ enum { /* Image file names (inputs) */ BL2_ID = 0, - BL30_ID, + SCP_BL2_ID, BL31_ID, BL32_ID, BL33_ID, @@ -105,7 +105,7 @@ enum { ROT_KEY_ID, TRUSTED_WORLD_KEY_ID, NON_TRUSTED_WORLD_KEY_ID, - BL30_KEY_ID, + SCP_BL2_KEY_ID, BL31_KEY_ID, BL32_KEY_ID, BL33_KEY_ID, diff --git a/tools/fip_create/fip_create.c b/tools/fip_create/fip_create.c index ef533c7e..5bb716ef 100644 --- a/tools/fip_create/fip_create.c +++ b/tools/fip_create/fip_create.c @@ -65,8 +65,8 @@ static entry_lookup_list_t toc_entry_lookup_list[] = { "fwu-cert", NULL, FLAG_FILENAME}, { "Trusted Boot Firmware BL2", UUID_TRUSTED_BOOT_FIRMWARE_BL2, "bl2", NULL, FLAG_FILENAME }, - { "SCP Firmware BL3-0", UUID_SCP_FIRMWARE_BL30, - "bl30", NULL, FLAG_FILENAME}, + { "SCP Firmware SCP_BL2", UUID_SCP_FIRMWARE_SCP_BL2, + "scp_bl2", NULL, FLAG_FILENAME}, { "EL3 Runtime Firmware BL3-1", UUID_EL3_RUNTIME_FIRMWARE_BL31, "bl31", NULL, FLAG_FILENAME}, { "Secure Payload BL3-2 (Trusted OS)", UUID_SECURE_PAYLOAD_BL32, |