Commit 91704d9d authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

Build: remove third argument of CERT_ADD_CMD_OPT



The third argument was given "true" by images, but it was moved
to TOOL_ADD_PAYLOAD.  No more caller of CERT_ADD_CMD_OPT uses this.
So, the third argument is always empty.  Remove it.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent c939d13a
...@@ -115,11 +115,9 @@ endef ...@@ -115,11 +115,9 @@ endef
# CERT_ADD_CMD_OPT adds a new command line option to the cert_create invocation # CERT_ADD_CMD_OPT adds a new command line option to the cert_create invocation
# $(1) = parameter filename # $(1) = parameter filename
# $(2) = cert_create command line option for the specified parameter # $(2) = cert_create command line option for the specified parameter
# $(3) = input parameter (false if empty) # $(3) = 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 CERT_ADD_CMD_OPT define CERT_ADD_CMD_OPT
$(if $(3),$(4)CRT_DEPS += $(1)) $(3)CRT_ARGS += $(2) $(1)
$(4)CRT_ARGS += $(2) $(1)
endef endef
# TOOL_ADD_IMG allows the platform to specify an external image to be packed # TOOL_ADD_IMG allows the platform to specify an external image to be packed
......
...@@ -54,7 +54,7 @@ $(eval $(call TOOL_ADD_PAYLOAD,${FWU_CERT},--fwu-cert,,FWU_)) ...@@ -54,7 +54,7 @@ $(eval $(call TOOL_ADD_PAYLOAD,${FWU_CERT},--fwu-cert,,FWU_))
$(if ${KEY_ALG},$(eval $(call CERT_ADD_CMD_OPT,${KEY_ALG},--key-alg))) $(if ${KEY_ALG},$(eval $(call CERT_ADD_CMD_OPT,${KEY_ALG},--key-alg)))
$(if ${HASH_ALG},$(eval $(call CERT_ADD_CMD_OPT,${HASH_ALG},--hash-alg))) $(if ${HASH_ALG},$(eval $(call CERT_ADD_CMD_OPT,${HASH_ALG},--hash-alg)))
$(if ${ROT_KEY},$(eval $(call CERT_ADD_CMD_OPT,${ROT_KEY},--rot-key))) $(if ${ROT_KEY},$(eval $(call CERT_ADD_CMD_OPT,${ROT_KEY},--rot-key)))
$(if ${ROT_KEY},$(eval $(call CERT_ADD_CMD_OPT,${ROT_KEY},--rot-key,,FWU_))) $(if ${ROT_KEY},$(eval $(call CERT_ADD_CMD_OPT,${ROT_KEY},--rot-key,FWU_)))
$(if ${TRUSTED_WORLD_KEY},$(eval $(call CERT_ADD_CMD_OPT,${TRUSTED_WORLD_KEY},--trusted-world-key))) $(if ${TRUSTED_WORLD_KEY},$(eval $(call CERT_ADD_CMD_OPT,${TRUSTED_WORLD_KEY},--trusted-world-key)))
$(if ${NON_TRUSTED_WORLD_KEY},$(eval $(call CERT_ADD_CMD_OPT,${NON_TRUSTED_WORLD_KEY},--non-trusted-world-key))) $(if ${NON_TRUSTED_WORLD_KEY},$(eval $(call CERT_ADD_CMD_OPT,${NON_TRUSTED_WORLD_KEY},--non-trusted-world-key)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment