From a5f0508464ea512b5dc3c528fbc398c373b59032 Mon Sep 17 00:00:00 2001 From: Drew Reed Date: Fri, 10 Dec 2021 11:32:15 +0000 Subject: [PATCH] arm-bsp/trusted-firmware-m: corsone1000: Fix circular dependency in SRCPV Change the setting of PV from referancing SRCPV to using SRCREV. Also drop the use of PREFERRED_VERSION. The existing TF-M recipe will be selected automatically (1.4.1). Corstone1000 bbappend sets the SHA and PV to 1.5 Change-Id: Id9332fd87e271608ba425e05e796f75fd1c0268d Signed-off-by: Drew Reed Signed-off-by: Abdellatif El Khlifi Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/include/corstone1000.inc | 1 - .../trusted-firmware-m/trusted-firmware-m-corstone1000.inc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 994fb06d..2c554d4b 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -11,7 +11,6 @@ TFA_BL2_BINARY = "bl2-corstone1000.bin" TFA_FIP_BINARY = "fip-corstone1000.bin" # TF-M -PREFERRED_VERSION_trusted-firmware-m ?= "1.4%" TFM_PLATFORM = "arm/corstone1000" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc index 19222d5c..a0603589 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc @@ -12,7 +12,7 @@ SRCBRANCH_tfm = "master" SRCREV_tfm = "dc605e057470bb0eb0e92c2aafb443300a90c43f" SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8" -PV = "1.5+git${SRCPV}" +PV = "1.5+git${SRCREV_tfm}" # The install task signs the TF-A BL2 and FIP binaries. # So they need to be copied to the sysroot. Hence the dependencies below: