From 71fb396440f51b21401f24c925b9a97a224a4d24 Mon Sep 17 00:00:00 2001 From: Summer Qin Date: Thu, 20 Apr 2017 16:28:39 +0100 Subject: Support Trusted OS firmware extra images in TF tools Since Trusted OS firmware may have extra images, need to assign new uuid and image id for them. The TBBR chain of trust has been extended to add support for the new images within the existing Trusted OS firmware content certificate. Change-Id: I678dac7ba1137e85c5779b05e0c4331134c10e06 Signed-off-by: Summer Qin --- make_helpers/tbbr/tbbr_tools.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'make_helpers') diff --git a/make_helpers/tbbr/tbbr_tools.mk b/make_helpers/tbbr/tbbr_tools.mk index 610ccb88..712fa6f6 100644 --- a/make_helpers/tbbr/tbbr_tools.mk +++ b/make_helpers/tbbr/tbbr_tools.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -95,6 +95,12 @@ ifeq (${NEED_BL32},yes) $(eval $(call CERT_ADD_CMD_OPT,${BUILD_PLAT}/tos_fw_key.crt,--tos-fw-key-cert)) $(eval $(call FIP_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)) +ifneq (${BL32_EXTRA1},) + $(eval $(call CERT_ADD_CMD_OPT,${BL32_EXTRA1},--tos-fw-extra1,true)) +endif +ifneq (${BL32_EXTRA2},) + $(eval $(call CERT_ADD_CMD_OPT,${BL32_EXTRA2},--tos-fw-extra2,true)) +endif endif # Add the BL33 CoT (key cert + img cert + image) -- cgit v1.2.3