From 6ee207b52009b3b8e71f8d606ab0f02a7b45495b Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Mon, 13 Dec 2021 16:30:56 +0000 Subject: [PATCH] arm-bsp/trusted-firmware-m: corstone1000: bump the version to 1.5 Setting TF-M version to 1.5 Change-Id: Ib04778ed46d5404f498ff4efd60f338e351e7ee9 Signed-off-by: Ross Burton Signed-off-by: Abdellatif El Khlifi Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/include/corstone1000.inc | 2 +- .../trusted-firmware-m/trusted-firmware-m-corstone1000.inc | 2 ++ ...d-firmware-m_%.bbappend => trusted-firmware-m_1.4%.bbappend} | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/{trusted-firmware-m_%.bbappend => trusted-firmware-m_1.4%.bbappend} (100%) diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 9e36b4f7..6ec09823 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -11,7 +11,7 @@ TFA_BL2_BINARY = "bl2-corstone1000.bin" TFA_FIP_BINARY = "fip-corstone1000.bin" # TF-M -PREFERRED_VERSION_trusted-firmware-m ?= "1.4%" +PREFERRED_VERSION_trusted-firmware-m ?= "1.5%" 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 2c363d78..c732674d 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 @@ -11,6 +11,8 @@ EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}" SRCREV_tfm = "dc605e057470bb0eb0e92c2aafb443300a90c43f" SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8" +PV = "1.5+git${SRCREV_tfm}" + SRCREV_FORMAT = "tfm_mcuboot_tfm-tests_mbedtls" # The install task signs the TF-A BL2 and FIP binaries. diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.4%.bbappend similarity index 100% rename from meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.4%.bbappend