From efd5f898d83cf2ccf585aa99fe9d63cdd661a501 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 4 Jan 2024 11:22:38 +0100 Subject: [PATCH] ccmp1: move definition of TF-A and OP-TEE suffixes to platform The TF-A and OP-TEE images have different suffixes depending on whether TrustFence is enabled or not, but the suffix variables themselves must exist independently of whether TF is enabled. Currently, they were defined on the trustfence.bbclass, and the variables did not exist when TF was disabled, which caused build problems, for example, building the SWU file. Signed-off-by: Hector Palacios --- meta-digi-arm/conf/machine/include/ccmp1.inc | 4 ++++ meta-digi-dey/classes/trustfence.bbclass | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc index 0189ba36b..6945f333c 100644 --- a/meta-digi-arm/conf/machine/include/ccmp1.inc +++ b/meta-digi-arm/conf/machine/include/ccmp1.inc @@ -8,11 +8,15 @@ include conf/machine/include/digi-defaults.inc DIGI_FAMILY = "ccmp1" +# Platform T-FA settings +TFA_SIGN_SUFFIX ?= "${@bb.utils.contains('TRUSTFENCE_SIGN', '1', '_signed', '', d)}" + # Platform u-boot settings UBOOT_PREFIX = "u-boot" UBOOT_SUFFIX = "bin" # Set U-Boot FIP settings FIP_UBOOT_DTB = "u-boot" +FIP_SIGN_SUFFIX ?= "${@bb.utils.contains('TRUSTFENCE_SIGN', '1', '_Signed', '', d)}" STORAGE_MEDIA = "mtd" diff --git a/meta-digi-dey/classes/trustfence.bbclass b/meta-digi-dey/classes/trustfence.bbclass index c98059851..eb459726c 100644 --- a/meta-digi-dey/classes/trustfence.bbclass +++ b/meta-digi-dey/classes/trustfence.bbclass @@ -37,9 +37,6 @@ TRUSTFENCE_ENCRYPT_ROOTFS ?= "${@bb.utils.contains("IMAGE_FEATURES", "read-only- # Read-only rootfs TRUSTFENCE_READ_ONLY_ROOTFS ?= "${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "1", "0", d)}" -FIP_SIGN_SUFFIX ?= "${@bb.utils.contains('TRUSTFENCE_SIGN', '1', '_Signed', '', d)}" -TFA_SIGN_SUFFIX ?= "${@bb.utils.contains('TRUSTFENCE_SIGN', '1', '_signed', '', d)}" - # # NOTHING TO CUSTOMIZE BELOW THIS LINE #