Skip to content
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.

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

samples: openthread: remove support for nrf5340 TF-M #18992

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion doc/nrf/protocols/matter/overview/integration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
1 change: 0 additions & 1 deletion doc/nrf/protocols/thread/configuring.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`_.
4 changes: 2 additions & 2 deletions doc/nrf/protocols/thread/overview/architectures.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------------
Expand Down
14 changes: 0 additions & 14 deletions samples/openthread/cli/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -80,15 +74,13 @@ tests:
nrf52840dk/nrf52840
nrf21540dk/nrf52840
nrf5340dk/nrf5340/cpuapp
nrf5340dk/nrf5340/cpuapp/ns
extra_args: >
cli_SNIPPET="ci;logging;multiprotocol;tcp;usb"
FILE_SUFFIX=ble
integration_platforms:
- nrf52840dk/nrf52840
- nrf21540dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf5340dk/nrf5340/cpuapp/ns
sample.openthread.cli.low_power:
sysbuild: true
build_only: true
Expand All @@ -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
Expand All @@ -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: >
Expand All @@ -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:
Expand All @@ -143,14 +131,12 @@ tests:
platform_allow: >
nrf52840dk/nrf52840
nrf5340dk/nrf5340/cpuapp
nrf5340dk/nrf5340/cpuapp/ns
nrf54l15dk/nrf54l15/cpuapp
nrf54l15dk/nrf54l15/cpuapp/ns
extra_args: >
cli_SNIPPET=diag_gpio
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf5340dk/nrf5340/cpuapp/ns
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l15dk/nrf54l15/cpuapp/ns
8 changes: 1 addition & 7 deletions samples/openthread/coap_client/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
====================================

Expand Down Expand Up @@ -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
=======
Expand Down Expand Up @@ -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 <ug_tfm>`
8 changes: 0 additions & 8 deletions samples/openthread/coap_client/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -57,12 +51,10 @@ 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
integration_platforms:
- nrf52840dk/nrf52840
- nrf21540dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf5340dk/nrf5340/cpuapp/ns
8 changes: 1 addition & 7 deletions samples/openthread/coap_server/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
********

Expand Down Expand Up @@ -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
=======
Expand Down Expand Up @@ -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 <ug_tfm>`
4 changes: 0 additions & 4 deletions samples/openthread/coap_server/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Loading