From 08c699e738ff8937f654f1ac23891e89536f10bb Mon Sep 17 00:00:00 2001 From: Manish Pandey Date: Fri, 1 Oct 2021 14:34:33 +0100 Subject: [PATCH] refactor(tbbr): remove "fvp_r" platform specific check fvp_r is a unique platform which does not have BL2 binary and image loading functionality is performed by BL1 itself. To avoid generating certificate for BL2 there was platform specific check added which looks bit ugly, replacing that check. Signed-off-by: Manish Pandey Change-Id: I11360fa753f847768906c42dce652296245b4a63 --- make_helpers/tbbr/tbbr_tools.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make_helpers/tbbr/tbbr_tools.mk b/make_helpers/tbbr/tbbr_tools.mk index 293e85487..0a280b4ed 100644 --- a/make_helpers/tbbr/tbbr_tools.mk +++ b/make_helpers/tbbr/tbbr_tools.mk @@ -11,6 +11,7 @@ # Expected environment: # # BUILD_PLAT: output directory +# NEED_BL2: indicates whether BL2 is needed by the platform # NEED_BL32: indicates whether BL32 is needed by the platform # BL2: image filename (optional). Default is IMG_BIN(2) (see macro IMG_BIN) # SCP_BL2: image filename (optional). Default is IMG_BIN(30) @@ -67,8 +68,8 @@ $(if ${NON_TRUSTED_WORLD_KEY},$(eval $(call CERT_ADD_CMD_OPT,${NON_TRUSTED_WORLD # Add the BL2 CoT (image cert) +ifeq (${NEED_BL2},yes) ifeq (${BL2_AT_EL3}, 0) -ifneq (${PLAT},fvp_r) $(eval $(call TOOL_ADD_PAYLOAD,${BUILD_PLAT}/tb_fw.crt,--tb-fw-cert)) endif endif