From 4f3660de5fb0b27efbfc32e906d578c4d992eaa0 Mon Sep 17 00:00:00 2001 From: Maciej Baczmanski Date: Wed, 20 Nov 2024 14:41:57 +0100 Subject: [PATCH] samples: openthread: remove support for nrf5340 TF-M Remove support for nRF5340 TF-M in Thread and Matter over Thread. Signed-off-by: Maciej Baczmanski --- doc/nrf/protocols/matter/overview/integration.rst | 2 +- doc/nrf/protocols/thread/configuring.rst | 1 - .../protocols/thread/overview/architectures.rst | 4 ++-- .../releases/release-notes-changelog.rst | 2 +- samples/openthread/cli/sample.yaml | 14 -------------- samples/openthread/coap_client/README.rst | 8 +------- samples/openthread/coap_client/sample.yaml | 8 -------- samples/openthread/coap_server/README.rst | 8 +------- samples/openthread/coap_server/sample.yaml | 4 ---- 9 files changed, 6 insertions(+), 45 deletions(-) diff --git a/doc/nrf/protocols/matter/overview/integration.rst b/doc/nrf/protocols/matter/overview/integration.rst index a29c7165298b..2336b11a65d7 100644 --- a/doc/nrf/protocols/matter/overview/integration.rst +++ b/doc/nrf/protocols/matter/overview/integration.rst @@ -56,7 +56,7 @@ This platform design is suitable for the following development kits: .. table-from-rows:: /includes/sample_board_rows.txt :header: heading - :rows: nrf52840dk_nrf52840, nrf5340dk_nrf5340_cpuapp_and_cpuapp_ns, nrf54l15dk_nrf54l15_cpuapp + :rows: nrf52840dk_nrf52840, nrf5340dk_nrf5340_cpuapp, nrf54l15dk_nrf54l15_cpuapp_and_cpuapp_ns The design differences between the supported SoCs are the following: diff --git a/doc/nrf/protocols/thread/configuring.rst b/doc/nrf/protocols/thread/configuring.rst index 251ed234339f..8ccc1f785c4f 100644 --- a/doc/nrf/protocols/thread/configuring.rst +++ b/doc/nrf/protocols/thread/configuring.rst @@ -283,7 +283,6 @@ Trusted Firmware-M support options To configure your Thread application to run with Trusted Firmware-M, use the following board target: -* ``nrf5340dk/nrf5340/cpuapp/ns`` for the nRF5340 DK * ``nrf54l15dk/nrf54l15/cpuapp/ns``` for the nRF54L15 DK For more Trusted Firmware-M documentation, see :ref:`ug_tfm` and the official `TF-M documentation`_. diff --git a/doc/nrf/protocols/thread/overview/architectures.rst b/doc/nrf/protocols/thread/overview/architectures.rst index b8a4ef0f8712..1c5162ed7dbf 100644 --- a/doc/nrf/protocols/thread/overview/architectures.rst +++ b/doc/nrf/protocols/thread/overview/architectures.rst @@ -74,7 +74,7 @@ This platform design is suitable for the following development kits: .. table-from-rows:: /includes/sample_board_rows.txt :header: heading - :rows: nrf52840dk_nrf52840, nrf5340dk_nrf5340_cpuapp_and_cpuapp_ns, nrf54l15dk_nrf54l15_cpuapp_and_cpuapp_ns, nrf21540dk_nrf52840 + :rows: nrf52840dk_nrf52840, nrf5340dk_nrf5340_cpuapp, nrf54l15dk_nrf54l15_cpuapp_and_cpuapp_ns, nrf21540dk_nrf52840 .. _thread_architectures_designs_soc_designs_multiprotocol: @@ -110,7 +110,7 @@ This platform design is suitable for the following development kits: .. table-from-rows:: /includes/sample_board_rows.txt :header: heading - :rows: nrf52840dk_nrf52840, nrf5340dk_nrf5340_cpuapp_and_cpuapp_ns, nrf54l15dk_nrf54l15_cpuapp_and_cpuapp_ns + :rows: nrf52840dk_nrf52840, nrf5340dk_nrf5340_cpuapp, nrf54l15dk_nrf54l15_cpuapp_and_cpuapp_ns .. _thread_architectures_designs_cp: 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 c0e06f6bc744..5821e4deed43 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -388,7 +388,7 @@ Trusted Firmware-M (TF-M) samples Thread samples -------------- -|no_changes_yet_note| +* Removed support for the ``nrf5340dk/nrf5340/cpuapp/ns`` build target for all samples. Zigbee samples -------------- diff --git a/samples/openthread/cli/sample.yaml b/samples/openthread/cli/sample.yaml index c023fee016c5..03e3a5832b33 100644 --- a/samples/openthread/cli/sample.yaml +++ b/samples/openthread/cli/sample.yaml @@ -12,7 +12,6 @@ tests: nrf52840dongle/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l15/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp @@ -21,7 +20,6 @@ tests: - nrf52840dongle/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp @@ -34,7 +32,6 @@ tests: nrf52840dongle/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l15/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp @@ -46,7 +43,6 @@ tests: - nrf52840dongle/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp @@ -58,7 +54,6 @@ tests: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l15/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp @@ -68,7 +63,6 @@ tests: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp @@ -80,7 +74,6 @@ tests: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns extra_args: > cli_SNIPPET="ci;logging;multiprotocol;tcp;usb" FILE_SUFFIX=ble @@ -88,7 +81,6 @@ tests: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns sample.openthread.cli.low_power: sysbuild: true build_only: true @@ -108,12 +100,10 @@ tests: tags: sysbuild ci_samples_openthread platform_allow: > nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp/ns extra_args: > cli_SNIPPET=ci CONFIG_NRF_SECURITY=y integration_platforms: - - nrf5340dk/nrf5340/cpuapp/ns - nrf52840dk/nrf52840 sample.openthread.cli.tcat: sysbuild: true @@ -123,7 +113,6 @@ tests: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l15/cpuapp/ns extra_args: > @@ -133,7 +122,6 @@ tests: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns sample.openthread.cli.diag_gpio: @@ -143,7 +131,6 @@ tests: platform_allow: > nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l15/cpuapp/ns extra_args: > @@ -151,6 +138,5 @@ tests: integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns diff --git a/samples/openthread/coap_client/README.rst b/samples/openthread/coap_client/README.rst index 097410e7f09b..3663c1d221ea 100644 --- a/samples/openthread/coap_client/README.rst +++ b/samples/openthread/coap_client/README.rst @@ -24,8 +24,6 @@ The sample supports the following development kits: You can use one or more of the development kits listed above as the Thread CoAP Client. You also need one or more compatible development kits programmed with the :ref:`coap_server_sample` sample. -.. include:: /includes/tfm.txt - Multiprotocol extension requirements ==================================== @@ -145,7 +143,7 @@ Building and running |enable_thread_before_testing| -.. include:: /includes/build_and_run_ns.txt +.. include:: /includes/build_and_run.txt Testing ======= @@ -278,7 +276,3 @@ The following dependencies are added by the optional multiprotocol Bluetooth LE * ``include/bluetooth/gatt.h`` * ``include/bluetooth/hci.h`` * ``include/bluetooth/uuid.h`` - -In addition, it uses the following secure firmware component: - -* :ref:`Trusted Firmware-M ` diff --git a/samples/openthread/coap_client/sample.yaml b/samples/openthread/coap_client/sample.yaml index 35cc51f6e87b..8c4dd00f6a6d 100644 --- a/samples/openthread/coap_client/sample.yaml +++ b/samples/openthread/coap_client/sample.yaml @@ -11,12 +11,10 @@ tests: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns sample.openthread.coap_client.ftd: sysbuild: true build_only: true @@ -25,14 +23,12 @@ tests: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns extra_args: > coap_client_SNIPPET="ci;logging" integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns sample.openthread.coap_client.mtd: sysbuild: true build_only: true @@ -41,14 +37,12 @@ tests: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns extra_args: > coap_client_SNIPPET="ci;logging;mtd" integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns sample.openthread.coap_client.mtd.multiprotocol_ble: sysbuild: true build_only: true @@ -57,7 +51,6 @@ tests: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns extra_args: > coap_client_SNIPPET="ci;logging;mtd;multiprotocol_ble" FILE_SUFFIX=ble @@ -65,4 +58,3 @@ tests: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns diff --git a/samples/openthread/coap_server/README.rst b/samples/openthread/coap_server/README.rst index 9938ecab002b..221ae5307275 100644 --- a/samples/openthread/coap_server/README.rst +++ b/samples/openthread/coap_server/README.rst @@ -22,8 +22,6 @@ The sample supports the following development kits: You can use one or more of these development kits as the Thread CoAP Server. You also need one or more compatible development kits programmed with the :ref:`coap_client_sample` sample. -.. include:: /includes/tfm.txt - Overview ******** @@ -85,7 +83,7 @@ Building and running |enable_thread_before_testing| -.. include:: /includes/build_and_run_ns.txt +.. include:: /includes/build_and_run.txt Testing ======= @@ -138,7 +136,3 @@ In addition, it uses the following Zephyr libraries: OpenThread CoAP API is used in this sample: * `OpenThread CoAP API`_ - -In addition, it uses the following secure firmware component: - -* :ref:`Trusted Firmware-M ` diff --git a/samples/openthread/coap_server/sample.yaml b/samples/openthread/coap_server/sample.yaml index 1a2f92bf1e89..94f1d56c69db 100644 --- a/samples/openthread/coap_server/sample.yaml +++ b/samples/openthread/coap_server/sample.yaml @@ -11,12 +11,10 @@ tests: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns sample.openthread.coap_server.ftd: sysbuild: true build_only: true @@ -25,11 +23,9 @@ tests: nrf52840dk/nrf52840 nrf21540dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns extra_args: > coap_server_SNIPPET="ci;logging" integration_platforms: - nrf52840dk/nrf52840 - nrf21540dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns