zephyrproject-rtos · tomi-font · Apr 23, 2025 · Apr 15, 2025 · Apr 15, 2025 · Apr 15, 2025
diff --git a/bl2/ext/mcuboot/scripts/wrapper/wrapper.py b/bl2/ext/mcuboot/scripts/wrapper/wrapper.py
@@ -100,9 +100,9 @@ def wrap(key, align, version, header_size, pad_header, layout, pad, confirm,
     rom_fixed = macro_parser.evaluate_macro(layout, rom_fixed_re, 0, 1)
 
     if measured_boot_record:
-        if "_s" in layout:
+        if "_s.o" in layout:
             record_sw_type = "SPE"
-        elif "_ns" in layout:
+        elif "_ns.o" in layout:
             record_sw_type = "NSPE"
         else:
             record_sw_type = "NSPE_SPE"

diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -6,7 +6,7 @@
 #-------------------------------------------------------------------------------
 
 # The 'TFM_VERSION_MANUAL' is used for fallback when Git tags are not available
-set(TFM_VERSION_MANUAL "2.1.1")
+set(TFM_VERSION_MANUAL "2.1.2")
 
 execute_process(COMMAND git describe --tags --always
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/config/config_base.cmake b/config/config_base.cmake
@@ -37,7 +37,8 @@ set(PROJECT_CONFIG_HEADER_FILE          ""          CACHE FILEPATH  "User define
 # External libraries source and version
 set(MBEDCRYPTO_PATH                     "DOWNLOAD"  CACHE PATH      "Path to Mbed Crypto (or DOWNLOAD to fetch automatically")
 set(MBEDCRYPTO_FORCE_PATCH              OFF         CACHE BOOL      "Always apply MBed Crypto patches")
-set(MBEDCRYPTO_VERSION                  "mbedtls-3.6.2" CACHE STRING "The version of Mbed Crypto to use")
+# TODO update to "mbedtls-3.6.3" after release,
+set(MBEDCRYPTO_VERSION                  "f985bee" CACHE STRING "The version of Mbed Crypto to use")
 set(MBEDCRYPTO_GIT_REMOTE               "https://github.com/Mbed-TLS/mbedtls.git" CACHE STRING "The URL (or path) to retrieve MbedTLS from.")
 
 set(MCUBOOT_PATH                        "DOWNLOAD"  CACHE PATH      "Path to MCUboot (or DOWNLOAD to fetch automatically")

diff --git a/docs/conf.py b/docs/conf.py
@@ -20,7 +20,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Trusted Firmware-M'
-copyright = '2017-2024, ARM CE-OSS'
+copyright = '2017-2025, ARM CE-OSS'
 author = 'ARM CE-OSS'
 title = 'User Guide'
 

diff --git a/docs/contributing/maintainers.rst b/docs/contributing/maintainers.rst
@@ -21,11 +21,15 @@ Chris Brand
     :email: `[email protected] <[email protected]>`__
     :github: `UEWBot <https://github.com/UEWBot>`__
 
+David Hu
+    :email: `[email protected] <[email protected]>`__
+    :github: `davidhuziji <https://github.com/davidhuziji>`__
+
 Code owners
 ===========
 
-Bootloader and FWU
-~~~~~~~~~~~~~~~~~~
+Bootloader
+~~~~~~~~~~
 
 Tamas Ban
     :email: `[email protected] <[email protected]>`__
@@ -35,6 +39,13 @@ David Vincze
     :email: `[email protected] <[email protected]>`__
     :github: `davidvincze <https://github.com/davidvincze>`__
 
+Firmware Update (FWU)
+~~~~~~~~~~~~~~~~~~~~~
+
+Maulik Patel
+    :email: `[email protected] <[email protected]>`__
+    :github: `maulik-arm <https://github.com/maulik-arm>`__
+
 BL1 immutable bootloader
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -45,9 +56,9 @@ Raef Coles
 Secure Storage
 ~~~~~~~~~~~~~~
 
-Jamie Fox
-    :email: `jamie.fox@arm.com <jamie.fox@arm.com>`__
-    :github: `jf549 <https://github.com/jf549>`__
+Matthew Dalzell
+    :email: `Matthew.Dalzell@arm.com <Matthew.Dalzell@arm.com>`__
+    :github: `mdalzellarm <https://github.com/mdalzellarm>`__
 
 Crypto
 ~~~~~~
@@ -56,6 +67,10 @@ Antonio de Angelis
     :email: `[email protected] <[email protected]>`__
     :github: `adeaarm <https://github.com/adeaarm>`__
 
+David Vincze
+    :email: `[email protected] <[email protected]>`__
+    :github: `davidvincze <https://github.com/davidvincze>`__
+
 Framework (SPM, etc.)
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -70,6 +85,13 @@ Maulik Patel
     :email: `[email protected] <[email protected]>`__
     :github: `maulik-arm <https://github.com/maulik-arm>`__
 
+Platform Partition
+~~~~~~~~~~~~~~~~~~
+
+Nicola Mazzucato
+    :email: `[email protected] <[email protected]>`__
+    :github: `nicola-mazzucato-arm <https://github.com/nicola-mazzucato-arm>`__
+
 Build System
 ~~~~~~~~~~~~
 
@@ -88,6 +110,13 @@ Matthew Dalzell
     :email: `[email protected] <[email protected]>`__
     :github: `mdalzellarm <https://github.com/mdalzellarm>`__
 
+SCMI Partition (TF-M-Extras)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Nicola Mazzucato
+    :email: `[email protected] <[email protected]>`__
+    :github: `nicola-mazzucato-arm <https://github.com/nicola-mazzucato-arm>`__
+
 Arm Platforms
 ~~~~~~~~~~~~~
 
@@ -101,9 +130,9 @@ David Hazi
 Corstone1000
 ^^^^^^^^^^^^
 
-Xueliang Zhong
-    :email: `Xueliang.Zhong@arm.com <xueliang.zhong@arm.com>`__
-    :github: `xueliang-zhong <https://github.com/xueliang-zhong-arm>`__
+Hugues Kamba Mpiana
+    :email: `Hugues.KambaMpiana@arm.com <hugues.kambampiana@arm.com>`__
+    :github: `hugueskamba <https://github.com/hugueskamba>`__
 
 Emekcan Aras
     :email: `[email protected] <[email protected]>`__
@@ -112,24 +141,42 @@ Emekcan Aras
 RSE
 ^^^
 
-Jamie Fox
-    :email: `[email protected] <[email protected]>`__
-    :github: `jf549 <https://github.com/jf549>`__
+Raef Coles
+    :email: `[email protected] <[email protected]>`__
+    :github: `RcColes <https://github.com/RcColes>`__
+
+Antonio de Angelis
+    :email: `[email protected] <[email protected]>`__
+    :github: `adeaarm <https://github.com/adeaarm>`__
+
+Arm Automotive RD
+"""""""""""""""""
+
+Diego Sueiro
+    :email: `[email protected] <[email protected]>`__
+    :github: `diego-sueiro <https://github.com/diego-sueiro>`__
+
+Peter Hoyes
+    :email: `[email protected] <[email protected]>`__
+    :github: `hoyes <https://github.com/hoyes>`__
+
+Ziad Elhanafy
+   :email: `[email protected] <[email protected]>`__
+   :github: `ZiadElhanafy <https://github.com/ZiadElhanafy>`__
 
 NXP Platforms
 ~~~~~~~~~~~~~
 
-Andrej Butok
-    :email: `Andrey.Butok@nxp.com <andrey.butok@nxp.com>`__
-    :github: `butok <https://github.com/butok>`__
+Ruchika Gupta
+    :email: `ruchika.gupta_1@nxp.com <ruchika.gupta_1@nxp.com>`__
+    :github: `ruchi393 <https://github.com/ruchi393>`__
 
-STM Platforms: DISCO_L562QE, NUCLEO_L552ZE_Q
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Michel JAOUEN
-    :email: `[email protected] <[email protected]>`__
-    :github: `jamike <https://github.com/jamike>`__
+STM Platforms
+~~~~~~~~~~~~~
 
+Ahmad EL JOUAID
+    :email: `[email protected] <[email protected]>`__
+    :github: `ahmadstm <https://github.com/ahmadstm>`__
 
 Infineon/Cypress Platforms
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -138,8 +185,8 @@ Chris Brand
     :email: `Chris [email protected] <[email protected]>`__
     :github: `UEWBot <https://github.com/UEWBot>`__
 
-Laird Connectivity Platforms:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Laird Connectivity Platforms
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Greg Leach
     :email: `[email protected] <[email protected]>`__
@@ -152,31 +199,38 @@ Georgios Vasilakis
     :email: `[email protected] <[email protected]>`__
     :github: `Vge0rge <https://github.com/Vge0rge>`__
 
-
-Nuvoton Platform:
-~~~~~~~~~~~~~~~~~
+Nuvoton Platform
+~~~~~~~~~~~~~~~~
 
 WS Chang
     :email: `MS20 [email protected] <[email protected]>`__
     :github: `wschang0 <https://github.com/wschang0>`__
 
-
-ArmChina Platform:
-~~~~~~~~~~~~~~~~~~
+ArmChina Platform
+~~~~~~~~~~~~~~~~~
 
 Jidong Mei
     :email: `[email protected] <[email protected]>`__
     :github: `JidongMei <https://github.com/JidongMei>`__
 
-Raspberry Pi Platform:
-~~~~~~~~~~~~~~~~~~~~~~
+Raspberry Pi Platform
+~~~~~~~~~~~~~~~~~~~~~
 
 William Vinnicombe
     :email: `[email protected] <[email protected]>`__
     :github: `Raspberry Pi <https://github.com/raspberrypi>`__
 
+Analog Devices Platform:
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sadik Ozer
+    :email: `[email protected]`__
+    :github: `ozersa <https://github.com/ozersa>`__
+
 =============
 
 .. _Project Maintenance Process: https://trusted-firmware-docs.readthedocs.io/en/latest/generic_processes/project_maintenance_process.html
 
-*Copyright (c) 2017-2024, Arm Limited. All rights reserved.*
+*SPDX-License-Identifier: BSD-3-Clause*
+
+*SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors*
diff --git a/docs/platform/adi/index.rst b/docs/platform/adi/index.rst
@@ -0,0 +1,13 @@
+##############################
+Analog Devices, Inc. Platforms
+##############################
+
+.. toctree::
+    :maxdepth: 1
+    :titlesonly:
+
+    MAX32657 <max32657/README.rst>
+
+--------------
+
+*Copyright (c) 2025, Analog Devices, Inc. All rights reserved.*