mbox series

[0/3] Add new recipe for Trusted-Firmware-M v2.2.1 and upgrade Trusted-Firmware-M version to 2.2.1 for Corstone-1000

Message ID 20250910125112.75362-1-harsimransingh.tungal@arm.com
Headers show
Series Add new recipe for Trusted-Firmware-M v2.2.1 and upgrade Trusted-Firmware-M version to 2.2.1 for Corstone-1000 | expand

Message

Harsimran Singh Tungal Sept. 10, 2025, 12:51 p.m. UTC 
This merge request include changes to add new recipe for Trusted-Firmware-M v2.2.1 in
meta-arm and upgrade Trusted-Firmware-M version to 2.2.1 for Corstone-1000.
The move to Trusted-Firmware-M v2.2.1 makes the BL1 code larger, while the provisioning
bundle can be trimmed. At the same time BL2 and TF-M binary addresses now need to begin on
a 0x100-byte boundary for Cortex-M0+ based platforms.

Key changes
===========

- Add new recipe for Trusted-Firmware-M v2.2.1
- Include patch to add relevant checks in GCC linker scripts to validate if the
  BL2 and Trusted-Firmware-M binary addresses are aligned to 0x100 byte boundary
  for Cortex-M0+ based platforms.
- Upgrade Trusted-Firmware-M v2.2.1 for Corstone-1000
  - Rebase patches
  - Add new patch to address the following changes for v2.2.1
    * Increase `BL1_1_CODE_SIZE` to 58KB to accommodate the v2.21 binaries.
    * Reduce `PROVISIONINGDATA_SIZE` to 6KB.
    * `BL2_CODE_START` and `S_CODE_START` are aligned to 0x100 byte boundary so both start addresses are an exact multiple of 0x100.


Harsimran Singh Tungal (3):
  arm/trusted-firmware-m: Add new recipe for Trusted-Firmware-M v2.2.1
  arm/trusted-firmware-m: Add alignment checks for Cortex-M0+ based
    platform binaries
  arm-bsp: corstone1000: Upgrade Trusted-Firmware-M v2.2.1

 .../conf/machine/include/corstone1000.inc     |   2 +-
 .../corstone1000-flash-firmware-image.bb      |   2 +-
 ...form-CS1000-Remove-unused-BL1-files.patch} |  21 +-
 ...-Corstone1000-Enable-firewall-in-FVP.patch | 177 -------
 ...m-CS1000-Increase-ITS-max-asset-size.patch |  41 --
 ...e1000-Fix-BL1-compiler-switch-and-re.patch |  46 ++
 ...f-cc312-differences-between-fvp-and.patch} |   8 +-
 ...S1000-Increase-RSE_COMMS-buffer-size.patch |  38 --
 ...CS1000-Increase-buffers-for-EFI-vars.patch |  42 --
 ...m-Corstone1000-Enable-FWU-partition.patch} |  16 +-
 ...m-CS1000-Increase-flash-PS-area-size.patch |  37 --
 ...1000-Implement-Bootloader-Abstracti.patch} | 455 ++++++++++--------
 ...-Corstone1000-Increase-buffer-sizes.patch} |  27 +-
 ...CS1000-Add-multicore-support-for-FVP.patch | 119 -----
 ...007-Platform-CS1000-Fix-Bank-offsets.patch |  36 --
 ...1000-Remove-duplicate-configuration.patch} |  22 +-
 ...m-CS1000-Increase-BL2-partition-size.patch | 111 -----
 ...e1000-Increase-BL1-size-and-align-bi.patch |  93 ++++
 ...-Add-PSA_WANT_ALG_SHA_256-definition.patch |  42 --
 ...apt-ADAC-enabled-build-to-the-new-BL.patch |  45 ++
 ...m-CS1000-Add-crypto-configs-for-ADAC.patch |  41 --
 ...orm-CS1000-Fix-platform-name-in-logs.patch |  27 --
 ...rm-CS1000-Fix-compiler-switch-in-BL1.patch | 193 --------
 ...one1000-Allow-FWU-calls-in-RSE-COMMS.patch |  60 ---
 ...m-specific-TFM_FWU_BOOTLOADER_LIB-se.patch |  73 ---
 .../trusted-firmware-m-corstone1000.inc       |  36 +-
 ...L2-and-TF-M-binary-address-alignment.patch | 134 ++++++
 .../trusted-firmware-m-2.2.1-src.inc          |  80 +++
 .../trusted-firmware-m_2.2.1.bb               |   2 +
 29 files changed, 720 insertions(+), 1306 deletions(-)
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/{0012-Platform-CS1000-Remove-unused-BL1-files.patch => 0001-Platform-CS1000-Remove-unused-BL1-files.patch} (97%)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0001-Platform-Corstone1000-Enable-firewall-in-FVP.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0002-Platform-CS1000-Increase-ITS-max-asset-size.patch
 create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0002-Platform-Corstone1000-Fix-BL1-compiler-switch-and-re.patch
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/{0014-CC312-alignment-of-cc312-differences.patch => 0003-CC312-alignment-of-cc312-differences-between-fvp-and.patch} (87%)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0003-Platform-CS1000-Increase-RSE_COMMS-buffer-size.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0004-Platform-CS1000-Increase-buffers-for-EFI-vars.patch
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/{0017-Platform-CS1000-Enable-FWU-partition.patch => 0004-Platform-Corstone1000-Enable-FWU-partition.patch} (80%)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0005-Platform-CS1000-Increase-flash-PS-area-size.patch
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/{0018-Platform-Corstone1000-Implement-Bootloader-Abstracti.patch => 0005-Platform-Corstone1000-Implement-Bootloader-Abstracti.patch} (93%)
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/{0019-Platform-Corstone1000-Increase-buffer-sizes.patch => 0006-Platform-Corstone1000-Increase-buffer-sizes.patch} (64%)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0006-platform-CS1000-Add-multicore-support-for-FVP.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0007-Platform-CS1000-Fix-Bank-offsets.patch
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/{0023-Platform-CS1000-Remove-duplicate-configuration-parameters.patch => 0007-Platform-Corstone1000-Remove-duplicate-configuration.patch} (60%)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0008-Platform-CS1000-Increase-BL2-partition-size.patch
 create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0008-Platform-Corstone1000-Increase-BL1-size-and-align-bi.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0009-CC312-ADAC-Add-PSA_WANT_ALG_SHA_256-definition.patch
 create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0009-Platform-CS1K-Adapt-ADAC-enabled-build-to-the-new-BL.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0010-Platform-CS1000-Add-crypto-configs-for-ADAC.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0011-Platform-CS1000-Fix-platform-name-in-logs.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0013-Platform-CS1000-Fix-compiler-switch-in-BL1.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0015-Platform-corstone1000-Allow-FWU-calls-in-RSE-COMMS.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0016-FWU-Make-platform-specific-TFM_FWU_BOOTLOADER_LIB-se.patch
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/files/0001-Add-checks-for-BL2-and-TF-M-binary-address-alignment.patch
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.1-src.inc
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.2.1.bb

Comments

Jon Mason Sept. 12, 2025, 12:49 p.m. UTC | #1 
On Wed, 10 Sep 2025 13:51:09 +0100, Harsimran Singh Tungal wrote:
> This merge request include changes to add new recipe for Trusted-Firmware-M v2.2.1 in
> meta-arm and upgrade Trusted-Firmware-M version to 2.2.1 for Corstone-1000.
> The move to Trusted-Firmware-M v2.2.1 makes the BL1 code larger, while the provisioning
> bundle can be trimmed. At the same time BL2 and TF-M binary addresses now need to begin on
> a 0x100-byte boundary for Cortex-M0+ based platforms.
> 
> Key changes
> ===========
> 
> [...]

Applied, thanks!

[1/3] arm/trusted-firmware-m: Add new recipe for Trusted-Firmware-M v2.2.1
      commit: 5a34655c1ca8ac5cd261ffc71e6ed10da4b940ec
[2/3] arm/trusted-firmware-m: Add alignment checks for Cortex-M0+ based platform binaries
      commit: c7581dfab24ce3859151f556102ac0254635e423
[3/3] arm-bsp: corstone1000: Upgrade Trusted-Firmware-M v2.2.1
      commit: a059fc317f5b16458e0c19f3632e81498c86a73c

Best regards,