Skip to content

Commit 54728b0

Browse files
Vge0rgeVge0rge
committed
modules: tf-m: Add support for nRF54L10 non secure target
Add support for the non secure target: nrf54l15dk/nrf54l10/cpuapp/ns in NCS. This defines the target and iherits nearly all configuration and code from nRF54L15. An exception to that was the default RAM region for TF-M which was reduced to 64KB. Ref: NCSDK-30404 Signed-off-by: Georgios Vasilakis <[email protected]>
1 parent 7f61671 commit 54728b0

File tree

10 files changed

+118
-20
lines changed

10 files changed

+118
-20
lines changed

‎modules/trusted-firmware-m/Kconfig.tfm.defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ config TFM_BOARD
1111
default "${ZEPHYR_NRF_MODULE_DIR}/modules/trusted-firmware-m/tfm_boards/nrf9120" if SOC_NRF9120
1212
default "${ZEPHYR_NRF_MODULE_DIR}/modules/trusted-firmware-m/tfm_boards/nrf5340_cpuapp" if SOC_NRF5340_CPUAPP
1313
default "${ZEPHYR_NRF_MODULE_DIR}/modules/trusted-firmware-m/tfm_boards/nrf54l15_cpuapp" if SOC_NRF54L15_CPUAPP
14+
default "${ZEPHYR_NRF_MODULE_DIR}/modules/trusted-firmware-m/tfm_boards/nrf54l10_cpuapp" if SOC_NRF54L10_CPUAPP
1415
depends on TRUSTED_EXECUTION_NONSECURE
1516

1617
if BUILD_WITH_TFM

‎modules/trusted-firmware-m/Kconfig.tfm.pm‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ config PM_PARTITION_SIZE_TFM_SRAM
1414
# It has been observed for 54L that when Matter is enabled, then
1515
# assigning 0x16000 of RAM to TFM will not leave enough RAM for
1616
# Matter. So we use 0x13000 of RAM on 54L.
17-
default 0x13000 if SOC_SERIES_NRF54LX
17+
default 0x13000 if SOC_NRF54L15_CPUAPP
18+
# Set the of TFM_SRAM to 0x10000(64kB) since the nR54L10
19+
# has less RAM. The number was selected based on the observed memory
20+
# usage of TFM in crypto samples and it can be changed later if needed.
21+
default 0x10000 if SOC_NRF54L10_CPUAPP
1822
default 0x16000 if SOC_SERIES_NRF91X
1923
default 0x30000
2024
help

‎modules/trusted-firmware-m/tfm_boards/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ if (${TFM_PARTITION_CRYPTO})
8787
$<$<BOOL:${CONFIG_HW_UNIQUE_KEY_RANDOM}>:CONFIG_HW_UNIQUE_KEY_RANDOM>
8888
)
8989

90-
# nrf54l15 uses the PSA headers in the hw_unique_key_cracen_kmu.c file, which means
90+
# nrf54l15/nrf54l10 use the PSA headers in the hw_unique_key_cracen_kmu.c file, which means
9191
# that we need to make sure that the nrf_security PSA headers are included
9292
# before any other PSA-related headers.
93-
if(NRF_SOC_VARIANT STREQUAL nrf54l15)
93+
if(NRF_SOC_VARIANT MATCHES "nrf54l1[05]")
9494
target_link_libraries(platform_crypto_keys
9595
PRIVATE
9696
psa_crypto_library_config
@@ -221,7 +221,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/common
221221
DESTINATION ${INSTALL_PLATFORM_NS_DIR})
222222

223223

224-
if(NRF_SOC_VARIANT STREQUAL nrf54l15)
224+
if(NRF_SOC_VARIANT MATCHES "nrf54l1[05]")
225225
file(COPY ${ZEPHYR_NRF_MODULE_DIR}/subsys/nrf_security/src/drivers/cracen/cracenpsa/include/cracen_psa_key_ids.h
226226
DESTINATION ${INSTALL_INTERFACE_INC_DIR})
227227
file(COPY ${ZEPHYR_NRF_MODULE_DIR}/subsys/nrf_security/src/drivers/cracen/cracenpsa/include/cracen_psa_kmu.h

‎modules/trusted-firmware-m/tfm_boards/board/device_cfg.h‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,8 @@
1313
#undef ARRAY_SIZE
1414
#include <zephyr/devicetree.h>
1515

16-
#if !defined(NRF54L15_XXAA)
1716

18-
#if defined(CONFIG_TFM_SECURE_UART0) || DOMAIN_NS == 1U
19-
#define TFM_UART uart0
20-
#endif /* defined(CONFIG_TFM_SECURE_UART0) || DOMAIN_NS == 1U */
21-
22-
#if defined(CONFIG_TFM_SECURE_UART1) && DOMAIN_NS != 1U
23-
#define TFM_UART uart1
24-
#endif /* defined(CONFIG_TFM_SECURE_UART1) */
25-
26-
#else /* NRF54L15_XXAA */
17+
#if defined(NRF54L15_XXAA) || defined(NRF54L10_XXAA)
2718

2819
#if defined(CONFIG_TFM_SECURE_UART00) && DOMAIN_NS != 1U
2920
#define TFM_UART uart00
@@ -45,7 +36,17 @@
4536
#define TFM_UART uart30
4637
#endif /* defined(CONFIG_TFM_SECURE_UART30) */
4738

48-
#endif /* NRF54L15_XXAA */
39+
#else /* NRF54L15_XXAA || NRF54L10_XXAA */
40+
41+
#if defined(CONFIG_TFM_SECURE_UART0) || DOMAIN_NS == 1U
42+
#define TFM_UART uart0
43+
#endif /* defined(CONFIG_TFM_SECURE_UART0) || DOMAIN_NS == 1U */
44+
45+
#if defined(CONFIG_TFM_SECURE_UART1) && DOMAIN_NS != 1U
46+
#define TFM_UART uart1
47+
#endif /* defined(CONFIG_TFM_SECURE_UART1) */
48+
49+
#endif /* NRF54L15_XXAA || NRF54L10_XXAA */
4950

5051
#define DEFAULT_UART_BAUDRATE DT_PROP_OR(DT_NODELABEL(TFM_UART), current_speed, 115200)
5152

‎modules/trusted-firmware-m/tfm_boards/common/assert.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
M2S(PM_TFM_NONSECURE_ADDRESS) \
2323
"\nwhich is not aligned with the SPU/MPC HW requirements." \
2424
"\nIn nRF53/nRF91 series the flash region need to be aligned with the SPU region size." \
25-
"\nIn nRF54L15 the flash region need to be aligned with the MPC region size." \
25+
"\nIn nRF54L15/nRF54L10 the flash region need to be aligned with the MPC region size." \
2626
"\nRefer to the documentation section 'TF-M partition alignment requirements'" \
2727
"\nfor more information.\n\n"
2828

@@ -33,7 +33,7 @@
3333
#pragma message \
3434
"SRAM non-secure address is not aligned to SPU/MPC HW requirements" \
3535
"\nIn nRF53/nRF91 series the RAM region need to be aligned with the SPU region size." \
36-
"\nIn nRF54L15 the RAM region need to be aligned with the MPC region size.\n\n"
36+
"\nIn nRF54L15/nRF54L10 the RAM region need to be aligned with the MPC region size.\n\n"
3737

3838
#error "SRAM non-secure start address is not aligned to SPU/MPC HW requirements"
3939
#endif

‎modules/trusted-firmware-m/tfm_boards/external_core.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ if(TARGET platform_s)
136136
# Required for system_nrfxx_approtect.h.
137137
$<$<BOOL:${CONFIG_NRF_APPROTECT_LOCK}>:ENABLE_APPROTECT>
138138
$<$<BOOL:${CONFIG_NRF_APPROTECT_USER_HANDLING}>:ENABLE_APPROTECT_USER_HANDLING>
139-
$<$<BOOL:${CONFIG_NRF_APPROTECT_USER_HANDLING}>:ENABLE_AUTHENTICATED_APPROTECT> # nRF54L15
139+
$<$<BOOL:${CONFIG_NRF_APPROTECT_USER_HANDLING}>:ENABLE_AUTHENTICATED_APPROTECT> # nRF54L15/nRF54L10
140140
$<$<BOOL:${CONFIG_NRF_SECURE_APPROTECT_LOCK}>:ENABLE_SECURE_APPROTECT>
141-
$<$<BOOL:${CONFIG_NRF_SECURE_APPROTECT_LOCK}>:ENABLE_SECUREAPPROTECT> # nRF54L15
141+
$<$<BOOL:${CONFIG_NRF_SECURE_APPROTECT_LOCK}>:ENABLE_SECUREAPPROTECT> # nRF54L15/nRF54L10
142142
$<$<BOOL:${CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING}>:ENABLE_SECURE_APPROTECT_USER_HANDLING>
143-
$<$<BOOL:${CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING}>:ENABLE_AUTHENTICATED_SECUREAPPROTECT> # nRF54L15
143+
$<$<BOOL:${CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING}>:ENABLE_AUTHENTICATED_SECUREAPPROTECT> # nRF54L15/nRF54L10
144144
)
145145
endif()

‎modules/trusted-firmware-m/tfm_boards/nrf54l10_cpuapp/CMakeLists.txt‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#
2+
# Copyright (c) 2025, Nordic Semiconductor ASA.
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
7+
set(NRF_BOARD_SELECTED True)
8+
9+
add_subdirectory(${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/common/nrf54l10 nrf54l10)
10+
11+
add_subdirectory(.. tfm_board)
12+
13+
target_include_directories(platform_s
14+
PUBLIC
15+
${ZEPHYR_NRF_MODULE_DIR}/subsys/nrf_security/src/drivers/cracen/cracenpsa/include
16+
)
17+
18+
target_sources(platform_s
19+
PRIVATE
20+
${ZEPHYR_BASE}/soc/nordic/nrf54l/soc.c
21+
)
22+
23+
target_include_directories(platform_s
24+
PRIVATE
25+
${ZEPHYR_BASE}/modules/cmsis/
26+
${ZEPHYR_BASE}/soc/nordic/nrf54l
27+
${ZEPHYR_BASE}/soc/nordic/common
28+
)
29+
30+
# nrf54l10_application.h should be defining __ICACHE_PRESENT, but
31+
# it is not, until this is fixed we define it here.
32+
target_compile_definitions(platform_s
33+
PRIVATE
34+
__ICACHE_PRESENT=1
35+
)
36+
37+
install(FILES ${CMAKE_CURRENT_LIST_DIR}/ns/cpuarch_ns.cmake
38+
DESTINATION ${INSTALL_PLATFORM_NS_DIR}
39+
RENAME cpuarch.cmake)
40+
41+
install(FILES config.cmake
42+
DESTINATION ${INSTALL_PLATFORM_NS_DIR})
43+
44+
install(FILES ../common/config.cmake
45+
DESTINATION ${INSTALL_PLATFORM_NS_DIR}/../common/)
46+
47+
install(DIRECTORY ${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/nrf54l15dk_nrf54l10_cpuapp/tests
48+
DESTINATION ${INSTALL_PLATFORM_NS_DIR}
49+
)

‎modules/trusted-firmware-m/tfm_boards/nrf54l10_cpuapp/config.cmake‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#-------------------------------------------------------------------------------
2+
# Copyright (c) 2025, Nordic Semiconductor ASA.
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
#-------------------------------------------------------------------------------
7+
8+
include(${CMAKE_CURRENT_LIST_DIR}/../common/config.cmake)
9+
10+
set(NRF_SOC_VARIANT nrf54l10 CACHE STRING "nRF SoC Variant")
11+
12+
include(${PLATFORM_PATH}/common/${NRF_SOC_VARIANT}/config.cmake)
13+
14+
# Override PS_CRYPTO_KDF_ALG
15+
set(PS_CRYPTO_KDF_ALG PSA_ALG_SP800_108_COUNTER_CMAC CACHE STRING "KDF Algorithm to use")
16+
17+
# attest_hal.c includes bl_storage.h, which needs CONFIG_NRFX_RRAMC to be defined.
18+
# This is because bl_storage is a lib intended to be run from either the bootloader (Zephyr) or from TF-M.
19+
# This is independent from the NS image's CONFIG_NRFX_RRAMC, which must be disabled, so we can not inherit
20+
# this from app Kconfig.
21+
if(TFM_PARTITION_INITIAL_ATTESTATION)
22+
add_compile_definitions(CONFIG_NRFX_RRAMC)
23+
endif()

‎modules/trusted-firmware-m/tfm_boards/nrf54l10_cpuapp/cpuarch.cmake‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#
2+
# Copyright (c) 2025, Nordic Semiconductor ASA.
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
7+
set(PLATFORM_PATH platform/ext/target/nordic_nrf)
8+
9+
include(${PLATFORM_PATH}/common/nrf54l10/cpuarch.cmake)
10+
add_compile_definitions(__NRF_TFM__)

‎modules/trusted-firmware-m/tfm_boards/nrf54l10_cpuapp/ns/cpuarch_ns.cmake‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#
2+
# Copyright (c) 2025, Nordic Semiconductor ASA.
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
7+
set(PLATFORM_DIR ${CMAKE_CURRENT_LIST_DIR})
8+
set(PLATFORM_PATH ${CMAKE_CURRENT_LIST_DIR})
9+
10+
include(${CMAKE_CURRENT_LIST_DIR}/common/nrf54l10/cpuarch.cmake)

0 commit comments

Comments
 (0)