diff --git a/applications/machine_learning/sample.yaml b/applications/machine_learning/sample.yaml index 591f8665b4c8..4545dc28d3bc 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 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 89785e63dd0c..a11a00848cc7 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 ---------------------- diff --git a/modules/trusted-firmware-m/Kconfig.tfm.defconfig b/modules/trusted-firmware-m/Kconfig.tfm.defconfig index 319952f62e1c..76b9acf2662a 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 diff --git a/samples/bluetooth/peripheral_lbs/sample.yaml b/samples/bluetooth/peripheral_lbs/sample.yaml index 6a825e6383ff..29e6dc1099a4 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 dcc97754cf9f..c7dbb3b99633 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 ae868f81ae6e..0a6eab0b210f 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 diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig index 9384415df6d7..201704fef5da 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" diff --git a/subsys/net/openthread/Kconfig b/subsys/net/openthread/Kconfig index 9b4581866c02..780837134671 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 diff --git a/west.yml b/west.yml index dc650e892a7e..f11f3cf815c4 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