From 91704d9d482da12ffd7ac80688414661a246f45a Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 26 Jan 2018 11:42:01 +0900 Subject: [PATCH] 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: Masahiro Yamada --- make_helpers/build_macros.mk | 6 ++---- make_helpers/tbbr/tbbr_tools.mk | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 35dbb813..894b14cb 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -115,11 +115,9 @@ endef # CERT_ADD_CMD_OPT adds a new command line option to the cert_create invocation # $(1) = parameter filename # $(2) = cert_create command line option for the specified parameter -# $(3) = input parameter (false if empty) -# $(4) = FIP prefix (optional) (if FWU_, target is fwu_fip instead of fip) +# $(3) = FIP prefix (optional) (if FWU_, target is fwu_fip instead of fip) define CERT_ADD_CMD_OPT - $(if $(3),$(4)CRT_DEPS += $(1)) - $(4)CRT_ARGS += $(2) $(1) + $(3)CRT_ARGS += $(2) $(1) endef # TOOL_ADD_IMG allows the platform to specify an external image to be packed diff --git a/make_helpers/tbbr/tbbr_tools.mk b/make_helpers/tbbr/tbbr_tools.mk index 82d83caf..afc007a4 100644 --- a/make_helpers/tbbr/tbbr_tools.mk +++ b/make_helpers/tbbr/tbbr_tools.mk @@ -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 ${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,,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 ${NON_TRUSTED_WORLD_KEY},$(eval $(call CERT_ADD_CMD_OPT,${NON_TRUSTED_WORLD_KEY},--non-trusted-world-key))) -- 2.30.2