Build: rename FIP_ADD_PAYLOAD to TOOL_ADD_PAYLOAD
Now FIP_ADD_PAYLOAD takes care of both fiptool and cert_create symmetrically. Rename it so that it matches the behavior. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
f30ee0b9c0
commit
10cea93456
|
@ -98,13 +98,14 @@ define IMG_BIN
|
||||||
${BUILD_PLAT}/bl$(1).bin
|
${BUILD_PLAT}/bl$(1).bin
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# FIP_ADD_PAYLOAD appends the command line arguments required by fiptool
|
# TOOL_ADD_PAYLOAD appends the command line arguments required by fiptool to
|
||||||
# to package a new payload. Optionally, it adds the dependency on this payload
|
# package a new payload and/or by cert_create to generate certificate.
|
||||||
|
# Optionally, it adds the dependency on this payload
|
||||||
# $(1) = payload filename (i.e. bl31.bin)
|
# $(1) = payload filename (i.e. bl31.bin)
|
||||||
# $(2) = command line option for the specified payload (i.e. --soc-fw)
|
# $(2) = command line option for the specified payload (i.e. --soc-fw)
|
||||||
# $(3) = fip target dependency (optional) (i.e. bl31)
|
# $(3) = tool target dependency (optional) (i.e. bl31)
|
||||||
# $(4) = FIP prefix (optional) (if FWU_, target is fwu_fip instead of fip)
|
# $(4) = FIP prefix (optional) (if FWU_, target is fwu_fip instead of fip)
|
||||||
define FIP_ADD_PAYLOAD
|
define TOOL_ADD_PAYLOAD
|
||||||
$(4)FIP_ARGS += $(2) $(1)
|
$(4)FIP_ARGS += $(2) $(1)
|
||||||
$(if $(3),$(4)FIP_DEPS += $(3))
|
$(if $(3),$(4)FIP_DEPS += $(3))
|
||||||
$(4)CRT_ARGS += $(2) $(1)
|
$(4)CRT_ARGS += $(2) $(1)
|
||||||
|
@ -132,7 +133,7 @@ endef
|
||||||
define FIP_ADD_IMG
|
define FIP_ADD_IMG
|
||||||
$(3)CRT_DEPS += check_$(1)
|
$(3)CRT_DEPS += check_$(1)
|
||||||
$(3)FIP_DEPS += check_$(1)
|
$(3)FIP_DEPS += check_$(1)
|
||||||
$(call FIP_ADD_PAYLOAD,$(value $(1)),$(2),,$(3))
|
$(call TOOL_ADD_PAYLOAD,$(value $(1)),$(2),,$(3))
|
||||||
|
|
||||||
.PHONY: check_$(1)
|
.PHONY: check_$(1)
|
||||||
check_$(1):
|
check_$(1):
|
||||||
|
@ -297,7 +298,7 @@ bl$(1): $(BIN) $(DUMP)
|
||||||
|
|
||||||
all: bl$(1)
|
all: bl$(1)
|
||||||
|
|
||||||
$(if $(2),$(call FIP_ADD_PAYLOAD,$(BIN),--$(2),bl$(1),$(3)))
|
$(if $(2),$(call TOOL_ADD_PAYLOAD,$(BIN),--$(2),bl$(1),$(3)))
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -43,10 +43,10 @@ $(eval $(call CERT_ADD_CMD_OPT,${TFW_NVCTR_VAL},--tfw-nvctr))
|
||||||
$(eval $(call CERT_ADD_CMD_OPT,${NTFW_NVCTR_VAL},--ntfw-nvctr))
|
$(eval $(call CERT_ADD_CMD_OPT,${NTFW_NVCTR_VAL},--ntfw-nvctr))
|
||||||
|
|
||||||
# Add Trusted Key certificate to the fiptool and cert_create command line options
|
# Add Trusted Key certificate to the fiptool and cert_create command line options
|
||||||
$(eval $(call FIP_ADD_PAYLOAD,${TRUSTED_KEY_CERT},--trusted-key-cert))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TRUSTED_KEY_CERT},--trusted-key-cert))
|
||||||
|
|
||||||
# Add fwu certificate to the fiptool and cert_create command line options
|
# Add fwu certificate to the fiptool and cert_create command line options
|
||||||
$(eval $(call FIP_ADD_PAYLOAD,${FWU_CERT},--fwu-cert,,FWU_))
|
$(eval $(call TOOL_ADD_PAYLOAD,${FWU_CERT},--fwu-cert,,FWU_))
|
||||||
|
|
||||||
# Add the keys to the cert_create command line options (private keys are NOT
|
# Add the keys to the cert_create command line options (private keys are NOT
|
||||||
# packed in the FIP). Developers can use their own keys by specifying the proper
|
# packed in the FIP). Developers can use their own keys by specifying the proper
|
||||||
|
@ -61,35 +61,35 @@ $(if ${NON_TRUSTED_WORLD_KEY},$(eval $(call CERT_ADD_CMD_OPT,${NON_TRUSTED_WORLD
|
||||||
|
|
||||||
# Add the BL2 CoT (image cert)
|
# Add the BL2 CoT (image cert)
|
||||||
ifeq (${BL2_AT_EL3}, 0)
|
ifeq (${BL2_AT_EL3}, 0)
|
||||||
$(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/tb_fw.crt,--tb-fw-cert))
|
$(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/tb_fw.crt,--tb-fw-cert))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Add the SCP_BL2 CoT (key cert + img cert)
|
# Add the SCP_BL2 CoT (key cert + img cert)
|
||||||
ifneq (${SCP_BL2},)
|
ifneq (${SCP_BL2},)
|
||||||
$(if ${SCP_BL2_KEY},$(eval $(call CERT_ADD_CMD_OPT,${SCP_BL2_KEY},--scp-fw-key)))
|
$(if ${SCP_BL2_KEY},$(eval $(call CERT_ADD_CMD_OPT,${SCP_BL2_KEY},--scp-fw-key)))
|
||||||
$(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/scp_fw_content.crt,--scp-fw-cert))
|
$(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/scp_fw_content.crt,--scp-fw-cert))
|
||||||
$(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/scp_fw_key.crt,--scp-fw-key-cert))
|
$(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/scp_fw_key.crt,--scp-fw-key-cert))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (${ARCH},aarch64)
|
ifeq (${ARCH},aarch64)
|
||||||
ifeq (${NEED_BL31},yes)
|
ifeq (${NEED_BL31},yes)
|
||||||
# Add the BL31 CoT (key cert + img cert)
|
# Add the BL31 CoT (key cert + img cert)
|
||||||
$(if ${BL31_KEY},$(eval $(call CERT_ADD_CMD_OPT,${BL31_KEY},--soc-fw-key)))
|
$(if ${BL31_KEY},$(eval $(call CERT_ADD_CMD_OPT,${BL31_KEY},--soc-fw-key)))
|
||||||
$(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/soc_fw_content.crt,--soc-fw-cert))
|
$(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/soc_fw_content.crt,--soc-fw-cert))
|
||||||
$(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/soc_fw_key.crt,--soc-fw-key-cert))
|
$(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/soc_fw_key.crt,--soc-fw-key-cert))
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Add the BL32 CoT (key cert + img cert)
|
# Add the BL32 CoT (key cert + img cert)
|
||||||
ifeq (${NEED_BL32},yes)
|
ifeq (${NEED_BL32},yes)
|
||||||
$(if ${BL32_KEY},$(eval $(call CERT_ADD_CMD_OPT,${BL32_KEY},--tos-fw-key)))
|
$(if ${BL32_KEY},$(eval $(call CERT_ADD_CMD_OPT,${BL32_KEY},--tos-fw-key)))
|
||||||
$(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/tos_fw_content.crt,--tos-fw-cert))
|
$(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/tos_fw_content.crt,--tos-fw-cert))
|
||||||
$(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/tos_fw_key.crt,--tos-fw-key-cert))
|
$(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/tos_fw_key.crt,--tos-fw-key-cert))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Add the BL33 CoT (key cert + img cert)
|
# Add the BL33 CoT (key cert + img cert)
|
||||||
ifneq (${BL33},)
|
ifneq (${BL33},)
|
||||||
$(if ${BL33_KEY},$(eval $(call CERT_ADD_CMD_OPT,${BL33_KEY},--nt-fw-key)))
|
$(if ${BL33_KEY},$(eval $(call CERT_ADD_CMD_OPT,${BL33_KEY},--nt-fw-key)))
|
||||||
$(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/nt_fw_content.crt,--nt-fw-cert))
|
$(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/nt_fw_content.crt,--nt-fw-cert))
|
||||||
$(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/nt_fw_key.crt,--nt-fw-key-cert))
|
$(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/nt_fw_key.crt,--nt-fw-key-cert))
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue