Skip to content

Change default TF-M profile for bluetooth/openthread/mesh #24059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 29, 2025
Merged

Change default TF-M profile for bluetooth/openthread/mesh #24059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
66e9364
modules: tf-m: Change default profile for most use cases
Vge0rge Aug 19, 2025
72dffd9
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Aug 19, 2025
f0ed629
bluetooth: Remove TF-M profile from bluetooth
Vge0rge Aug 19, 2025
ca2ec3a
openthread: Remove TF-M profile from openthread
Vge0rge Aug 29, 2025
bd3dc1f
samples: bluetooth: Remove thingy53/ns from some samples
Vge0rge Aug 20, 2025
2e250ed
applications: machinelearning: Remove thingy 53 non secure target
Vge0rge Aug 20, 2025
d554085
doc: Add removal of thingy53 ns targets in changelog
Vge0rge Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions applications/machine_learning/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 8 additions & 0 deletions doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------------

Expand Down Expand Up @@ -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
----------------------

Expand Down
2 changes: 1 addition & 1 deletion modules/trusted-firmware-m/Kconfig.tfm.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions samples/bluetooth/peripheral_lbs/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions samples/bluetooth/peripheral_status/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions samples/bluetooth/peripheral_uart/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions subsys/bluetooth/mesh/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions subsys/net/openthread/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down