Skip to content

Commit ac5a4cc

Browse files
ArekBalysNordicArekBalysNordic
committedMar 5, 2025
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.

‎config/suit/templates/nrf54h20/matter/v1/app_envelope.yaml.jinja2

-211
This file was deleted.

‎config/suit/templates/nrf54h20/matter/v1/rad_envelope.yaml.jinja2

-160
This file was deleted.

‎config/suit/templates/nrf54h20/matter/v1/root_with_binary_nordic_top.yaml.jinja2

-305
This file was deleted.

‎doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

+3-5
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,7 @@ IPC radio firmware
220220
Matter Bridge
221221
-------------
222222

223-
* Enabled SUIT DFU support for the :ref:`matter_bridge_app` application.
224-
Currently, only the Matter OTA protocol is fully supported for SUIT DFU purposes.
223+
* Removed support for the nRF54H20 devices.
225224
* Enabled Link Time Optimization (LTO) by default for the ``release`` configuration.
226225

227226
nRF5340 Audio
@@ -491,10 +490,9 @@ Keys samples
491490
Matter samples
492491
--------------
493492

494-
* Updated the :ref:`matter_template_sample` sample document with the instructions on how to build the sample on the nRF54L15 DK with support for Matter OTA DFU and DFU over Bluetooth SMP, and using internal MRAM only.
495-
* Enabled SUIT DFU support for the :ref:`matter_lock_sample`, and :ref:`matter_template_sample` samples.
496-
Currently, only the Matter OTA protocol is fully supported for SUIT DFU purposes.
493+
* Updated the :ref:`matter_template_sample` sample document with the instructions on how to build the sample on the nRF54L15 DK with support for Matter OTA DFU and DFU over Bluetooth SMP, and using internal RRAM only.
497494
* Enabled Link Time Optimization (LTO) by default for the ``release`` configuration and ``nrf7002dk/nrf5340/cpuapp`` build target.
495+
* Removed support for nRF54H20 devices from the :ref:`matter_lock_sample`, and :ref:`matter_template_sample` samples.
498496

499497
Networking samples
500498
------------------

‎samples/matter/common/cmake/source_common.cmake

+1-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ endif()
3030

3131
if(CONFIG_MCUMGR_TRANSPORT_BT)
3232
target_sources(app PRIVATE ${MATTER_COMMONS_SRC_DIR}/dfu/smp/dfu_over_smp.cpp)
33-
if (NOT CONFIG_SUIT)
34-
zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
35-
endif()
33+
zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
3634
endif()
3735

3836
if(CONFIG_NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS)

‎samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_memory_map.dtsi

-78
This file was deleted.

‎samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_peripherals.dtsi

-85
This file was deleted.

‎samples/matter/common/dts/nrf54h20/nrf54h20_cpurad_memory_map.dtsi

-32
This file was deleted.

‎samples/matter/common/dts/nrf54h20/nrf54h20_ram_allocation.dtsi

-18
This file was deleted.

‎samples/matter/common/src/dfu/smp/dfu_over_smp.cpp

+1-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#error "DFU over SMP requires MCUmgr Bluetooth LE module config enabled"
1111
#endif
1212

13-
#if !defined(CONFIG_SUIT) && (!defined(CONFIG_MCUMGR_GRP_IMG) || !defined(CONFIG_MCUMGR_GRP_OS))
13+
#if (!defined(CONFIG_MCUMGR_GRP_IMG) || !defined(CONFIG_MCUMGR_GRP_OS))
1414
#error "DFU over SMP requires MCUmgr IMG and OS groups"
1515
#endif
1616

@@ -21,10 +21,8 @@
2121

2222
#include <lib/support/logging/CHIPLogging.h>
2323

24-
#ifndef CONFIG_SUIT
2524
#include <zephyr/dfu/mcuboot.h>
2625
#include <zephyr/mgmt/mcumgr/grp/img_mgmt/img_mgmt.h>
27-
#endif
2826

2927
#include <zephyr/mgmt/mcumgr/mgmt/callbacks.h>
3028
#include <zephyr/mgmt/mcumgr/mgmt/mgmt.h>
@@ -46,8 +44,6 @@ namespace
4644
enum mgmt_cb_return UploadConfirmHandler(uint32_t, enum mgmt_cb_return, int32_t *rc, uint16_t *,
4745
bool *, void *data, size_t)
4846
{
49-
/* Currently img_mgmt hooks are not supported by SUIT */
50-
#ifndef CONFIG_SUIT
5147
const img_mgmt_upload_check &imgData = *static_cast<img_mgmt_upload_check *>(data);
5248
IgnoreUnusedVariable(imgData);
5349

@@ -64,7 +60,6 @@ enum mgmt_cb_return UploadConfirmHandler(uint32_t, enum mgmt_cb_return, int32_t
6460
ChipLogProgress(SoftwareUpdate, "DFU over SMP progress: %u/%u B of image %u",
6561
static_cast<unsigned>(imgData.req->off), static_cast<unsigned>(imgData.action->size),
6662
static_cast<unsigned>(imgData.req->image));
67-
#endif
6863
return MGMT_CB_OK;
6964
}
7065

@@ -142,7 +137,6 @@ void DFUOverSMP::Init()
142137

143138
void DFUOverSMP::ConfirmNewImage()
144139
{
145-
#ifndef CONFIG_SUIT
146140
/* Check if the image is run in the REVERT mode and eventually */
147141
/* confirm it to prevent reverting on the next boot. */
148142
VerifyOrReturn(mcuboot_swap_type() == BOOT_SWAP_TYPE_REVERT);
@@ -152,7 +146,6 @@ void DFUOverSMP::ConfirmNewImage()
152146
} else {
153147
ChipLogProgress(SoftwareUpdate, "New firmware image confirmed");
154148
}
155-
#endif
156149
}
157150

158151
void DFUOverSMP::StartServer()

‎samples/matter/lock/Kconfig.sysbuild

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ config NRF_DEFAULT_IPC_RADIO
1414
# Enable IEEE802.15.4 serialization to network core
1515
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
1616
config NETCORE_IPC_RADIO_IEEE802154
17-
default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX) && !WIFI_NRF70
17+
default y if SOC_SERIES_NRF53X && !WIFI_NRF70
1818

1919
# Enable Bluetooth serialization to network core
2020
# This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
2121
config NETCORE_IPC_RADIO_BT_HCI_IPC
22-
default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX)
22+
default y if SOC_SERIES_NRF53X
2323

2424
#### Bootloader
2525
choice BOOTLOADER
26-
default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK && !SOC_SERIES_NRF54HX
26+
default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK
2727
endchoice
2828

2929
if BOOTLOADER_MCUBOOT

‎samples/matter/lock/README.rst

+2-60
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ IPv6 network support
4343

4444
The development kits for this sample offer the following IPv6 network support for Matter:
4545

46-
* Matter over Thread is supported for ``nrf52840dk/nrf52840``, ``nrf5340dk/nrf5340/cpuapp``, ``nrf21540dk/nrf52840``, and ``nrf54h20dk/nrf54h20/cpuapp``.
47-
* Matter over Wi-Fi is supported for ``nrf5340dk/nrf5340/cpuapp`` or ``nrf54h20dk/nrf54h20/cpuapp`` with the ``nrf7002ek`` shield attached, for ``nrf7002dk/nrf5340/cpuapp`` (2.4 GHz and 5 GHz), or for ``nrf7002dk/nrf5340/cpuapp/nrf7001`` (2.4 GHz only).
46+
* Matter over Thread is supported for ``nrf52840dk/nrf52840``, ``nrf5340dk/nrf5340/cpuapp``, ``nrf21540dk/nrf52840``, and ``nrf54l15dk/nrf54l15/cpuapp``.
47+
* Matter over Wi-Fi is supported for ``nrf5340dk/nrf5340/cpuapp`` with the ``nrf7002ek`` shield attached, for ``nrf7002dk/nrf5340/cpuapp`` (2.4 GHz and 5 GHz), or for ``nrf7002dk/nrf5340/cpuapp/nrf7001`` (2.4 GHz only).
4848
* :ref:`Switching between Matter over Thread and Matter over Wi-Fi <matter_lock_sample_wifi_thread_switching>` is supported for ``nrf5340dk/nrf5340/cpuapp`` with the ``nrf7002ek`` shield attached, using the :ref:`switched Thread and Wi-Fi configuration <matter_lock_sample_custom_configs>`.
4949

5050
Overview
@@ -319,15 +319,6 @@ For example:
319319
320320
.. matter_door_lock_sample_build_with_dfu_end
321321
322-
SUIT DFU on nRF54H20
323-
--------------------
324-
325-
.. include:: ../template/README.rst
326-
:start-after: matter_template_dfu_suit_start
327-
:end-before: matter_template_dfu_suit_end
328-
329-
.. _matter_lock_sample_configuration_fem:
330-
331322
FEM support
332323
===========
333324

@@ -374,44 +365,6 @@ To learn more about factory data, read the :doc:`matter:nrfconnect_factory_data_
374365

375366
.. matter_door_lock_sample_factory_data_end
376367
377-
.. matter_door_lock_sample_factory_data_nrf54h20_start
378-
379-
Merging the factory data hex file with the firmware hex file is currently not available on the nRF54H20 DK.
380-
The factory data support is disabled by default on this board.
381-
You can still use it, but you need to flash the :file:`factory_data.hex` file manually.
382-
383-
To use factory data on the nRF54H20 DK, complete the following steps:
384-
385-
1. Flash the :file:`factory_data.hex` file into the device using the following command:
386-
387-
.. code-block:: console
388-
389-
nrfutil device program --firmware build/template/zephyr/factory_data.hex
390-
391-
#. Enable factory data support by building the sample with the :kconfig:option:`CONFIG_CHIP_FACTORY_DATA` Kconfig option set to ``y`` using the following command:
392-
393-
.. code-block:: console
394-
395-
west build -p -b nrf54h20dk/nrf54h20/cpuapp -- -DCONFIG_CHIP_FACTORY_DATA=y
396-
397-
#. Flash the firmware into the device:
398-
399-
.. code-block:: console
400-
401-
west flash --erase
402-
403-
The ``west flash --erase`` command does not clear the factory data partition.
404-
If you want to clear it, use the following command, and fill the ``<address>`` argument as an address of the factory data partition.
405-
By default, the address is set to ``0xe174000``.
406-
407-
.. code-block:: console
408-
409-
nrfutil device erase --pages <address>
410-
411-
Migrating the DAC private key from the factory data set to Trusted Storage is not supported yet on nRF54H20 DK.
412-
413-
.. matter_door_lock_sample_factory_data_nrf54h20_end
414-
415368
User interface
416369
**************
417370

@@ -484,17 +437,6 @@ Building and running
484437

485438
See `Configuration`_ for information about building the sample with the DFU support.
486439

487-
.. include:: ../template/README.rst
488-
:start-after: matter_template_build_wifi_nrf54h20_start
489-
:end-before: matter_template_build_wifi_nrf54h20_end
490-
491-
.. code-block:: console
492-
493-
west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dlock_SHIELD=nrf7002eb_interposer_p1
494-
495-
.. note::
496-
|54H_engb_2_8|
497-
498440
Selecting a configuration
499441
=========================
500442

‎samples/matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.conf

-35
This file was deleted.

‎samples/matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

-10
This file was deleted.

‎samples/matter/lock/sample.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@ tests:
1212
- nrf7002dk/nrf5340/cpuapp/nrf7001
1313
- nrf54l15dk/nrf54l15/cpuapp
1414
- nrf54l15dk/nrf54l15/cpuapp/ns
15-
- nrf54h20dk/nrf54h20/cpuapp
1615
platform_allow:
1716
- nrf52840dk/nrf52840
1817
- nrf5340dk/nrf5340/cpuapp
1918
- nrf7002dk/nrf5340/cpuapp
2019
- nrf7002dk/nrf5340/cpuapp/nrf7001
2120
- nrf54l15dk/nrf54l15/cpuapp
22-
- nrf54h20dk/nrf54h20/cpuapp
2321
- nrf54l15dk/nrf54l15/cpuapp/ns
2422
tags:
2523
- sysbuild
@@ -35,14 +33,12 @@ tests:
3533
- nrf7002dk/nrf5340/cpuapp
3634
- nrf7002dk/nrf5340/cpuapp/nrf7001
3735
- nrf54l15dk/nrf54l15/cpuapp
38-
- nrf54h20dk/nrf54h20/cpuapp
3936
platform_allow:
4037
- nrf52840dk/nrf52840
4138
- nrf5340dk/nrf5340/cpuapp
4239
- nrf7002dk/nrf5340/cpuapp
4340
- nrf7002dk/nrf5340/cpuapp/nrf7001
4441
- nrf54l15dk/nrf54l15/cpuapp
45-
- nrf54h20dk/nrf54h20/cpuapp
4642
tags:
4743
- sysbuild
4844
- ci_samples_matter

‎samples/matter/lock/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf

-43
This file was deleted.

‎samples/matter/lock/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay

-7
This file was deleted.

‎samples/matter/template/Kconfig.sysbuild

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ config NRF_DEFAULT_IPC_RADIO
1414
# Enable IEEE802.15.4 serialization to network core
1515
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
1616
config NETCORE_IPC_RADIO_IEEE802154
17-
default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX) && !WIFI_NRF70
17+
default y if SOC_SERIES_NRF53X && !WIFI_NRF70
1818

1919
# Enable Bluetooth serialization to network core
2020
# This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
2121
config NETCORE_IPC_RADIO_BT_HCI_IPC
22-
default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX)
22+
default y if SOC_SERIES_NRF53X
2323

2424
#### Bootloader
2525
choice BOOTLOADER
26-
default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK && !SOC_SERIES_NRF54HX
26+
default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK
2727
endchoice
2828

2929
if BOOTLOADER_MCUBOOT

‎samples/matter/template/README.rst

+2-59
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ IPv6 network support
3232

3333
The development kits for this sample offer the following IPv6 network support for Matter:
3434

35-
* Matter over Thread is supported for ``nrf52840dk/nrf52840``, ``nrf5340dk/nrf5340/cpuapp``, ``nrf21540dk/nrf52840``, ``nrf54l15dk/nrf54l15/cpuapp``, ``nrf54l15dk/nrf54l10/cpuapp``, and ``nrf54h20dk/nrf54h20/cpuapp``.
36-
* Matter over Wi-Fi is supported for ``nrf5340dk/nrf5340/cpuapp`` or ``nrf54h20dk/nrf54h20/cpuapp`` with the ``nrf7002ek`` shield attached, or for ``nrf7002dk/nrf5340/cpuapp``.
35+
* Matter over Thread is supported for ``nrf52840dk/nrf52840``, ``nrf5340dk/nrf5340/cpuapp``, ``nrf21540dk/nrf52840``, ``nrf54l15dk/nrf54l15/cpuapp``, and ``nrf54l15dk/nrf54l10/cpuapp``.
36+
* Matter over Wi-Fi is supported for ``nrf5340dk/nrf5340/cpuapp`` with the ``nrf7002ek`` shield attached, or for ``nrf7002dk/nrf5340/cpuapp``.
3737

3838
Overview
3939
********
@@ -153,46 +153,6 @@ To build the sample for the same purpose, but in the ``release`` configuration,
153153
154154
Note that in this case, the size of the application partition is half of what it would be when using a configuration with external flash memory support.
155155

156-
SUIT DFU on nRF54H20
157-
--------------------
158-
159-
.. matter_template_dfu_suit_start
160-
161-
Matter devices running on an nRF54H20 SoC support :ref:`ug_nrf54h20_suit_dfu`.
162-
You can use SUIT mechanisms to update both the application and radio core firmware as well as the *nRF54H20 SoC binaries* provided by Nordic Semiconductor.
163-
Currently, Matter samples support only the :ref:`ug_nrf54h20_suit_external_memory` approach and the *Push* firmware update model.
164-
The default SUIT manifest template files are located in the :file:`config/suit/templates/nrf54h20/matter/v1` directory.
165-
To change the source directory of the SUIT manifest template files, set the ``SUIT_BASE_MANIFEST_VARIANT`` sysbuild configuration option.
166-
167-
Currently, only DFU over the :ref:`ug_matter_overview_dfu` protocol is fully supported for this sample without any external tools.
168-
To perform a firmware update using the Simple Management Protocol (SMP) over Bluetooth LE, you need an external tool that supports :ref:`ug_nrf54h20_suit_smp`.
169-
170-
To perform a firmware update of the application and radio core firmware using the :ref:`ug_matter_overview_dfu` protocol, ensure that the ``MATTER_OTA`` sysbuild configuration option is set to ``y`` and perform the firmware update as usual following the :doc:`matter:nrfconnect_examples_software_update` user guide.
171-
In this case, the *nRF54H20 SoC binaries* will not be updated.
172-
173-
To update the *nRF54H20 SoC binaries*, follow the :ref:`ug_nrf54h20_suit_soc_binaries_root_in_manufacturer` user guide and define the page erase size of the device on which the cache partition is stored.
174-
To set the page erase size for SUIT purposes use the ``SUIT_DFU_CACHE_PARTITION_X_EB_SIZE`` CMake variable, where ``X`` means the cache partition number.
175-
If the external flash is used to store the cache partition, the page erase size is the same as the external flash page erase size.
176-
For example on nRF54H20 DK, the page erase size is 4096 bytes accordingly to the ``mx25uw63`` flash memory erase page size.
177-
To see the exact value of the cache 1 page erase size, see the devicetree configuration file, find the ``dfu_cache_partition_1`` node and check the erase page value for the device on which the partition is defined.
178-
179-
For example, you can use the following command to prepare the DFU files that include the *nRF54H20 SoC binaries* for Matter OTA on nRF54H20 DK:
180-
181-
.. code-block:: console
182-
183-
west build -b nrf54h20dk/nrf54h20/cpuapp -- -DSB_CONFIG_SUIT_ENVELOPE_NORDIC_TOP_DIRECTORY="\"<NORDIC_TOP_DIRECTORY>\"" -DSUIT_DFU_CACHE_PARTITION_1_EB_SIZE=4096
184-
185-
To perform a firmware update using the SMP over the Bluetooth LE protocol, write the following files to the device using an external tool and the SUIT SMP extension described in the :ref:`ug_nrf54h20_suit_smp` user guide:
186-
187-
* :file:`<build_dir>/DFU/root.suit` into slot 0.
188-
* :file:`<build_dir>/DFU/dfu_cache_partition_1.bin` into slot 1.
189-
190-
The ``<build_dir>`` refers to your build directory.
191-
The SUIT envelope file is included in the :file:`root.suit` file, whereas the new application firmware is included in the :file:`dfu_cache_partition_1.bin` file.
192-
After transferring both files, confirm the update and reboot the device.
193-
194-
.. matter_template_dfu_suit_end
195-
196156
FEM support
197157
===========
198158

@@ -205,10 +165,6 @@ Factory data support
205165
:start-after: matter_door_lock_sample_factory_data_start
206166
:end-before: matter_door_lock_sample_factory_data_end
207167

208-
.. include:: ../lock/README.rst
209-
:start-after: matter_door_lock_sample_factory_data_nrf54h20_start
210-
:end-before: matter_door_lock_sample_factory_data_nrf54h20_end
211-
212168
User interface
213169
**************
214170

@@ -242,19 +198,6 @@ Building and running
242198

243199
.. include:: /includes/build_and_run.txt
244200

245-
.. matter_template_build_wifi_nrf54h20_start
246-
247-
To use nrf54H20 DK with the ``nrf7002ek`` shield attached (2.4 GHz or 5 GHz), follow the :ref:`ug_nrf7002eb_nrf54h20dk_gs` user guide to connect all required pins and then use the following command to build the sample:
248-
249-
.. matter_template_build_wifi_nrf54h20_end
250-
251-
.. code-block:: console
252-
253-
west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dtemplate_SHIELD=nrf7002eb_interposer_p1
254-
255-
.. note::
256-
|54H_engb_2_8|
257-
258201
Selecting a configuration
259202
=========================
260203

‎samples/matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.conf

-35
This file was deleted.

‎samples/matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

-10
This file was deleted.

‎samples/matter/template/sample.yaml

-29
Original file line numberDiff line numberDiff line change
@@ -70,35 +70,6 @@ tests:
7070
tags:
7171
- sysbuild
7272
- ci_samples_matter
73-
sample.matter.template.smp_dfu.nrf54h20:
74-
sysbuild: true
75-
build_only: true
76-
extra_args:
77-
- CONFIG_CHIP_DFU_OVER_BT_SMP=y
78-
integration_platforms:
79-
- nrf54h20dk/nrf54h20/cpuapp
80-
platform_allow: nrf54h20dk/nrf54h20/cpuapp
81-
tags:
82-
- sysbuild
83-
- ci_samples_matter
84-
sample.matter.template.nrf54h20.nrf7002eb:
85-
sysbuild: true
86-
build_only: true
87-
extra_args:
88-
- SB_CONFIG_WIFI_NRF70=y
89-
- template_SHIELD=nrf7002eb_interposer_p1 nrf7002eb
90-
- CONFIG_CHIP_WIFI=y
91-
- CONFIG_CHIP_BOOTLOADER_NONE=y
92-
- CONFIG_CHIP_OTA_REQUESTOR=n
93-
- SB_CONFIG_MATTER_OTA=n
94-
- CONFIG_LTO=y
95-
- CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
96-
integration_platforms:
97-
- nrf54h20dk/nrf54h20/cpuapp
98-
platform_allow: nrf54h20dk/nrf54h20/cpuapp
99-
tags:
100-
- sysbuild
101-
- ci_samples_matter
10273
sample.matter.template.release.internal.smp_dfu:
10374
sysbuild: true
10475
build_only: true

‎samples/matter/template/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf

-43
This file was deleted.

‎samples/matter/template/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.overlay

-7
This file was deleted.

‎scripts/quarantine.yaml

-18
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
# will be skipped if quarantine is used. More details here:
33
# https://docs.zephyrproject.org/latest/guides/test/twister.html#quarantine
44

5-
- scenarios:
6-
- applications.matter_bridge.br_ble.nrf54h20.wifi
7-
- applications.matter_bridge.release.br_ble.nrf54h20.wifi
8-
- sample.matter.template.nrf54h20.nrf7002eb
9-
comment: "54H Wi-Fi PSA and Matter Legacy crypto config"
10-
115
- scenarios:
126
- net.lib.wifi_credentials_backend_psa
137
comment: "Fix not known at time of upmerge, temporarily excluded to be fixed after upmerge"
@@ -29,18 +23,6 @@
2923
- nrf54h20dk@0.9.0/nrf54h20/cpuapp
3024
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31409"
3125

32-
- scenarios:
33-
- applications.matter_bridge.debug
34-
- applications.matter_bridge.br_ble
35-
- applications.matter_bridge.br_ble.memory_profiling
36-
- applications.matter_bridge.release
37-
- applications.matter_bridge.release.br_ble
38-
- sample.openthread.cli
39-
- sample.openthread.cli.singleprotocol
40-
platforms:
41-
- nrf54h20dk@0.9.0/nrf54h20/cpuapp
42-
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31493"
43-
4426
- scenarios:
4527
- applications.connectivity_bridge
4628
platforms:

‎scripts/quarantine_integration.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,6 @@
105105
- nrf54l15dk/nrf54l15/cpuapp/ns
106106
comment: "Configurations excluded to limit resources usage in integration Matter ns builds"
107107

108-
- scenarios:
109-
- applications.matter_bridge.br_ble.memory_profiling
110-
- applications.matter_bridge.release.br_ble.nrf54h20.wifi
111-
platforms:
112-
- nrf54h20dk@0.9.0/nrf54h20/cpuapp
113-
comment: "Configurations excluded to limit resources usage in integration builds"
114-
115-
116108
- scenarios:
117109
- sample.nrf7002.iot_devices
118110
- sample.nrf7002.high_performance

‎snippets/matter-debug/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

-8
This file was deleted.

‎snippets/matter-debug/snippet.yml

-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,3 @@ boards:
1515
/nrf54l15dk.*/:
1616
append:
1717
EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
18-
nrf54h20dk/nrf54h20/cpuapp:
19-
append:
20-
EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay

‎sysbuild/Kconfig.matter

-12
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
menuconfig MATTER
66
bool "Matter"
77
depends on ZEPHYR_CONNECTEDHOMEIP_MODULE
8-
# Matter requires at least one DFU transport so we always need to have SUIT mechanisms for nRF54H series
9-
select SUIT_ENVELOPE if SOC_SERIES_NRF54HX
10-
select SUIT_BUILD_FLASH_COMPANION if SOC_SERIES_NRF54HX
11-
select SUIT_MULTI_IMAGE_PACKAGE_BUILD if MATTER_OTA && SOC_SERIES_NRF54HX
12-
select SUIT_ENVELOPE_NORDIC_TOP_EXTRACT_PAYLOADS_TO_CACHE if SUIT_ENVELOPE_NORDIC_TOP_DIRECTORY != "" && SOC_SERIES_NRF54HX
138

149
if MATTER
1510

@@ -42,11 +37,4 @@ config MATTER_OTA_IMAGE_FILE_NAME
4237
help
4338
Provides the file name of the generated Matter OTA image in the build directory.
4439

45-
if SOC_SERIES_NRF54HX
46-
47-
# Set the default value of manifest variant dedicated to Matter
48-
config SUIT_BASE_MANIFEST_VARIANT
49-
default "matter/v1"
50-
51-
endif # SOC_SERIES_NRF54HX
5240
endif # MATTER

‎west.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ manifest:
157157
- name: matter
158158
repo-path: sdk-connectedhomeip
159159
path: modules/lib/matter
160-
revision: 80665b6704e3c1a175d4ca552e308d3e3e5602a9
160+
revision: 4c46941ef17b7b755c96c57e4ba42306cc524e1c
161161
west-commands: scripts/west/west-commands.yml
162162
submodules:
163163
- name: nlio

0 commit comments

Comments
 (0)
Please sign in to comment.