summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJuan Castillo <juan.castillo@arm.com>2014-11-04 17:36:40 +0000
committerDan Handley <dan.handley@arm.com>2015-01-28 18:26:59 +0000
commitb7124ea7f6fe1e1e73a0975cfb0fa34cabd73b2a (patch)
treed1880c2a689f4284c79fafb856be54395075f323 /Makefile
parent6f97162237603eb6e5c497e5ba903512bdd428a9 (diff)
TBB: add support to include certificates in a FIP image
This patch extends the FIP tool to include the certificates generated by the 'cert_create' tool. If GENERATE_COT build option is enabled, the Makefile adds the certificates as dependencies to create the FIP file. Thus, make target 'fip' will also build the certificates as part of the Trusted Firmware build process. Change-Id: I5eee500da7f7be6cfb6e3df0423599739d260074
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 777e3308..b5db6294 100644
--- a/Makefile
+++ b/Makefile
@@ -286,6 +286,9 @@ TRUSTED_KEY_CERT := ${BUILD_PLAT}/trusted_key.crt
ifneq (${GENERATE_COT},0)
$(eval CERTS := yes)
+ $(eval FIP_DEPS += certificates)
+ $(eval FIP_ARGS += --trusted-key-cert ${TRUSTED_KEY_CERT})
+
ifneq (${CREATE_KEYS},0)
$(eval CRT_ARGS += -n)
endif
@@ -449,6 +452,8 @@ define MAKE_TOOL_ARGS
$(eval FIP_DEPS += $(if $3,$(2),))
$(eval FIP_ARGS += $(if $3,--bl$(1) $(2),))
+$(eval FIP_ARGS += $(if $4,--bl$(1)-cert $(BUILD_PLAT)/bl$(1).crt))
+$(eval FIP_ARGS += $(if $4,$(if $5,--bl$(1)-key-cert $(BUILD_PLAT)/bl$(1)_key.crt)))
$(eval CRT_DEPS += $(if $4,$(2),))
$(eval CRT_DEPS += $(if $4,$(if $6,$(6),)))