Skip to content

Commit ac5a4cc

Browse files
samples: matter: Remove support for nRF54H20
nRF54H20 is no longer supported in Matter samples. - Removed DTS and config files related to nRF54H20. - Removed SUIT manifests for Matter. - Removed nRF54H20 from documentation. - Removed nRF54H20 from sample.yaml. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
1 parent 25915a8 commit ac5a4cc

36 files changed

+18
-1439
lines changed

applications/matter_bridge/Kconfig.sysbuild

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ config NETCORE_IPC_RADIO_BT_HCI_IPC
1717

1818
#### Bootloader
1919
choice BOOTLOADER
20-
default BOOTLOADER_MCUBOOT if !SOC_SERIES_NRF54HX
20+
default BOOTLOADER_MCUBOOT
2121
endchoice
2222

2323
# Enable IEEE802.15.4 serialization to network core
2424
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
2525
config NETCORE_IPC_RADIO_IEEE802154
26-
default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX) && !WIFI_NRF70
26+
default y if SOC_SERIES_NRF53X && !WIFI_NRF70
2727

2828
if BOOTLOADER_MCUBOOT
2929

applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf

-27
This file was deleted.

applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

-10
This file was deleted.

applications/matter_bridge/doc/matter_bridge_description.rst

-50
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,6 @@ This feature provides an additional endpoint with an ID equal to 2, which repres
103103
This means that you can integrate the Matter bridge functionality into your end product, such as a smart plug, and avoid having to use a standalone bridge device.
104104
This is an optional feature and can be enabled by :ref:`Configuring the smart plug functionality <matter_bridge_smart_plug_functionality>`.
105105

106-
SUIT DFU on nRF54H20
107-
====================
108-
109-
.. include:: ../../../samples/matter/template/README.rst
110-
:start-after: matter_template_dfu_suit_start
111-
:end-before: matter_template_dfu_suit_end
112-
113106
.. _matter_bridge_app_bridged_support:
114107

115108
Bridged device support
@@ -573,34 +566,6 @@ The current maximum number of Bluetooth LE connections that can be selected usin
573566
You can still increase the number of connections by modifying the board files and decreasing the buffer sizes.
574567
The default number of connections is ``10``, which effectively means 9 bridged devices.
575568

576-
.. group-tab:: nRF54 DKs
577-
578-
The nRF54 Series supports the Matter bridge over Wi-Fi and Matter bridge over Thread configurations.
579-
580-
.. tabs::
581-
582-
.. group-tab:: Matter bridge over Wi-Fi
583-
584-
You can increase the number of Bluetooth LE connections if you decrease the size of the Bluetooth LE TX/RX buffers used by the Bluetooth controller, but this will decrease the communication throughput.
585-
586-
Build the target using the following command in the project directory to enable a configuration that increases the number of Bluetooth LE connections to ``20`` (which effectively means 19 bridged devices) by decreasing the sizes of Bluetooth LE TX/RX buffers:
587-
588-
.. parsed-literal::
589-
:class: highlight
590-
591-
west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf7002eb_interposer_p1 -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="overlay-bt_max_connections_app.conf" -Dipc_radio_EXTRA_CONF_FILE="overlay-bt_max_connections_net.conf"
592-
593-
.. group-tab:: Matter bridge over Thread
594-
595-
You can increase the number of Bluetooth LE connections if you decrease the size of the Bluetooth LE TX/RX buffers used by the Bluetooth controller, but this will decrease the communication throughput.
596-
597-
Build the target using the following command in the project directory to enable a configuration that increases the number of Bluetooth LE connections to ``20`` (which effectively means 19 bridged devices) by decreasing the sizes of Bluetooth LE TX/RX buffers:
598-
599-
.. parsed-literal::
600-
:class: highlight
601-
602-
west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="overlay-bt_max_connections_app.conf" -Dipc_radio_EXTRA_CONF_FILE="overlay-bt_max_connections_net.conf"
603-
604569
.. group-tab:: nRF70 DKs
605570

606571
The nRF70 Series supports the Matter bridge over Wi-Fi configuration.
@@ -716,10 +681,6 @@ Factory data support
716681
:start-after: matter_door_lock_sample_factory_data_start
717682
:end-before: matter_door_lock_sample_factory_data_end
718683

719-
.. include:: ../../../samples/matter/lock/README.rst
720-
:start-after: matter_door_lock_sample_factory_data_nrf54h20_start
721-
:end-before: matter_door_lock_sample_factory_data_nrf54h20_end
722-
723684
Building and running
724685
********************
725686

@@ -737,17 +698,6 @@ For example:
737698
738699
west build -b nrf5340dk/nrf5340/cpuapp -p -- -Dmatter_bridge_SHIELD=nrf7002ek -DSB_CONFIG_WIFI_PATCHES_EXT_FLASH_STORE=y -DSB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH=y -DSB_CONFIG_WIFI_NRF70=y -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 -DFILE_SUFFIX=nrf70ek
739700
740-
To use the nRF54H20 DK with the ``nrf7002ek`` shield (2.4 GHz or 5 GHz), follow the :ref:`ug_nrf7002eb_nrf54h20dk_gs` user guide to connect all required pins.
741-
Once connected, run the following command to build the sample:
742-
743-
.. code-block:: console
744-
745-
west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf7002eb_interposer_p1
746-
747-
.. note::
748-
|54H_engb_2_8|
749-
750-
751701
Selecting a configuration
752702
=========================
753703

applications/matter_bridge/sample.yaml

-39
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ tests:
1212
integration_platforms:
1313
- nrf7002dk/nrf5340/cpuapp
1414
- nrf5340dk/nrf5340/cpuapp
15-
- nrf54h20dk/nrf54h20/cpuapp
1615
platform_allow:
1716
- nrf7002dk/nrf5340/cpuapp
1817
- nrf5340dk/nrf5340/cpuapp
19-
- nrf54h20dk/nrf54h20/cpuapp
2018
tags:
2119
- sysbuild
2220
- ci_applications_matter
@@ -29,11 +27,9 @@ tests:
2927
integration_platforms:
3028
- nrf7002dk/nrf5340/cpuapp
3129
- nrf5340dk/nrf5340/cpuapp
32-
- nrf54h20dk/nrf54h20/cpuapp
3330
platform_allow:
3431
- nrf7002dk/nrf5340/cpuapp
3532
- nrf5340dk/nrf5340/cpuapp
36-
- nrf54h20dk/nrf54h20/cpuapp
3733
tags:
3834
- sysbuild
3935
- ci_applications_matter
@@ -47,11 +43,9 @@ tests:
4743
integration_platforms:
4844
- nrf7002dk/nrf5340/cpuapp
4945
- nrf5340dk/nrf5340/cpuapp
50-
- nrf54h20dk/nrf54h20/cpuapp
5146
platform_allow:
5247
- nrf7002dk/nrf5340/cpuapp
5348
- nrf5340dk/nrf5340/cpuapp
54-
- nrf54h20dk/nrf54h20/cpuapp
5549
tags:
5650
- sysbuild
5751
- ci_applications_matter
@@ -66,11 +60,9 @@ tests:
6660
integration_platforms:
6761
- nrf7002dk/nrf5340/cpuapp
6862
- nrf5340dk/nrf5340/cpuapp
69-
- nrf54h20dk/nrf54h20/cpuapp
7063
platform_allow:
7164
- nrf7002dk/nrf5340/cpuapp
7265
- nrf5340dk/nrf5340/cpuapp
73-
- nrf54h20dk/nrf54h20/cpuapp
7466
tags:
7567
- sysbuild
7668
- ci_applications_matter
@@ -105,35 +97,6 @@ tests:
10597
tags:
10698
- sysbuild
10799
- ci_applications_matter
108-
applications.matter_bridge.br_ble.nrf54h20.wifi:
109-
sysbuild: true
110-
build_only: true
111-
extra_args:
112-
- SB_CONFIG_WIFI_NRF70=y
113-
- CONFIG_CHIP_WIFI=y
114-
- matter_bridge_SHIELD="nrf7002eb_interposer_p1;nrf7002eb"
115-
- CONFIG_BRIDGED_DEVICE_BT=y
116-
integration_platforms:
117-
- nrf54h20dk/nrf54h20/cpuapp
118-
platform_allow: nrf54h20dk/nrf54h20/cpuapp
119-
tags:
120-
- sysbuild
121-
- ci_applications_matter
122-
applications.matter_bridge.release.br_ble.nrf54h20.wifi:
123-
sysbuild: true
124-
build_only: true
125-
extra_args:
126-
- FILE_SUFFIX=release
127-
- SB_CONFIG_WIFI_NRF70=y
128-
- CONFIG_CHIP_WIFI=y
129-
- matter_bridge_SHIELD="nrf7002eb_interposer_p1;nrf7002eb"
130-
- CONFIG_BRIDGED_DEVICE_BT=y
131-
integration_platforms:
132-
- nrf54h20dk/nrf54h20/cpuapp
133-
platform_allow: nrf54h20dk/nrf54h20/cpuapp
134-
tags:
135-
- sysbuild
136-
- ci_applications_matter
137100
applications.matter_bridge.br_ble.memory_profiling:
138101
sysbuild: true
139102
build_only: true
@@ -146,10 +109,8 @@ tests:
146109
- CONFIG_WIFI_NM_WPA_SUPPLICANT_WPA3=n
147110
integration_platforms:
148111
- nrf5340dk/nrf5340/cpuapp
149-
- nrf54h20dk/nrf54h20/cpuapp
150112
platform_allow:
151113
- nrf5340dk/nrf5340/cpuapp
152-
- nrf54h20dk/nrf54h20/cpuapp
153114
tags:
154115
- sysbuild
155116
- ci_applications_matter

applications/matter_bridge/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay

-8
This file was deleted.

0 commit comments

Comments
 (0)