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 /make_helpers | |
| 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 'make_helpers')
| -rw-r--r-- | make_helpers/build_macros.mk | 4 | ||||
| -rw-r--r-- | make_helpers/tbbr/tbbr_tools.mk | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 08cb4b12..00fb92c9 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -110,8 +110,8 @@ endef # FIP_ADD_IMG allows the platform to specify an image to be packed in the FIP # using a build option. It also adds a dependency on the image file, aborting # the build if the file does not exist. -# $(1) = build option to specify the image filename (BL30, BL33, etc) -# $(2) = command line option for the fip_create tool (bl30, bl33, etc) +# $(1) = build option to specify the image filename (SCP_BL2, BL33, etc) +# $(2) = command line option for the fip_create tool (scp_bl2, bl33, etc) # Example: # $(eval $(call FIP_ADD_IMG,BL33,--bl33)) define FIP_ADD_IMG diff --git a/make_helpers/tbbr/tbbr_tools.mk b/make_helpers/tbbr/tbbr_tools.mk index eed3808a..9b47886b 100644 --- a/make_helpers/tbbr/tbbr_tools.mk +++ b/make_helpers/tbbr/tbbr_tools.mk @@ -37,7 +37,7 @@ # BUILD_PLAT: output directory # NEED_BL32: indicates whether BL3-2 is needed by the platform # BL2: image filename (optional). Default is IMG_BIN(2) (see macro IMG_BIN) -# BL30: image filename (optional). Default is IMG_BIN(30) +# SCP_BL2: image filename (optional). Default is IMG_BIN(30) # BL31: image filename (optional). Default is IMG_BIN(31) # BL32: image filename (optional). Default is IMG_BIN(32) # BL33: image filename (optional). Default is IMG_BIN(33) @@ -48,7 +48,7 @@ # ROT_KEY # TRUSTED_WORLD_KEY # NON_TRUSTED_WORLD_KEY -# BL30_KEY +# SCP_BL2_KEY # BL31_KEY # BL32_KEY # BL33_KEY @@ -81,10 +81,10 @@ $(if ${BL2},$(eval $(call CERT_ADD_CMD_OPT,${BL2},--tb-fw,true)),\ $(eval $(call CERT_ADD_CMD_OPT,${BUILD_PLAT}/tb_fw.crt,--tb-fw-cert)) $(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/tb_fw.crt,--tb-fw-cert)) -# Add the BL30 CoT (key cert + img cert + image) -ifneq (${BL30},) - $(eval $(call CERT_ADD_CMD_OPT,${BL30},--scp-fw,true)) - $(if ${BL30_KEY},$(eval $(call CERT_ADD_CMD_OPT,${BL30_KEY},--scp-fw-key))) +# Add the SCP_BL2 CoT (key cert + img cert + image) +ifneq (${SCP_BL2},) + $(eval $(call CERT_ADD_CMD_OPT,${SCP_BL2},--scp-fw,true)) + $(if ${SCP_BL2_KEY},$(eval $(call CERT_ADD_CMD_OPT,${SCP_BL2_KEY},--scp-fw-key))) $(eval $(call CERT_ADD_CMD_OPT,${BUILD_PLAT}/scp_fw_content.crt,--scp-fw-cert)) $(eval $(call CERT_ADD_CMD_OPT,${BUILD_PLAT}/scp_fw_key.crt,--scp-fw-key-cert)) $(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/scp_fw_content.crt,--scp-fw-cert)) |