From 66e936466b79113ee3f54522334d3ca3b94bbb11 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Tue, 19 Aug 2025 14:31:03 +0200 Subject: [PATCH 1/7] modules: tf-m: Change default profile for most use cases Change the default profile for TF-M for all devices which use the bluetooth crypto, bluetooth mesh crypto and openthread. Instead of the minimal profile of TF-M which doesn't provide crypto operations apart from rng use the PROFILE_TYPE_NOT_SET which allows crypto operations based on the enabled PSA_WANTs. This is preparation work, the profile will be PROFILE_TYPE_NOT_SET for all devices and use cases in the future. Signed-off-by: Georgios Vasilakis --- modules/trusted-firmware-m/Kconfig.tfm.defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/trusted-firmware-m/Kconfig.tfm.defconfig b/modules/trusted-firmware-m/Kconfig.tfm.defconfig index 319952f62e1..76b9acf2662 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm.defconfig +++ b/modules/trusted-firmware-m/Kconfig.tfm.defconfig @@ -42,7 +42,7 @@ config TFM_LOG_LEVEL_SILENCE $(dt_nodelabel_has_prop,uart30,pinctrl-names) choice TFM_PROFILE_TYPE - default TFM_PROFILE_TYPE_NOT_SET if SOC_SERIES_NRF54LX + default TFM_PROFILE_TYPE_NOT_SET if SOC_SERIES_NRF54LX || BT_CRYPTO || BT_MESH_USES_TFM_PSA || OPENTHREAD default TFM_PROFILE_TYPE_MINIMAL endchoice From 72dffd935f9a6ed606269a90948eef19ceb4953b Mon Sep 17 00:00:00 2001 From: Nordic Builder Date: Tue, 19 Aug 2025 12:58:19 +0000 Subject: [PATCH 2/7] manifest: Update sdk-zephyr revision (auto-manifest PR) Automatically created by Github Action Signed-off-by: Nordic Builder --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index dc650e892a7..f11f3cf815c 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: 20d89eb11a79ec9ca6ee80372af2a725028765ac + revision: dc15a79bfeb842bfb503fd63017e8cb371050ddf import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From f0ed629ec9f59be190cce9ebc0d2b4334d8a3e72 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Tue, 19 Aug 2025 14:52:49 +0200 Subject: [PATCH 3/7] bluetooth: Remove TF-M profile from bluetooth Remove the choice of the TF-M profile in bluetoooth subsystem since this is now handled by the TF-M Kconfig configurations. Signed-off-by: Georgios Vasilakis --- subsys/bluetooth/mesh/Kconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig index 9384415df6d..201704fef5d 100644 --- a/subsys/bluetooth/mesh/Kconfig +++ b/subsys/bluetooth/mesh/Kconfig @@ -210,11 +210,6 @@ config BT_MESH_KEY_IMPORTER_PRIO The key importer is initialized before the main application. It is initialized using system initialization macro with application level. -choice TFM_PROFILE_TYPE - depends on BT_MESH_USES_TFM_PSA - default TFM_PROFILE_TYPE_NOT_SET -endchoice - rsource "Kconfig.models" rsource "Kconfig.dk_prov" rsource "shell/Kconfig" From ca2ec3a5d9dc6b44e8fc27f3a9ef7db970613b6d Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Fri, 29 Aug 2025 09:40:05 +0200 Subject: [PATCH 4/7] openthread: Remove TF-M profile from openthread Remove the choice of the TF-M profile in openthread subsystem since this is now handled by the TF-M Kconfig configurations. Signed-off-by: Georgios Vasilakis --- subsys/net/openthread/Kconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/subsys/net/openthread/Kconfig b/subsys/net/openthread/Kconfig index 9b4581866c0..78083713467 100644 --- a/subsys/net/openthread/Kconfig +++ b/subsys/net/openthread/Kconfig @@ -139,10 +139,6 @@ config OPENTHREAD_COPROCESSOR_UART_RING_BUFFER_SIZE endif # OPENTHREAD_COPROCESSOR_RCP -choice TFM_PROFILE_TYPE - default TFM_PROFILE_TYPE_NOT_SET -endchoice - endmenu # "OpenThread" endif # OPENTHREAD From bd3dc1f94c0d48b2aa0dead466b16ac8a729dc21 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Wed, 20 Aug 2025 13:04:32 +0200 Subject: [PATCH 5/7] samples: bluetooth: Remove thingy53/ns from some samples Remove the thingy53 non secure target from several bluetooth samples which enable BT_CRYPTO. Recently the configuration of TF-M was updated to take into account the BT_CRYPTO symbol. Meaning that when the BT_CRYPTO is enabled TF-M configuration makes sure to provide support for the BT_CRYPTO requirements. This was not happening before resulting to invalid configurations where the samples failed at runtime. The thingy 53 non secure target has a flash overflow when trying to build these samples with a valid TF-M configuration and thus I removed them from the yaml files. Signed-off-by: Georgios Vasilakis --- samples/bluetooth/peripheral_lbs/sample.yaml | 2 -- samples/bluetooth/peripheral_status/sample.yaml | 2 -- samples/bluetooth/peripheral_uart/sample.yaml | 2 -- 3 files changed, 6 deletions(-) diff --git a/samples/bluetooth/peripheral_lbs/sample.yaml b/samples/bluetooth/peripheral_lbs/sample.yaml index 6a825e6383f..29e6dc1099a 100644 --- a/samples/bluetooth/peripheral_lbs/sample.yaml +++ b/samples/bluetooth/peripheral_lbs/sample.yaml @@ -10,7 +10,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l05/cpuapp - nrf54l15dk/nrf54l10/cpuapp - nrf54l15dk/nrf54l15/cpuapp @@ -24,7 +23,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l05/cpuapp - nrf54l15dk/nrf54l10/cpuapp - nrf54l15dk/nrf54l15/cpuapp diff --git a/samples/bluetooth/peripheral_status/sample.yaml b/samples/bluetooth/peripheral_status/sample.yaml index dcc97754cf9..c7dbb3b9963 100644 --- a/samples/bluetooth/peripheral_status/sample.yaml +++ b/samples/bluetooth/peripheral_status/sample.yaml @@ -24,7 +24,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l05/cpuapp - nrf54l15dk/nrf54l10/cpuapp - nrf54l15dk/nrf54l15/cpuapp @@ -37,7 +36,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l05/cpuapp - nrf54l15dk/nrf54l10/cpuapp - nrf54l15dk/nrf54l15/cpuapp diff --git a/samples/bluetooth/peripheral_uart/sample.yaml b/samples/bluetooth/peripheral_uart/sample.yaml index ae868f81ae6..0a6eab0b210 100644 --- a/samples/bluetooth/peripheral_uart/sample.yaml +++ b/samples/bluetooth/peripheral_uart/sample.yaml @@ -11,7 +11,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns - nrf21540dk/nrf52840 - nrf54l15dk/nrf54l05/cpuapp - nrf54l15dk/nrf54l10/cpuapp @@ -28,7 +27,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns - nrf21540dk/nrf52840 - nrf54l15dk/nrf54l05/cpuapp - nrf54l15dk/nrf54l10/cpuapp From 2e250ed365f41bc3ab039ad8cdc5a476280b91c1 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Wed, 20 Aug 2025 15:22:18 +0200 Subject: [PATCH 6/7] applications: machinelearning: Remove thingy 53 non secure target Remove the thingy53 non secure target from the machine learning application since it enables BT_CRYPTO. Recently the configuration of TF-M was updated to take into account the BT_CRYPTO symbol. Meaning that when the BT_CRYPTO is enabled TF-M configuration makes sure to provide support for the BT_CRYPTO requirements. This was not happening before resulting to invalid configurations where the samples failed at runtime. The thingy 53 non secure target has a flash overflow when trying to build this application with a valid TF-M configuration and thus I removed it from the yaml file. Signed-off-by: Georgios Vasilakis --- applications/machine_learning/sample.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/applications/machine_learning/sample.yaml b/applications/machine_learning/sample.yaml index 591f8665b4c..4545dc28d3b 100644 --- a/applications/machine_learning/sample.yaml +++ b/applications/machine_learning/sample.yaml @@ -8,13 +8,11 @@ tests: platform_allow: - nrf52840dk/nrf52840 - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns - nrf5340dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns - nrf5340dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp tags: @@ -38,10 +36,8 @@ tests: build_only: true platform_allow: - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns integration_platforms: - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns tags: - ci_build - sysbuild @@ -53,11 +49,9 @@ tests: platform_allow: - nrf52840dk/nrf52840 - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns integration_platforms: - nrf52840dk/nrf52840 - thingy53/nrf5340/cpuapp - - thingy53/nrf5340/cpuapp/ns tags: - ci_build - sysbuild From d5540857c408bd5c4c88063edec3d50e63b2ad5d Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Thu, 28 Aug 2025 14:58:14 +0200 Subject: [PATCH 7/7] doc: Add removal of thingy53 ns targets in changelog The thingy53 non-secure targets are no longer supported in the machine learning application and in the bluetooth peripheral status/uart/lbs samples. Signed-off-by: Georgios Vasilakis --- .../releases/release-notes-changelog.rst | 8 ++++++++ 1 file changed, 8 insertions(+) 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 89785e63dd0..a11a00848cc 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -236,6 +236,8 @@ nRF Machine Learning (Edge Impulse) * Updated the application to change the default libc from the :ref:`zephyr:c_library_newlib` to the :ref:`zephyr:c_library_picolibc` to align with the |NCS| and Zephyr. +* Removed support for the ``thingy53/nrf5340/cpuapp/ns`` build target. + Serial LTE modem ---------------- @@ -272,6 +274,12 @@ Bluetooth samples The :ref:`ipc_radio` application is commonly used for multicore builds in other |NCS| samples and projects. Hence, this is to align with the common practice. +* Removed support for the ``thingy53/nrf5340/cpuapp/ns`` build target from the following samples: + + * :ref:`peripheral_lbs` + * :ref:`peripheral_status` + * :ref:`peripheral_status` + Bluetooth Mesh samples ----------------------