Skip to content

Conversation

@Vge0rge
Copy link
Collaborator

@Vge0rge Vge0rge commented Nov 12, 2025

…dic boards

Remove the FLPR reserved non-volatile and volatile memory for all Nordic boards since it is not yet supported with TF-M.

Change-Id: I6bb513d52a55b9571e10392b567b9b77a686d79b

Jayashree-Srinivasan-adi and others added 30 commits June 27, 2025 16:59
Add support for Analog Devices MAX32657 platform and fetch
ADI HAL library.

Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Co-authored-by: Sadik Ozer <sadik.ozer@analog.com>
Change-Id: If884aa9a35664f6117574b0d4cde363a19e4eca5
Signed-off-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
(cherry picked from commit 54a8a58)
To enable BL2 for MAX32657, this commit
- Enables BL2
- Updates CMakeFile
- Adds gcc linker file,  common/gcc/tfm_bl2_common.ld copied as
  max32657_sla.ld
- Adds system file

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Co-authored-by: Tanmaya Mishra <Tanmaya.Mishra@analog.com>
Change-Id: Ifd0379aadd74df8006fad062397c093cab27c560
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit d3036b5)
Update CMakeFile for tf-m integration
Enable tf-m flags in config file

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Co-authored-by: Tanmaya Mishra <Tanmaya.Mishra@analog.com>
Change-Id: I67484cdd9c4b8d3c94873a2d1fc8e69ef7eb1d08
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit aa15c18)
Add PPC driver for MAX32657, it is a shim driver that
filled with hal_adi call functions

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Co-authored-by: Tanmaya Mishra <Tanmaya.Mishra@analog.com>
Change-Id: I1f16c64263846321f1f156b744af5ac25d0e6d12
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 3599278)
Define secure, non-secure memory and required peripheral address

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Co-authored-by: Tanmaya Mishra <Tanmaya.Mishra@analog.com>
Change-Id: I5b6c0335d6e34c55a7a671008848e94cb851b6fb
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 609ef3f)
Set image region for fw and other section, flash devided as below

/* Flash layout on MAX32657 with BL2 (multiple image boot):
 *
 * Secure flash address which 28th bit 1 is logical address
 *
 * 0X0100_0000 BL2 - MCUBoot (64KB)
 * 0x0101_0000 Secure image     primary slot (320KB)
 * 0x0106_0000 Non-secure image primary slot (576KB)
 * 0x010F_0000 Secure image     secondary slot (0KB)
 * 0x010F_0000 Non-secure image secondary slot (0KB)
 * 0x010F_0000 Scratch area (0)
 * 0x010F_0000 Protected Storage Area (0)
 * 0x010F_0000 Internal Trusted Storage Area (16 KB)
 * 0x010F_4000 OTP / NV counters area (16 KB)
 * 0x010F_8000 Unused (32KB)
 *
 * Flash layout on MAX32657 with BL2 (single image boot):
 *
 * 0X0100_0000 BL2 - MCUBoot (64KB)
 * 0x0101_0000 Primary image area (896KB):
 *    0x0101_0000 Secure     image primary
 *    0x0106_0000 Non-secure image primary
 * 0x010F_0000 Secondary image area (0KB):
 *    0x010F_0000 Secure     image secondary
 *    0x010F_0000 Non-secure image secondary
 * 0x010F_0000 Scratch area (0)
 * 0x010F_0000 Protected Storage Area (0)
 * 0x010F_0000 Internal Trusted Storage Area (16 KB)
 * 0x010F_4000 OTP / NV counters area (16 KB)
 * 0x010F_8000 Unused
 *
 * Flash layout on MAX32657, if BL2 not defined:
 *
 * 0X0100_0000 Secure     image (512KB)
 * 0X0108_0000 Non-secure image (512KB)
 */

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Co-authored-by: Tanmaya Mishra <Tanmaya.Mishra@analog.com>
Change-Id: I0f7021ed6f06e56b5549bf5edfefc86adb12b604
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 098c6bd)
Set the flag that required by the tf-m project
- BL2
- RAM and Code size
- Shared section size

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Co-authored-by: Tanmaya Mishra <Tanmaya.Mishra@analog.com>
Change-Id: Ia3b343d3a3e363dd7b259580d7f1ad284ff29f1d
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 8e0d63a)
Add flash driver for MAX32657, it is a shim driver that
filled with hal_adi call functions

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Co-authored-by: Tanmaya Mishra <Tanmaya.Mishra@analog.com>
Change-Id: I2a3691e2bb0946df8bf1f4fa57bb25a3dad4b5f4
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit dd40134)
- Disable PLATFORM_DEFAULT_OTP to implement MAX32657 OTP
- Add read, write, get size functions
- Before writing and after reading OTP cell bits are reverted
due to default values not match with tfm expectation.
On default tfm expect otp cell be 0x00 and bit can be transceived from 0
to 1 but MAX32657 OTP default value is 0xff and bits can be converted
from 1 to 0. So that before write and after read bits are reverted.
- Set  bl2_rotpk_X size as 100 (max value) to get fix otp layout

Change-Id: I325f2934a78633d6add6592dc9fdf1c3dcd852ba
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 258b8fd)
Enable ioctl service to NS app (Zephyr) able to read
- USN
- LDO_TRIM_BB/RF
- DBB_SETTINGS

Co-authored-by: Sadik Ozer <sadik.ozer@analog.com>
Change-Id: Ie3f5bf60cba2b68e255dc602b3c5dc55d570c4df
Signed-off-by: Hao Zhang <Hao.Zhang@analog.com>
(cherry picked from commit 9509e1b)
Use PSA crpyto for MCUBoot, this commit enable this feture

Change-Id: I289f03ac88fea4ca4fbafe8607d4dc5c6e8fe1fb
Signed-off-by: Gowri Ramshankar <Gowri.Ramshankar@analog.com>
(cherry picked from commit 6afbbd8)
Enable the initial attestation partition in the configuration file for
the ADI MAX32657 target.

Boot measurements are needed for initial attestation. Measurements are
part of the shared data between boot and runtime.

The static buffer size used by mbedtls for its allocations has been
increased - to resolve the attestation testcase failure due to
insufficient memory. Note: This configuration could not be changed from
zephyr or within the TF-M platform configurations.
The size might be an issue upstream. The issue has been notified to
the TF-M community.

Increase MBEDTLS static buffer size within platform directory

The static buffer size used by MBEDTLS is increased from within
the platform directory instead of altering the small profile
configuration.

Co-authored-by: Sadik Ozer <sadik.ozer@analog.com>
Change-Id: I3ed73ca6df52bd8d4655b1ca2e5ee09ba223c6e0
Signed-off-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
(cherry picked from commit 9089b67)
Add UART driver for MAX32657, it is a shim driver that
filled with hal_adi call functions

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Co-authored-by: Tanmaya Mishra <Tanmaya.Mishra@analog.com>
Change-Id: I651058f11288efdcabbb7a7ae46ea0530dd47ed5
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit d014530)
Add MPC driver for MAX32657, it is referred to arm mpc sie200 driver

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Tanmaya Mishra <Tanmaya.Mishra@analog.com>
Co-authored-by: Sadik Ozer <sadik.ozer@analog.com>
Change-Id: I5834c0414bbcc1eff5c7d249b2d412fc3f8c85bc
Signed-off-by: Hao Zhang <Hao.Zhang@analog.com>
(cherry picked from commit eb55261)
This commit defines secure non-secure peripheral & memory regions

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Co-authored-by: Tanmaya Mishra <Tanmaya.Mishra@analog.com>
Change-Id: I26f9fc9d9e7ae4474c62f03ad5a0e40fd3bb0089
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 37abe21)
This commit added NS support to able to execute
zephyr regression tests.

MAX32657 supports small profile for now.
CONFIG_TFM_PROFILE_TYPE_SMALL=y

-- -------- NS TEST Configuration --------------------
-- TEST_NS_ATTESTATION                       OFF
-- TEST_NS_CRYPTO                            ON
-- TEST_NS_ITS                               ON
-- TEST_NS_PS                                OFF
-- TEST_NS_QCBOR                             OFF
-- TEST_NS_T_COSE                            OFF
-- TEST_NS_PLATFORM                          OFF
-- TEST_NS_FWU                               OFF
-- TEST_NS_IPC                               OFF
-- TEST_NS_FLIH_IRQ                          OFF
-- TEST_NS_MULTI_CORE                        OFF
-- TEST_NS_MANAGE_NSID                       OFF
-- TEST_NS_SFN_BACKEND                       ON
-- TEST_NS_FPU                               OFF
-- ---------------------------------------------------

Added UART here to get test output.

To build it, tf-m-tests shall be added in west file:
west config manifest.project-filter -- +tf-m-tests
west update

Change-Id: Ie60b62e83c59cec00f1ad197b3249ee7c7d89205
Signed-off-by: Hao Zhang <Hao.Zhang@analog.com>
(cherry picked from commit 4ae67f6)
Hal platform file requires to get ns entry point, vtor
and code start address. This commit add these features.

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Change-Id: Ib45a0562c42730efb91a94b528b2e83bb8596dba
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 8877329)
Enable ICC for MAX32657
ICC cache only accessibly by secure world.

Change-Id: I11b2e25bec3a46bed68b96e1d9a5888fbaf869aa
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit cfdc11b)
Implement hal isolation layer as per of existing implementation
and tfm requirement

Co-authored-by: Jayashree Srinivasan <Jayashree.Srinivasan@analog.com>
Co-authored-by: Hao Zhang <Hao.Zhang@analog.com>
Co-authored-by: Tanmaya Mishra <Tanmaya.Mishra@analog.com>
Change-Id: I8c8d5a6ecdfb8eeb1fb7dd21a830b46eea1dceb3
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 915c0c9)
We intend to use FP in our own NSPE application but the
TF-M SPE services that we enable do not require FP.

CONFIG_TFM_ENABLE_CP10CP11 detail:

Make FPU and MVE operational when SPE and/or NSPE require FPU or MVE usage.
This alone only enables the coprocessors CP10-CP11, whereas CONFIG_TFM_FLOAT_ABI=hard
along with CONFIG_TFM_ENABLE_FP, CONFIG_TFM_ENABLE_MVE or CONFIG_TFM_ENABLE_MVE_FP
compiles the code with hardware FP or MVE instructions and ABI.

Change-Id: Ifb8cdefcc05fb2a856593d2fb128a95f1c6f66ec
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit fab0109)
There is one UART on MAX32657, it is need to be used
by NS and S world depend on the test.
This commit adds related flag to switch UART between
S and NS world

Change-Id: I990866c846ffa0aa7d2100dbb2f09172ff454dc4
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 881f7e3)
Enable system reset request only to the secure world that
triggered via NVIC_SystemReset function.

Change-Id: I53457fba66a7c3aaec7524bda58f588f2f68fad3
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 037bcfd)
Add Sadik Ozer (ozersa) as Analog Devices maintainer.

Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: Ic6b5ae2a17430df9e4480605f350d2e3077551ba
(cherry picked from commit 6cb4e88)
To enable ER_CODE_SRAM section in linker file define
SRAM_CODE_START and SIZE. Size set as 1KB, this allow to store
ramfunctions in SRAM
Flash driver function stored in .flashprog in hal layer so that
S_RAM_CODE_EXTRA_SECTION_NAME defined.

.map output
.ER_CODE_SRAM   0x000000003000fc00      0x3b8 load address 0x0000000011012a20
 *libflash_drivers*:(SORT_BY_ALIGNMENT(.text*))
 *libflash_drivers*:(SORT_BY_ALIGNMENT(.rodata*))
 *(.ramfunc)
 *(.flashprog)
 .flashprog     0x000000003000fc00       0x58 platform/libplatform_s.a(flc_me30.o)
                0x000000003000fc00                MXC_FLC_Busy
                0x000000003000fc04                MXC_FLC_PageErase
                0x000000003000fc28                MXC_FLC_Write128
 .flashprog     0x000000003000fc58      0x11c platform/libplatform_s.a(flc_common.o)
                0x000000003000fc58                MXC_FLC_Com_VerifyData
                0x000000003000fc7c                MXC_FLC_Com_Write
                0x000000003000fd6a                MXC_FLC_Com_Read
 .flashprog     0x000000003000fd74      0x218 platform/libplatform_s.a(flc_reva.o)
                0x000000003000fdb4                MXC_FLC_RevA_Busy
                0x000000003000fdc4                MXC_FLC_RevA_MassErase
                0x000000003000fe04                MXC_FLC_RevA_PageErase
                0x000000003000fe46                MXC_FLC_RevA_Write32
                0x000000003000fea4                MXC_FLC_RevA_Write32Using128
                0x000000003000ff2c                MXC_FLC_RevA_Write128

Change-Id: I9bc4b99602dc3b13c19faaec52c2e23211b8e959
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit b21f209)
ADI BootRom secure mode currently uses floating point registers and set
FPCA bit. ADI TF-M would ensure FPCA bit is cleared before jumping to NS

Change-Id: Ibe3c2adfe54cb13353c77b4827b279816d9e19bc
Signed-off-by: Hao Zhang <Hao.Zhang@analog.com>
(cherry picked from commit cc6354c)
MAX32657 firmware need to have a header and signature section to
it be interpreted and validated by BootROM

Change-Id: I1d96deda795048ec96b5028c352a6078afde5d79
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 574cf79)
By using PLATFORM_DEFAULT_PROVISIONING user can provision device by its secret key
If PLATFORM_DEFAULT_PROVISIONING flag been OFF
platform/ext/common/provision_bundle will be build
that include test key, user can set related item with their private values.
This bundle can be loaded to SRAM and executed there.

If -DPLATFORM_DEFAULT_PROVISIONING=OFF and -DTFM_DUMMY_PROVISIONING=ON then the keys in
the tf-m/platform/ext/target/common/provisioning/provisioning_config.cmake and the
default MCUBoot signing keys will be used for provisioning.

If -DPLATFORM_DEFAULT_PROVISIONING=OFF and -DTFM_DUMMY_PROVISIONING=OFF are set
then unique values can be used for provisioning. The keys and seeds can be changed by
passing the new values to the build command, or by setting the -DPROVISIONING_KEYS_CONFIG flag
to a .cmake file that contains the keys. An example config cmake file can be seen at
tf-m/platform/ext/target/common/provisioning/provisioning_config.cmake.
Otherwise new random values are going to be generated and used. For the image signing
the ${MCUBOOT_KEY_S} and ${MCUBOOT_KEY_NS} will be used. These variables should point to
.pem files that contain the code signing private keys. The public keys are going to be generated
from these private keys and will be used for provisioning. The hash of the public key is going to
be written into the provisioning_data.c automatically.

Change-Id: I9d54c76ccc3e1adc20ecf4047351d9c19b3d256f
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 5c0ffdb)
This commit adds/updates related file for MAX32657 documentations

Change-Id: I5ff357ef35b0a3e7e31b0ae127f90803d3c6f397
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit 89f8f96)
TESA stands for Trusted Edge Security Architecture.
This commit download ADI TESA-Toolkit repository which includes
binaries (that used to sign image) provisioning scripts and keys.

MAX32657 has Secure Boot ROM which used to authenticite user
second layer firmware for TF-M case second layer is MCUBoot.

If SecureBoot ROM been activated MCUBoot need to be signed to be validated
by ADI Secure BootROM.

Set BL1=ON if you would like to enable Secure Boot ROM on device
The MCUBoot will be signed during build if BL1 be ON

bin2hex.py scripts is used to convert bl2_signed.bin to bl2_signed.hex
it comes from https://github.com/python-intelhex/intelhex

Change-Id: Ibb858515397ffc1d649f1cdc2c4660eba597d702
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit b6d24df)
Move HAL layer files under hal_adi.cmake to simplify maintanence

Change-Id: I511549147cbb05f926073710466fc4f2ed8dd057
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
(cherry picked from commit b3025d0)
adeaarm and others added 3 commits October 30, 2025 10:18
* Logging uses the old logging format available in release/2.2.x
* Modify prints to be clearer in attest_core.c
* Explicit casting of profile_definition string in HAL call

Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: I3bc433672ff37e2cc24a60fd7422e69e06ecc236
(cherry picked from commit b8cd3ed)
Update the header nrf-pinctrl.h header to match the latest
one from Zephyr. This file was copied and modified before
in order to inlcude two relevant helper macros.

I created another header called tfm-pinctrl.h which includes
these two macros and the header nrf-pinctl.h. This makes it
easier to understand that this is a custom header and also
allows to copy the nrf-pinctrl.h as is.

Change-Id: I3de6a0ac51de5a9b98f9897837c361be94e1ae29
Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
(cherry picked from commit 784c04f8ef16ecd43cd132a5f0738d5ed654d506)
TF-M holds a copy of Mbed TLS header files and prior to this commit they
were aligned to Mbed TLS v3.6.3. This commit updates them to what's in
release v3.6.5.

This commit will be removed in the next TF-M release that includes Mbed TLS
v3.6.5.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
@tomi-font
Copy link
Collaborator

now a fromtree

@Vge0rge Vge0rge changed the title [zep fromlist] platform: nordic: Remove FLPR reserved memory from Nor… [zep fromtree] platform: nordic: Remove FLPR reserved memory from Nor… Nov 26, 2025
@Vge0rge
Copy link
Collaborator Author

Vge0rge commented Nov 26, 2025

I updated to fromtree

Copy link
Collaborator

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing -x

travis3630 and others added 14 commits November 27, 2025 12:52
Add initial tfm support for nrf7120
This is based on nrf54l series soc, should have similar settings
Added startup_nrf71 and target_cfg_71 to support this

Change-Id: I83d9b971c4e46fc300092fd0badd30e2023639cc
Signed-off-by: Travis Lam <travis.lam@nordicsemi.no>
(cherry picked from commit 10be9b4fbd2a8d8201aee7ccd5b5fb3389099c40)
…4L series

Update nrf5l_init to enable DCDC during startup.
LDO is not supported and therefore causes larger power consumption.

Change-Id: I9a6dc928259895ed8b54c99aff9974ce1a13896e
Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
(cherry picked from commit 76c6c1df85238c2cfda11d16a8011cba3ea324ff)
Update the Nordic USART functions to accept other
miscellaneous control commands apart from the
mode control ones.

This makes the USART functions for Nordic platforms
to acept the CONTROL_TX and CONTROL_RX commands as
well.

The sdtio_init function uses the ARM_USART_CONTROL_TX
command which used to fail for Nordic platforms
before but the return code of the control function
was never checked. Recently this changed and it now
checks for the return code which makes the Nordic
platform failing to boot so this change is necessary.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Change-Id: I65b0884338df924dbec3783421779d64ceaaf741
(cherry picked from commit f256c198e7ba794da5e4ac7f868c8a68ce6bad31)
Starting with nrfx 4.0 nrfx.h must now be included instead of nrf.h.
Prepare for the update of nrfx by updating the includes accordingly.

Change-Id: Ic92f2d954ceebc79226681114abc7e0457fc01a6
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit b913372934c7748600ad6ae3b69cdcee8c487293)
…onfig.h

Starting from nrfx 4.0 nrf.h must not be included directly and
because we are in the nrfx configuration header file we cannot
include nrfx.h.
So remove the include and instead of using MDK defines use
device-specific compile definitions that are defined by TF-M.

Change-Id: I23a7ab5a0def59317db7a35419da28643bbf706e
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
(cherry picked from commit cb43291fb2032ee5b8bf7c277cc93c89fe749207)
Align common files.

Change-Id: I73509382d31476f88c20dee42fde4de6126f565d
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit 8ff947dd53f91cc850ee05164d9df5e377a48fbd)
…factor

Align with changes needed for nrfx 4.0.
Refactor to use nrfx layer instead of HAL.

Change-Id: Ibbffe2c2e27ea98ac08e0e23f4c33603c04fe5ea
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit f07f10b9c028ee1de036037264e6b1929432af1d)
Fix a path issue with the non secure application config.cmake
file. The config.cmake for nRF54L10 and nRF54L15 is the same.
To avoid duplicating the file the config.cmake is placed in a
common nrf54l folder and it is included by each platforms
config.cmake files. This doesn't work for the non secure application
because the path does not exist. To fix that install to the non secure
application the common file directly.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Change-Id: I36d6bed5d1f2a71ed12f9004485accfcbca1b0d6
(cherry picked from commit 51352be)
All copyright headers updated to comply with BSD-3-Clause.

Change-Id: Ie36f8039cdf5fb6f3fa768c588850d95abaf0027
Signed-off-by: Anton Zyma <anton.zyma@nordicsemi.no>
(cherry picked from commit d33d42d6728172d7db69805d1c3985bd11a89455)
Updated tag to 3.12.1

Change-Id: I650d2f85e137c6d0c5af3206cc4daee66448af13
Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
(cherry picked from commit dfdd45978d07bc7b44e4b7dcf3a9ea99d1295112)
Use nrfx 4.0.1 release.

Change-Id: I838d1ece8bd5ba248e421334bdd6a140d5fc9a6c
Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
nrfx_config from nrfx's templates can be used.

Change-Id: I5f532376ef0c9c73ec19b3933685a644a35a9c19
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Update error codes.

Change-Id: I492f82cfb777a5acfac536ae5e647ed8b7a61df3
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
… last

Since `compiler_ext_defs.h` should define compiler symbols only
if they have not been previously defined, it should be included
as the last header to avoid redefine warnigns.
Fix in all files.

Change-Id: I010b8885b4e1b150ec527f0b246b95a4dab4902a
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@Vge0rge
Copy link
Collaborator Author

Vge0rge commented Nov 27, 2025

I thought that -x is not needed for TF-M commits since they have the change id but I cannot find the rules now.

@tomi-font
Copy link
Collaborator

Rules are here: https://github.com/zephyrproject-rtos/mbedtls/?tab=readme-ov-file#additional-patches
-x is needed for fromtrees as always, it's for fromlists that you don't need to add Upstream PR #

…dic boards

Remove the FLPR reserved non-volatile and volatile memory for all
Nordic boards since it is not yet supported with TF-M.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Change-Id: I6bb513d52a55b9571e10392b567b9b77a686d79b
(cherry picked from commit 9dc8a38c48d8189211de9b12e9d06dafcef7848c)
@tomi-font tomi-font changed the base branch from main to zephyr_tf-m_v2.2.2 December 3, 2025 09:03
@tomi-font
Copy link
Collaborator

The default branch of this repository is being changed to zephyr_tf-m_v2.2.2 which will replace main shortly.
Please rebase your branch atop zephyr_tf-m_v2.2.2 and force-push it.
I have already changed your PR's base branch to zephyr_tf-m_v2.2.2.
Also, make sure to follow the new commit guidelines documented here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.