From ab339b24d49736d01aff562e30d28e387b823755 Mon Sep 17 00:00:00 2001 From: Satish Kumar Date: Thu, 9 Dec 2021 19:19:29 +0000 Subject: [PATCH] arm-bsp/trusted-firmware-m: corstone1000: Aligning with TF-M master Setting the last master branch SHA. Change-Id: I668868f991bc090cf0720ac940fe658aa253ed56 Signed-off-by: Satish Kumar Signed-off-by: Jon Mason --- .../trusted-firmware-m-corstone1000.inc | 24 +++---------------- 1 file changed, 3 insertions(+), 21 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 42648eaa..19222d5c 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 @@ -2,26 +2,6 @@ COMPATIBLE_MACHINE = "(corstone1000)" -FILESEXTRAPATHS:prepend := "${THISDIR}/files/corstone1000:" - -SRC_URI:append = " \ - file://0001-corstone1000-disable-secure-debug-temporarily.patch \ - file://0002-corstone1000-provision-firmware-update-metadata-fwu.patch \ - file://0003-corstone1000-parse-the-uefi-firmware-update-capsule.patch \ - file://0004-corstone1000-add-firmware-update-fwu-agent-into-TF-M.patch \ - file://0005-corstone1000-implement-corstone1000_fwu_flash_images.patch \ - file://0006-corstone1000-add-logic-to-select-boot-bank.patch \ - file://0007-corstone1000-integrate-watchdog-driver.patch \ - file://0008-corstone1000-impelment-accept-image-logic.patch \ - file://0009-corstone1000-implement-select-previous-bank-logic.patch \ - file://0010-corstone1000-implement-corstone1000_fwu_host_ack.patch \ - file://0011-SPM-multiple-core-initailize-multi-core-communicatio.patch \ - file://0012-corstone1000-implement-timer-to-track-host-progress.patch \ - file://0013-corstone1000-fwu-nv-counter-anti-rollback-support.patch \ - file://0014-corstone1000-bug-fix-in-openamp-version.patch \ - file://0015-corstone1000-secure-host-watchdog-interrupt-handler.patch \ -" - TFM_DEBUG = "1" ## Default is the MPS3 board @@ -29,9 +9,11 @@ TFM_PLATFORM_IS_FVP ?= "FALSE" EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}" SRCBRANCH_tfm = "master" -SRCREV_tfm = "a0a266a55b56929cae5f1777e28926b8421492a6" +SRCREV_tfm = "dc605e057470bb0eb0e92c2aafb443300a90c43f" SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8" +PV = "1.5+git${SRCPV}" + # The install task signs the TF-A BL2 and FIP binaries. # So they need to be copied to the sysroot. Hence the dependencies below: do_prepare_recipe_sysroot[depends]+= "trusted-firmware-a:do_populate_sysroot"