diff --git a/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuapp_ns_defconfig b/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuapp_ns_defconfig index bcd99e01dc91..efe4c862fdd5 100644 --- a/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuapp_ns_defconfig +++ b/boards/nordic/nrf54lv10dk/nrf54lv10dk_nrf54lv10a_cpuapp_ns_defconfig @@ -33,4 +33,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n # from the non secure application directly. This needs to be set # otherwise nrfx will try to configure them, resulting in a bus # fault. -CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y +CONFIG_NRF_SKIP_CLOCK_CONFIG=y diff --git a/cmake/sysbuild/partition_manager.cmake b/cmake/sysbuild/partition_manager.cmake index d97c6c79861c..46b186cfeb14 100644 --- a/cmake/sysbuild/partition_manager.cmake +++ b/cmake/sysbuild/partition_manager.cmake @@ -515,6 +515,7 @@ foreach(d APP ${PM_DOMAINS}) sysbuild_get(${image_name}_CONFIG_SOC_NRF54L10_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54L10_CPUAPP KCONFIG) sysbuild_get(${image_name}_CONFIG_SOC_NRF54LM20A_ENGA_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54LM20A_ENGA_CPUAPP KCONFIG) sysbuild_get(${image_name}_CONFIG_SOC_NRF54LV10A_ENGA_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54LV10A_ENGA_CPUAPP KCONFIG) + sysbuild_get(${image_name}_CONFIG_SOC_NRF54LM20A_ENGA_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54LM20A_ENGA_CPUAPP KCONFIG) if(${image_name}_CONFIG_SOC_SERIES_NRF91X) # See nRF9160 Product Specification, chapter "UICR" diff --git a/doc/nrf/includes/sample_board_rows.txt b/doc/nrf/includes/sample_board_rows.txt index 5d9942ecac21..de2b152c2553 100644 --- a/doc/nrf/includes/sample_board_rows.txt +++ b/doc/nrf/includes/sample_board_rows.txt @@ -279,6 +279,10 @@ | :ref:`nRF54LM20 DK ` | PCA10184 | :zephyr:board:`nrf54lm20dk ` | ``nrf54lm20dk/nrf54lm20a/cpuapp`` | +.. nrf54lm20dk_nrf54lm20a_cpuapp_ns + +| :ref:`nRF54LM20 DK ` | PCA10184 | :zephyr:board:`nrf54lm20dk ` | ``nrf54lm20dk/nrf54lm20a/cpuapp/ns`` | + .. nrf54lm20dk_nrf54lm20a_cpuflpr | :ref:`nRF54LM20 DK ` | PCA10184 | :zephyr:board:`nrf54lm20dk ` | ``nrf54lm20dk/nrf54lm20a/cpuflpr`` | diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index 672e8aa40afd..1425f3dd9049 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -444,6 +444,8 @@ Cryptography samples * Added support for ``nrf54lm20dk/nrf54lm20a/cpuapp``. +* Added support for the ``nrf54lm20dk/nrf54lm20a/cpuapp/ns`` board target in all supported cryptography samples. + Debug samples ------------- @@ -564,6 +566,10 @@ Trusted Firmware-M (TF-M) samples * :ref:`tfm_hello_world` sample: * Added support for the ``nrf54lv10dk/nrf54lv10a/cpuapp/ns`` board target. + * Added support for the ``nrf54lm20dk/nrf54lm20a/cpuapp/ns`` board target. + +* :ref:`tfm_secure_peripheral_partition` + * Added support for the ``nrf54lm20dk/nrf54lm20a/cpuapp/ns`` board target. Thread samples -------------- diff --git a/modules/trusted-firmware-m/Kconfig b/modules/trusted-firmware-m/Kconfig index 5feeb875e592..c06c0dd520bf 100644 --- a/modules/trusted-firmware-m/Kconfig +++ b/modules/trusted-firmware-m/Kconfig @@ -227,6 +227,7 @@ config TFM_ITS_ENCRYPTED depends on !CRACEN_NEED_MULTIPART_WORKAROUNDS default y if SOC_SERIES_NRF54LX select PSA_WANT_ALG_CHACHA20_POLY1305 if SOC_SERIES_NRF54LX + depends on !SOC_NRF54LM20A_ENGA_CPUAPP select PSA_WANT_GENERATE_RANDOM help Enables authenticated encryption for PSA Internal Trusted Storage files @@ -515,6 +516,7 @@ config TFM_S_CODE_VECTOR_TABLE_SIZE hex default 0x144 if SOC_SERIES_NRF91X default 0x154 if SOC_NRF5340_CPUAPP + default 0x4cc if SOC_NRF54LM20A_ENGA_CPUAPP default 0x47c if SOC_SERIES_NRF54LX default 0xffffffff # Invalid value to discover missing SOC support. help diff --git a/modules/trusted-firmware-m/Kconfig.tfm.defconfig b/modules/trusted-firmware-m/Kconfig.tfm.defconfig index 19a488bb1a8a..6b8c04862106 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm.defconfig +++ b/modules/trusted-firmware-m/Kconfig.tfm.defconfig @@ -13,6 +13,7 @@ config TFM_BOARD default "$(ZEPHYR_NRF_MODULE_DIR)/modules/trusted-firmware-m/tfm_boards/nrf54l15_cpuapp" if SOC_NRF54L15_CPUAPP default "$(ZEPHYR_NRF_MODULE_DIR)/modules/trusted-firmware-m/tfm_boards/nrf54l10_cpuapp" if SOC_NRF54L10_CPUAPP default "$(ZEPHYR_NRF_MODULE_DIR)/modules/trusted-firmware-m/tfm_boards/nrf54lv10a_cpuapp" if SOC_NRF54LV10A_ENGA_CPUAPP + default "$(ZEPHYR_NRF_MODULE_DIR)/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp" if SOC_NRF54LM20A_ENGA_CPUAPP depends on TRUSTED_EXECUTION_NONSECURE if BUILD_WITH_TFM diff --git a/modules/trusted-firmware-m/Kconfig.tfm.pm b/modules/trusted-firmware-m/Kconfig.tfm.pm index 087c3ddf2ebb..3d9a660470ff 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm.pm +++ b/modules/trusted-firmware-m/Kconfig.tfm.pm @@ -18,7 +18,8 @@ config PM_PARTITION_SIZE_TFM_SRAM # Set the of TFM_SRAM to 0x10000(64kB) since the nR54L10 # has less RAM. The number was selected based on the observed memory # usage of TFM in crypto samples and it can be changed later if needed. - default 0x10000 if SOC_NRF54L10_CPUAPP || SOC_NRF54LV10A_ENGA_CPUAPP + default 0x10000 if SOC_NRF54L10_CPUAPP || SOC_NRF54LV10A_ENGA_CPUAPP || \ + SOC_NRF54LM20A_ENGA_CPUAPP default 0x16000 if SOC_SERIES_NRF91X default 0x30000 help diff --git a/modules/trusted-firmware-m/tfm_boards/CMakeLists.txt b/modules/trusted-firmware-m/tfm_boards/CMakeLists.txt index 005790f0d227..aa8030f4fd89 100644 --- a/modules/trusted-firmware-m/tfm_boards/CMakeLists.txt +++ b/modules/trusted-firmware-m/tfm_boards/CMakeLists.txt @@ -91,7 +91,8 @@ if(${TFM_PARTITION_CRYPTO}) # nrf54l15/nrf54l10 use the PSA headers in the hw_unique_key_cracen_kmu.c file, which means # that we need to make sure that the nrf_security PSA headers are included # before any other PSA-related headers. - if(NRF_SOC_VARIANT MATCHES "nrf54l1[05]" OR NRF_SOC_VARIANT MATCHES "nrf54lv10a") + if(NRF_SOC_VARIANT MATCHES "nrf54l1[05]" OR NRF_SOC_VARIANT MATCHES "nrf54lv10a" + OR NRF_SOC_VARIANT MATCHES "nrf54lm20a") target_link_libraries(platform_crypto_keys PRIVATE psa_crypto_library_config @@ -222,7 +223,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/common DESTINATION ${INSTALL_PLATFORM_NS_DIR}) -if(NRF_SOC_VARIANT MATCHES "nrf54l1[05]" OR NRF_SOC_VARIANT MATCHES "nrf54lv10a") +if(NRF_SOC_VARIANT MATCHES "nrf54l1[05]" OR NRF_SOC_VARIANT MATCHES "nrf54lv10a" OR NRF_SOC_VARIANT MATCHES "nrf54lm20a") file(COPY ${ZEPHYR_NRF_MODULE_DIR}/subsys/nrf_security/src/drivers/cracen/cracenpsa/include/cracen_psa_key_ids.h DESTINATION ${INSTALL_INTERFACE_INC_DIR}) file(COPY ${ZEPHYR_NRF_MODULE_DIR}/subsys/nrf_security/src/drivers/cracen/cracenpsa/include/cracen_psa_kmu.h diff --git a/modules/trusted-firmware-m/tfm_boards/board/device_cfg.h b/modules/trusted-firmware-m/tfm_boards/board/device_cfg.h index 5c8400673ceb..f224bc1d0845 100644 --- a/modules/trusted-firmware-m/tfm_boards/board/device_cfg.h +++ b/modules/trusted-firmware-m/tfm_boards/board/device_cfg.h @@ -14,7 +14,8 @@ #include -#if defined(NRF54L15_XXAA) || defined(NRF54L10_XXAA) || defined(NRF54LV10A_ENGA_XXAA) +#if defined(NRF54L15_XXAA) || defined(NRF54L10_XXAA) || \ + defined(NRF54LV10A_ENGA_XXAA) || defined(NRF54LM20A_ENGA_XXAA) #if defined(CONFIG_TFM_SECURE_UART00) && DOMAIN_NS != 1U #define TFM_UART uart00 diff --git a/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/CMakeLists.txt b/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/CMakeLists.txt new file mode 100644 index 000000000000..5c287a27962d --- /dev/null +++ b/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/CMakeLists.txt @@ -0,0 +1,44 @@ +# +# Copyright (c) 2025, Nordic Semiconductor ASA. +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +set(NRF_BOARD_SELECTED True) + +add_subdirectory(${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/common/nrf54lm20a + nrf54lm20a) + +add_subdirectory(.. tfm_board) + +target_include_directories(platform_s + PUBLIC + ${ZEPHYR_NRF_MODULE_DIR}/subsys/nrf_security/src/drivers/cracen/cracenpsa/include + ) + +target_sources(platform_s + PRIVATE + ${ZEPHYR_BASE}/soc/nordic/nrf54l/soc.c + ) + +target_include_directories(platform_s + PRIVATE + ${ZEPHYR_BASE}/modules/cmsis/ + ${ZEPHYR_BASE}/soc/nordic/nrf54l + ${ZEPHYR_BASE}/soc/nordic/common + ) + +install(FILES ${CMAKE_CURRENT_LIST_DIR}/ns/cpuarch_ns.cmake + DESTINATION ${INSTALL_PLATFORM_NS_DIR} + RENAME cpuarch.cmake) + +install(FILES config.cmake + DESTINATION ${INSTALL_PLATFORM_NS_DIR}) + +install(FILES ../common/config.cmake + DESTINATION ${INSTALL_PLATFORM_NS_DIR}/../common/) + +install(DIRECTORY + ${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/nrf54lm20dk_nrf54lm20a_cpuapp/tests + DESTINATION ${INSTALL_PLATFORM_NS_DIR} +) diff --git a/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/config.cmake b/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/config.cmake new file mode 100644 index 000000000000..1f13dcf67ae8 --- /dev/null +++ b/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/config.cmake @@ -0,0 +1,23 @@ +#------------------------------------------------------------------------------- +# Copyright (c) 2025, Nordic Semiconductor ASA. +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +#------------------------------------------------------------------------------- + +include(${CMAKE_CURRENT_LIST_DIR}/../common/config.cmake) + +set(NRF_SOC_VARIANT nrf54lm20a CACHE STRING "nRF SoC Variant") + +include(${PLATFORM_PATH}/common/${NRF_SOC_VARIANT}/config.cmake) + +# Override PS_CRYPTO_KDF_ALG +set(PS_CRYPTO_KDF_ALG PSA_ALG_SP800_108_COUNTER_CMAC CACHE STRING "KDF Algorithm to use") + +# attest_hal.c includes bl_storage.h, which needs CONFIG_NRFX_RRAMC to be defined. +# This is because bl_storage is a lib intended to be run from either the bootloader (Zephyr) or from TF-M. +# This is independent from the NS image's CONFIG_NRFX_RRAMC, which must be disabled, so we can not inherit +# this from app Kconfig. +if(TFM_PARTITION_INITIAL_ATTESTATION) + add_compile_definitions(CONFIG_NRFX_RRAMC) +endif() diff --git a/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/cpuarch.cmake b/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/cpuarch.cmake new file mode 100644 index 000000000000..032ac303b2c9 --- /dev/null +++ b/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/cpuarch.cmake @@ -0,0 +1,10 @@ +# +# Copyright (c) 2025, Nordic Semiconductor ASA. +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +set(PLATFORM_PATH platform/ext/target/nordic_nrf) + +include(${PLATFORM_PATH}/common/nrf54lm20a/cpuarch.cmake) +add_compile_definitions(__NRF_TFM__) diff --git a/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/ns/cpuarch_ns.cmake b/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/ns/cpuarch_ns.cmake new file mode 100644 index 000000000000..ba8f09c37b54 --- /dev/null +++ b/modules/trusted-firmware-m/tfm_boards/nrf54lm20a_cpuapp/ns/cpuarch_ns.cmake @@ -0,0 +1,10 @@ +# +# Copyright (c) 2025, Nordic Semiconductor ASA. +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +set(PLATFORM_DIR ${CMAKE_CURRENT_LIST_DIR}) +set(PLATFORM_PATH ${CMAKE_CURRENT_LIST_DIR}) + +include(${CMAKE_CURRENT_LIST_DIR}/common/nrf54lm20a/cpuarch.cmake) diff --git a/samples/crypto/aes_ccm/sample.yaml b/samples/crypto/aes_ccm/sample.yaml index fc6bf23731c0..c8dd2ce8f8ba 100644 --- a/samples/crypto/aes_ccm/sample.yaml +++ b/samples/crypto/aes_ccm/sample.yaml @@ -52,6 +52,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -68,5 +69,6 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns diff --git a/samples/crypto/aes_gcm/sample.yaml b/samples/crypto/aes_gcm/sample.yaml index 299fb66b2528..2d2a37788b30 100644 --- a/samples/crypto/aes_gcm/sample.yaml +++ b/samples/crypto/aes_gcm/sample.yaml @@ -73,6 +73,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -89,6 +90,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns sample.aes_gcm.cracen.crypto_service: diff --git a/samples/crypto/chachapoly/sample.yaml b/samples/crypto/chachapoly/sample.yaml index 0e758fcaec8b..5078ac7729eb 100644 --- a/samples/crypto/chachapoly/sample.yaml +++ b/samples/crypto/chachapoly/sample.yaml @@ -53,6 +53,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -69,5 +70,6 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns diff --git a/samples/crypto/ecdh/sample.yaml b/samples/crypto/ecdh/sample.yaml index 34638e017c5b..41dc3ebcd2c5 100644 --- a/samples/crypto/ecdh/sample.yaml +++ b/samples/crypto/ecdh/sample.yaml @@ -53,6 +53,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -69,6 +70,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns sample.ecdh.cracen.crypto_service: diff --git a/samples/crypto/ecdsa/sample.yaml b/samples/crypto/ecdsa/sample.yaml index 36fadbff3738..78fa6a33de22 100644 --- a/samples/crypto/ecdsa/sample.yaml +++ b/samples/crypto/ecdsa/sample.yaml @@ -69,6 +69,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -85,6 +86,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns sample.ecdsa.cracen.crypto_service: diff --git a/samples/crypto/ecjpake/sample.yaml b/samples/crypto/ecjpake/sample.yaml index 8fd180be12e6..806045f27a27 100644 --- a/samples/crypto/ecjpake/sample.yaml +++ b/samples/crypto/ecjpake/sample.yaml @@ -52,6 +52,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -68,5 +69,6 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns diff --git a/samples/crypto/eddsa/sample.yaml b/samples/crypto/eddsa/sample.yaml index e80093147905..55d80cde5b75 100644 --- a/samples/crypto/eddsa/sample.yaml +++ b/samples/crypto/eddsa/sample.yaml @@ -69,6 +69,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -85,6 +86,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns sample.eddsa.cracen.crypto_service: diff --git a/samples/crypto/hkdf/sample.yaml b/samples/crypto/hkdf/sample.yaml index 8a49d7bf960a..691fda540d12 100644 --- a/samples/crypto/hkdf/sample.yaml +++ b/samples/crypto/hkdf/sample.yaml @@ -51,6 +51,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -67,5 +68,6 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns diff --git a/samples/crypto/hmac/sample.yaml b/samples/crypto/hmac/sample.yaml index 589bd352111d..8b553d80f4cb 100644 --- a/samples/crypto/hmac/sample.yaml +++ b/samples/crypto/hmac/sample.yaml @@ -53,6 +53,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -69,5 +70,6 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns diff --git a/samples/crypto/pbkdf2/sample.yaml b/samples/crypto/pbkdf2/sample.yaml index 5096a924b467..b3feba07955e 100644 --- a/samples/crypto/pbkdf2/sample.yaml +++ b/samples/crypto/pbkdf2/sample.yaml @@ -51,6 +51,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -67,5 +68,6 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns diff --git a/samples/crypto/persistent_key_usage/boards/nrf54lm20dk_nrf54lm20_cpuapp_ns.conf b/samples/crypto/persistent_key_usage/boards/nrf54lm20dk_nrf54lm20_cpuapp_ns.conf new file mode 100644 index 000000000000..aa584f4f36bc --- /dev/null +++ b/samples/crypto/persistent_key_usage/boards/nrf54lm20dk_nrf54lm20_cpuapp_ns.conf @@ -0,0 +1,6 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# LM20 does not support multipart AES operations so it cannot use +# encrypted ITS until a workaround is implemented +CONFIG_TFM_ITS_ENCRYPTED=n diff --git a/samples/crypto/persistent_key_usage/sample.yaml b/samples/crypto/persistent_key_usage/sample.yaml index 7be9f7408280..6ef1031043ee 100644 --- a/samples/crypto/persistent_key_usage/sample.yaml +++ b/samples/crypto/persistent_key_usage/sample.yaml @@ -25,6 +25,7 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp/ns + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns @@ -32,6 +33,7 @@ tests: integration_platforms: - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l15/cpuapp/ns + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf9151dk/nrf9151/ns @@ -68,11 +70,9 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp - - nrf54lm20dk/nrf54lm20a/cpuapp - nrf54l15dk/nrf54l10/cpuapp - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - - nrf54lv10dk/nrf54lv10a/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp diff --git a/samples/crypto/psa_tls/sample.yaml b/samples/crypto/psa_tls/sample.yaml index d416851efa7b..627681e1997d 100644 --- a/samples/crypto/psa_tls/sample.yaml +++ b/samples/crypto/psa_tls/sample.yaml @@ -193,7 +193,9 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp + - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp - nrf54l15dk/nrf54l10/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp @@ -202,6 +204,9 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns + - nrf54lv10dk/nrf54lv10a/cpuapp + - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp - nrf54l15dk/nrf54l10/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp @@ -219,6 +224,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -229,6 +235,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -249,6 +256,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -259,6 +267,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -278,6 +287,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -288,6 +298,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -307,6 +318,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -316,6 +328,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -335,6 +348,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -344,6 +358,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -364,6 +379,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -373,6 +389,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -392,6 +409,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -401,6 +419,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -419,6 +438,8 @@ tests: platform_allow: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns + - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -428,6 +449,8 @@ tests: integration_platforms: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns + - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -446,6 +469,8 @@ tests: platform_allow: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns + - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -455,6 +480,8 @@ tests: integration_platforms: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns + - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -477,6 +504,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -485,6 +513,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -502,6 +531,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp @@ -510,6 +540,7 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54l15dk/nrf54l10/cpuapp diff --git a/samples/crypto/rng/sample.yaml b/samples/crypto/rng/sample.yaml index 7e8064144ab1..61bfbc31f1a4 100644 --- a/samples/crypto/rng/sample.yaml +++ b/samples/crypto/rng/sample.yaml @@ -51,6 +51,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -67,6 +68,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns sample.rng.cracen.crypto_service: diff --git a/samples/crypto/rsa/sample.yaml b/samples/crypto/rsa/sample.yaml index 616d8dd6c39b..04859016a18d 100644 --- a/samples/crypto/rsa/sample.yaml +++ b/samples/crypto/rsa/sample.yaml @@ -52,6 +52,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -68,5 +69,6 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns diff --git a/samples/crypto/sha256/sample.yaml b/samples/crypto/sha256/sample.yaml index cf28024eccf1..5d3b6ccc338e 100644 --- a/samples/crypto/sha256/sample.yaml +++ b/samples/crypto/sha256/sample.yaml @@ -73,6 +73,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -89,6 +90,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns # Build integration regression protection. diff --git a/samples/crypto/spake2p/sample.yaml b/samples/crypto/spake2p/sample.yaml index 5c11f0803b1e..15dc69e28e41 100644 --- a/samples/crypto/spake2p/sample.yaml +++ b/samples/crypto/spake2p/sample.yaml @@ -51,6 +51,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp @@ -67,5 +68,6 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54ls05dk/nrf54ls05b/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp - nrf54lv10dk/nrf54lv10a/cpuapp/ns diff --git a/samples/tfm/tfm_hello_world/sample.yaml b/samples/tfm/tfm_hello_world/sample.yaml index 251e8c2a89c7..42b7e4e7912e 100644 --- a/samples/tfm/tfm_hello_world/sample.yaml +++ b/samples/tfm/tfm_hello_world/sample.yaml @@ -30,9 +30,11 @@ tests: platform_allow: - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp/ns + - nrf54lm20dk/nrf54lm20a/cpuapp/ns integration_platforms: - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54lv10dk/nrf54lv10a/cpuapp/ns + - nrf54lm20dk/nrf54lm20a/cpuapp/ns sample.tfm.hello_world.bootloaders: sysbuild: true tags: diff --git a/samples/tfm/tfm_secure_peripheral/boards/nrf54lm20dk_nrf54lm20a_cpuapp_ns.conf b/samples/tfm/tfm_secure_peripheral/boards/nrf54lm20dk_nrf54lm20a_cpuapp_ns.conf new file mode 100644 index 000000000000..9f21720c9628 --- /dev/null +++ b/samples/tfm/tfm_secure_peripheral/boards/nrf54lm20dk_nrf54lm20a_cpuapp_ns.conf @@ -0,0 +1,13 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# P1: 11 (SPIM21_MOSI), 12 (SPIM21_SCK), 26 (button0) +CONFIG_NRF_GPIO1_PIN_MASK_SECURE=0x04001800 + +CONFIG_NRF_TIMER10_SECURE=y +CONFIG_NRF_SPIM21_SECURE=y +CONFIG_NRF_GPIOTE20_SECURE=y +CONFIG_NRF_GPIOTE20_SECURE_CHANNELS_MASK=0x2 diff --git a/samples/tfm/tfm_secure_peripheral/boards/nrf54lv10dk_nrf54lv10a_cpuapp_ns.conf b/samples/tfm/tfm_secure_peripheral/boards/nrf54lv10dk_nrf54lv10a_cpuapp_ns.conf index d9204bb002ac..5ca4405c431c 100644 --- a/samples/tfm/tfm_secure_peripheral/boards/nrf54lv10dk_nrf54lv10a_cpuapp_ns.conf +++ b/samples/tfm/tfm_secure_peripheral/boards/nrf54lv10dk_nrf54lv10a_cpuapp_ns.conf @@ -5,7 +5,7 @@ # # P1: 5 (SPIM_MOSI), 6 (SPIM_SCK) 15 (button0) -CONFIG_NRF_GPIO1_PIN_MASK_SECURE=0x00002060 +CONFIG_NRF_GPIO1_PIN_MASK_SECURE=0x00008060 CONFIG_NRF_TIMER10_SECURE=y CONFIG_NRF_SPIM21_SECURE=y diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index c59d4e622606..b929b1252d82 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -237,7 +237,11 @@ - scenarios: - kernel.common.misra platforms: + - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l10/cpuapp + - nrf54l15dk/nrf54l05/cpuapp - nrf54lm20dk/nrf54lm20a/cpuapp + - nrf54lv10dk/nrf54lv10a/cpuapp comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35491" - scenarios: diff --git a/subsys/bootloader/Kconfig b/subsys/bootloader/Kconfig index d3aa04d5cef3..6c119b9668ff 100644 --- a/subsys/bootloader/Kconfig +++ b/subsys/bootloader/Kconfig @@ -59,11 +59,15 @@ config PM_PARTITION_SIZE_PROVISION hex default 0x280 if SOC_SERIES_NRF91X || SOC_NRF5340_CPUAPP # Stored in OTP region # Monotonic counter slot takes 4 bytes on nRF54L Series - default 0x460 if SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || SOC_NRF54LV10A_ENGA_CPUAPP + default 0x460 if SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || \ + SOC_NRF54LV10A_ENGA_CPUAPP || SOC_NRF54LM20A_ENGA_CPUAPP default 0x280 if SOC_NRF5340_CPUNET # Second instance stored in internal flash of NET default FPROTECT_BLOCK_SIZE - prompt "Flash space reserved for PROVISION" if !(SOC_NRF9160 || SOC_NRF5340_CPUAPP || SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || SOC_NRF54LV10A_ENGA_CPUAPP) - help + prompt "Flash space reserved for PROVISION" if !(SOC_NRF9160 || SOC_NRF5340_CPUAPP || \ + SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || \ + SOC_NRF54L10_CPUAPP || SOC_NRF54LV10A_ENGA_CPUAPP || \ + SOC_NRF54LM20A_ENGA_CPUAPP) +help Flash space set aside for the PROVISION partition. config B0_MIN_PARTITION_SIZE @@ -75,7 +79,8 @@ config PM_PARTITION_SIZE_B0_IMAGE default 0x7800 if !B0_MIN_PARTITION_SIZE && (SOC_NRF5340_CPUNET) default FPROTECT_BLOCK_SIZE if SOC_SERIES_NRF91X || SOC_NRF5340_CPUAPP default 0x3800 if SOC_NRF5340_CPUNET - default 0x7800 if SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || SOC_NRF54LV10A_ENGA_CPUAPP + default 0x7800 if SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || \ + SOC_NRF54LV10A_ENGA_CPUAPP || SOC_NRF54LM20A_ENGA_CPUAPP default 0x7000 if !B0_MIN_PARTITION_SIZE default 0x4000 help @@ -114,7 +119,8 @@ config SB_INFINITE_LOOP_AFTER_RAM_CLEANUP config SB_DISABLE_SELF_RWX bool "Disable read and execution on self NVM" - depends on (SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || SOC_NRF54LV10A_ENGA_CPUAPP) && !FPROTECT_ALLOW_COMBINED_REGIONS + depends on (SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || \ + SOC_NRF54LV10A_ENGA_CPUAPP || SOC_NRF54LM20A_ENGA_CPUAPP) && !FPROTECT_ALLOW_COMBINED_REGIONS help Sets RRAMC's BOOTCONF region protection before jumping to application. It disables reads writes and execution memory area which holds NSIB. diff --git a/subsys/partition_manager/CMakeLists.txt b/subsys/partition_manager/CMakeLists.txt index fd7af749e5d9..fb844eb13bde 100644 --- a/subsys/partition_manager/CMakeLists.txt +++ b/subsys/partition_manager/CMakeLists.txt @@ -77,7 +77,8 @@ if (CONFIG_NRF_MODEM_LIB) ncs_add_partition_manager_config(pm.yml.libmodem) endif() -if(CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L05_CPUAPP OR CONFIG_SOC_NRF54L10_CPUAPP) +if(CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L05_CPUAPP OR + CONFIG_SOC_NRF54L10_CPUAPP OR CONFIG_SOC_NRF54LM20A_ENGA_CPUAPP) ncs_add_partition_manager_config(pm.yml.bootconf) endif() diff --git a/subsys/partition_manager/pm.yml.nvs b/subsys/partition_manager/pm.yml.nvs index 40ffb0bed496..8c8c2b8be0f6 100644 --- a/subsys/partition_manager/pm.yml.nvs +++ b/subsys/partition_manager/pm.yml.nvs @@ -1,9 +1,9 @@ #include -# In nRF54L15 we place the TF-M non-secure storage partitions after the +# In nRF54L series devices we place the TF-M non-secure storage partitions after the # TF-M non-secure application to avoid splitting the secure/non-secure # partitions more than necessary. -#if defined(CONFIG_SOC_NRF54L15_CPUAPP) +#if defined(CONFIG_SOC_NRF54L_CPUAPP_COMMON) nvs_storage: placement: after: [app] diff --git a/subsys/partition_manager/pm.yml.settings b/subsys/partition_manager/pm.yml.settings index ae27abe99a10..f1f861d8e1e9 100644 --- a/subsys/partition_manager/pm.yml.settings +++ b/subsys/partition_manager/pm.yml.settings @@ -3,7 +3,8 @@ # In nRF54L15 we place the TF-M non-secure storage partitions after the # TF-M non-secure application to avoid splitting the secure/non-secure # partitions more than necessary. -#if defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54LV10A_ENGA_CPUAPP) +#if defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54LV10A_ENGA_CPUAPP) || \ + defined(CONFIG_SOC_NRF54LM20A_ENGA_CPUAPP) settings_storage: placement: after: [app] diff --git a/subsys/partition_manager/pm.yml.tfm b/subsys/partition_manager/pm.yml.tfm index 00d76af85adb..0d4b914008c7 100644 --- a/subsys/partition_manager/pm.yml.tfm +++ b/subsys/partition_manager/pm.yml.tfm @@ -26,7 +26,8 @@ tfm_storage: # In nRF54L15 we place the tfm_storage partitions before the # TF-M non-secure application to avoid splitting the secure/non-secure # partitions more than necessary. -#if defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54LV10A_ENGA_CPUAPP) +#if defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54LV10A_ENGA_CPUAPP) || \ + defined(CONFIG_SOC_NRF54LM20A_ENGA_CPUAPP) tfm_ps: placement: diff --git a/subsys/partition_manager/pm.yml.zms b/subsys/partition_manager/pm.yml.zms index b0c0db2afa9d..336e609472be 100644 --- a/subsys/partition_manager/pm.yml.zms +++ b/subsys/partition_manager/pm.yml.zms @@ -3,7 +3,7 @@ # In nRF54L15 we place the TF-M non-secure storage partitions after the # TF-M non-secure application to avoid splitting the secure/non-secure # partitions more than necessary. -#if defined(CONFIG_SOC_NRF54L15_CPUAPP) +#if defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54LM20A_ENGA_CPUAPP) zms_storage: placement: after: [app] diff --git a/west.yml b/west.yml index 86c098abdc9c..65b6774d0032 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 5696f6b423a54390721955d6e0e63c363e02cfff + revision: pull/3260/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -149,7 +149,7 @@ manifest: - name: trusted-firmware-m repo-path: sdk-trusted-firmware-m path: modules/tee/tf-m/trusted-firmware-m - revision: 2c9f9c6e20468ef9dcd433986adea2d3fc036b9d + revision: pull/208/head - name: psa-arch-tests repo-path: sdk-psa-arch-tests path: modules/tee/tf-m/psa-arch-tests