From f451201228531de98364a04130365598563a1dca Mon Sep 17 00:00:00 2001 From: Tomi Fontanilles Date: Fri, 10 May 2024 14:10:49 +0300 Subject: [PATCH] manifest: trusted-firmware-m: update to 2.1.0 Update TF-M to version 2.1.0. Signed-off-by: Tomi Fontanilles --- doc/releases/release-notes-3.7.rst | 10 +++++++++- doc/services/tfm/overview.rst | 2 +- submanifests/optional.yaml | 2 +- west.yml | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/releases/release-notes-3.7.rst b/doc/releases/release-notes-3.7.rst index 121bf88467e..32c52d19fa3 100644 --- a/doc/releases/release-notes-3.7.rst +++ b/doc/releases/release-notes-3.7.rst @@ -13,6 +13,8 @@ Major enhancements with this release include: the way both SoCs and boards are named, defined and constructed in Zephyr. Additional information can be found in the :ref:`board_porting_guide`. * Zephyr now requires Python 3.10 or higher +* Trusted Firmware-M (TF-M) 2.1.0 and Mbed TLS 3.6.0 have been integrated into Zephyr. + Both of these versions are LTS releases. An overview of the changes required or recommended when migrating your application from Zephyr v3.6.0 to Zephyr v3.7.0 can be found in the separate :ref:`migration guide`. @@ -378,7 +380,7 @@ Libraries / Subsystems * Crypto - * MbedTLS was updated to 3.6.0. Release notes can be found at: + * Mbed TLS was updated to 3.6.0. Release notes can be found at: https://github.com/Mbed-TLS/mbedtls/releases/tag/v3.6.0 * Random @@ -419,6 +421,12 @@ HALs MCUboot ******* +Trusted Firmware-M +****************** + +* TF-M was updated to 2.1.0. Release notes can be found at: + https://tf-m-user-guide.trustedfirmware.org/releases/2.1.0.html + zcbor ***** diff --git a/doc/services/tfm/overview.rst b/doc/services/tfm/overview.rst index ef71b53a113..8ecbd5946d8 100644 --- a/doc/services/tfm/overview.rst +++ b/doc/services/tfm/overview.rst @@ -8,7 +8,7 @@ It defines and implements an architecture and a set of software components that aim to address some of the main security concerns in IoT products. Zephyr RTOS has been PSA Certified since Zephyr 2.0.0 with TF-M 1.0, and -is currently integrated with TF-M 2.0.0. +is currently integrated with TF-M 2.1.0. What Does TF-M Offer? ********************* diff --git a/submanifests/optional.yaml b/submanifests/optional.yaml index 82007d5ae26..db5f6c392b8 100644 --- a/submanifests/optional.yaml +++ b/submanifests/optional.yaml @@ -40,7 +40,7 @@ manifest: groups: - optional - name: tf-m-tests - revision: 85f533a4aa5b4fe31247676a923db7453eb4429c + revision: d552e4f18b92032bd335d5e3aa312f6acd82a83b path: modules/tee/tf-m/tf-m-tests remote: upstream groups: diff --git a/west.yml b/west.yml index 215af86acd9..1b5a60846f7 100644 --- a/west.yml +++ b/west.yml @@ -282,7 +282,7 @@ manifest: revision: 2b498e6f36d6b82ae1da12c8b7742e318624ecf5 path: modules/lib/gui/lvgl - name: mbedtls - revision: 3217c450180fd5e817601c6f479116de69e57461 + revision: c0cb49ffd24b4068a91425b74505b35ed0e81038 path: modules/crypto/mbedtls groups: - crypto @@ -327,7 +327,7 @@ manifest: groups: - crypto - name: trusted-firmware-m - revision: 785d87492490069b62170159fcf21c385f90f4eb + revision: bdc4df1734b870de43237d56eb1b2a7af016ee95 path: modules/tee/tf-m/trusted-firmware-m groups: - tee