From c30d90a77d78279eb07549bdada011e960328c46 Mon Sep 17 00:00:00 2001 From: Vishnu Banavath Date: Mon, 17 Jan 2022 18:14:04 +0000 Subject: [PATCH] arm-bsp/tf-m: fix capsule instability issue for corstone1000 This change is to upgrade TF-M to latest git hash which contains fix for capsule instability issue for corstone1000 platform. Latest TF-M would also require v3.1 mbedtls. Also updated git hash for mbedtls repo. --- .../trusted-firmware-m-corstone1000.inc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) 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 9b0ffdb2..98641c20 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 @@ -8,7 +8,8 @@ TFM_DEBUG = "1" TFM_PLATFORM_IS_FVP ?= "FALSE" EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}" -SRCREV_tfm = "ca8c634a3dc15b42d41655a14e512b642320893a" +SRCREV_tfm = "49a28600f9dd640638f667273ef15acb6d1a8e1c" +SRCREV_mbedtls = "d65aeb37349ad1a50e0f6c9b694d4b5290d60e49" SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8" PV = "1.5+git${SRCREV_tfm}" @@ -23,14 +24,9 @@ do_prepare_recipe_sysroot[depends]+= "virtual/trusted-firmware-a:do_populate_sys require trusted-firmware-m-sign-host-images.inc do_install() { - if [ ! -d "${B}/install/outputs/ARM/CORSTONE1000" ] - then - bbfatal "'${B}/install/outputs/ARM/CORSTONE1000' output folder not found!" - fi - - install -D -p -m 0644 ${B}/install/outputs/ARM/CORSTONE1000/tfm_s_signed.bin ${D}/firmware/tfm_s_signed.bin - install -D -p -m 0644 ${B}/install/outputs/ARM/CORSTONE1000/bl2_signed.bin ${D}/firmware/bl2_signed.bin - install -D -p -m 0644 ${B}/install/outputs/ARM/CORSTONE1000/bl1.bin ${D}/firmware/bl1.bin + install -D -p -m 0644 ${B}/install/outputs/tfm_s_signed.bin ${D}/firmware/tfm_s_signed.bin + install -D -p -m 0644 ${B}/install/outputs/bl2_signed.bin ${D}/firmware/bl2_signed.bin + install -D -p -m 0644 ${B}/install/outputs/bl1.bin ${D}/firmware/bl1.bin # # Signing TF-A BL2 and the FIP image