All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ross Burton <ross.burton@arm.com>
To: meta-arm@lists.yoctoproject.org
Subject: [PATCH v2 1/5] arm/trusted-firmware-m: upgrade to 1.4.1
Date: Thu, 11 Nov 2021 16:16:55 +0000	[thread overview]
Message-ID: <20211111161659.2529512-1-ross.burton@arm.com> (raw)

Extract the TF-M branch name as a variable, as BSPs may wish to use
intermediate SHAs.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...mware-m_1.4.0.bb => trusted-firmware-m_1.4.1.bb} | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
 rename meta-arm/recipes-bsp/trusted-firmware-m/{trusted-firmware-m_1.4.0.bb => trusted-firmware-m_1.4.1.bb} (93%)

diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.4.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.4.1.bb
similarity index 93%
rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.4.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.4.1.bb
index 326b5a66..77199369 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.4.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.4.1.bb
@@ -15,20 +15,21 @@ LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \
                     file://../mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
                     file://../mcuboot/LICENSE;md5=b6ee33f1d12a5e6ee3de1e82fb51eeb8"
 
-SRC_URI  = "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https;branch=master;name=tfm;destsuffix=${S} \
-            git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https;branch=master;name=tfm-tests;destsuffix=${S}/../tf-m-tests \
+SRC_URI  = "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https;branch=${SRCBRANCH_tfm};name=tfm;destsuffix=${S} \
+            git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https;branch=TF-Mv1.4.x;name=tfm-tests;destsuffix=${S}/../tf-m-tests \
             git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=master;name=mbedtls;destsuffix=${S}/../mbedtls \
             git://github.com/mcu-tools/mcuboot.git;protocol=https;branch=main;name=mcuboot;destsuffix=${S}/../mcuboot \
             file://cbor2.patch;patchdir=${S}/../mcuboot \
             "
 
 # The required dependencies are documented in tf-m/config/config_default.cmake
-# TF-Mv1.4.0
-SRCREV_tfm = "7ef9178adad866d48e3af42d8a3129dfab792ed8"
+# TF-Mv1.4.1
+SRCBRANCH_tfm = "TF-Mv1.4.x"
+SRCREV_tfm = "dd1fe44448db0f1750794cd9cf5596033f90f6f9"
 # mbedtls-3.0.0
 SRCREV_mbedtls = "8df2f8e7b9c7bb9390ac74bb7bace27edca81a2b"
-# TF-Mv1.4.0
-SRCREV_tfm-tests = "e1a8c9fb8394b1f6ea66d2611c070915b0d4b573"
+# TF-Mv1.4.1
+SRCREV_tfm-tests = "60faad2ead1b967ec8e73accd793d3ed0e5c56bd"
 # TF-Mv1.4-integ
 SRCREV_mcuboot = "4f8091318b4026d14af9e5a7036825bff62fb612"
 
-- 
2.25.1



             reply	other threads:[~2021-11-11 16:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-11 16:16 Ross Burton [this message]
2021-11-11 16:16 ` [PATCH v2 2/5] arm-bsp/trusted-firmware-m: update corstone1000 customisations for 1.4.1 update Ross Burton
2021-11-11 16:16 ` [PATCH v2 3/5] arm-bsp/trusted-firmware-m: remove meaningless PACKAGECONFIGs Ross Burton
2021-11-11 16:16 ` [PATCH v2 4/5] arm-bsp/trusted-firmware-m: clean up corestone1000 do_install Ross Burton
2021-11-11 16:16 ` [PATCH v2 5/5] arm-bsp/trusted-firmware-m: remove INSANE_SKIP in corstone1000 Ross Burton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211111161659.2529512-1-ross.burton@arm.com \
    --to=ross.burton@arm.com \
    --cc=meta-arm@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.