From f1cb5bd19034407f2de7cad23f2cc52ca924e561 Mon Sep 17 00:00:00 2001 From: Manish V Badarkhe Date: Fri, 1 Sep 2023 07:40:00 +0100 Subject: [PATCH] fix(tbbr): unrecognised 'tos-fw-key-cert' option CCA CoT uses 'core-swd-cert' for signing all secure software, so when using cert_create tool to generate its certificate, it throws an error: "tools/cert_create/cert_create: unrecognized option '--tos-fw-key-cert'". The issue has not been seen so far since "SPM+RME+TBB+Measured-Boot" combination is not tested in CI/local-setup. It is now resolved by guarding usage of '--tos-fw-key-cert' for non-CCA CoTs. Change-Id: I5e61d851a71c251920171cf410cbd0129e0e0aad Signed-off-by: Manish V Badarkhe --- make_helpers/tbbr/tbbr_tools.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/make_helpers/tbbr/tbbr_tools.mk b/make_helpers/tbbr/tbbr_tools.mk index a3351eb41..3a2c53fea 100644 --- a/make_helpers/tbbr/tbbr_tools.mk +++ b/make_helpers/tbbr/tbbr_tools.mk @@ -118,8 +118,10 @@ endif ifeq (${NEED_BL32},yes) $(if ${BL32_KEY},$(eval $(call CERT_ADD_CMD_OPT,${BL32_KEY},--tos-fw-key))) $(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/tos_fw_content.crt,--tos-fw-cert)) +ifneq (${COT},cca) $(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) ifneq (${BL33},)