samples: matter: add wifi support for manufacturer-specific

maciejbaczmanski · maciejbaczmanski · commit f90952e703fb · 2025-03-14T12:15:51.000+01:00
add wifi support for manufacturer-specific sample.

Signed-off-by: Maciej Baczmanski &lt;maciej.baczmanski@nordicsemi.no&gt;
diff --git a/samples/matter/manufacturer_specific/Kconfig.sysbuild b/samples/matter/manufacturer_specific/Kconfig.sysbuild
@@ -4,14 +4,17 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK
+
 #### Radio core selection
 config NRF_DEFAULT_IPC_RADIO
 	default y
 
 # Enable IEEE802.15.4 serialization to network core
 # This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
 config NETCORE_IPC_RADIO_IEEE802154
-	default y if SOC_SERIES_NRF53X
+	default y if SOC_SERIES_NRF53X && !WIFI_NRF70
 
 # Enable Bluetooth serialization to network core
 # This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
diff --git a/samples/matter/manufacturer_specific/README.rst b/samples/matter/manufacturer_specific/README.rst
@@ -9,7 +9,9 @@ Matter: Manufacturer-specific
 
 This sample demonstrates an implementation of custom manufacturer-specific clusters used by the application layer.
 This sample uses development kit's buttons and LEDs to demonstrate the functionality of the custom ``NordicDevkit`` cluster.
-The device works as a Matter accessory device, meaning it can be paired and controlled remotely over a Matter network built on top of a low-power, 802.15.4 Thread network.
+The device works as a Matter accessory device, meaning it can be paired and controlled remotely over a Matter network built on top of a low-power, 802.15.4 Thread network or on top of a Wi-Fi® network.
+Support for both Thread and Wi-Fi is mutually exclusive and depends on the hardware platform, so only one protocol can be supported for a specific Matter device.
+In case of Thread, this device works as a Thread :ref:`Minimal End Device <thread_ot_device_types>`.
 You can use this sample as a reference for creating your own application.
 
 Requirements
@@ -19,19 +21,27 @@ The sample supports the following development kits:
 
 .. table-from-sample-yaml::
 
-For testing purposes, that is to commission the device and :ref:`control it remotely <matter_manufacturer_specific_network_mode>` through a Thread network, you also need a Matter controller device :ref:`configured on PC or smartphone <ug_matter_configuring>`.
+For testing purposes, that is to commission the device and :ref:`control it remotely <matter_manufacturer_specific_network_mode>` through a Thread network or a Wi-Fi network, you also need a Matter controller device :ref:`configured on PC or smartphone <ug_matter_configuring>`.
 This requires additional hardware depending on the setup you choose.
 
 .. note::
     |matter_gn_required_note|
 
+IPv6 network support
+====================
+
+The development kits for this sample offer the following IPv6 network support for Matter:
+
+* Matter over Thread is supported for the ``nrf52840dk/nrf52840``, ``nrf5340dk/nrf5340/cpuapp``, ``nrf21540dk/nrf52840``, ``nrf54l15dk/nrf54l15/cpuapp``, and ``nrf54l15dk/nrf54l10/cpuapp`` board targets.
+* Matter over Wi-Fi is supported for the ``nrf5340dk/nrf5340/cpuapp`` board target with the ``nrf7002ek`` shield attached, or for the ``nrf7002dk/nrf5340/cpuapp`` board target.
+
 Overview
 ********
 .. tabs::
 
-   .. group-tab:: nRF52 and nRF53 DKs
+   .. group-tab:: nRF52, nRF53 and nRF70 DKs
 
-      The sample starts the Bluetooth® LE advertising automatically and prepares the Matter device for commissioning into a Matter-enabled Thread network.
+      The sample starts the Bluetooth® LE advertising automatically and prepares the Matter device for commissioning into a Matter-enabled IPv6 network.
       The sample uses the **LED 1** to show the state of the connection.
       You can press **Button 1** to start the factory reset when needed.
       **Button 2** is used to set the state of the ``NordicDevkit`` cluster's attribute, ``UserButton``.
@@ -42,7 +52,7 @@ Overview
 
    .. group-tab:: nRF54 DKs
 
-      The sample starts the Bluetooth® LE advertising automatically and prepares the Matter device for commissioning into a Matter-enabled Thread network.
+      The sample starts the Bluetooth LE advertising automatically and prepares the Matter device for commissioning into a Matter-enabled IPv6 network.
       The sample uses the **LED 0** to show the state of the connection.
       You can press **Button 0** to start the factory reset when needed.
       **Button 1** is used to set the state of the ``NordicDevkit`` cluster's attribute, ``UserButton``.
@@ -108,7 +118,7 @@ User interface
 
 .. tabs::
 
-   .. group-tab:: nRF52 and nRF53 DKs
+   .. group-tab:: nRF52, nRF53 and nRF70 DKs
 
       LED 1:
          .. include:: /includes/matter_sample_state_led.txt
@@ -153,7 +163,7 @@ See `Configuration`_ for information about building the sample with the DFU supp
 Enabling remote control
 =======================
 
-Remote control allows you to control the Matter manufacturer-specific device from a Thread network.
+Remote control allows you to control the Matter manufacturer-specific device from an IPv6 network.
 
 `Commissioning the device`_ allows you to set up a testing environment and remotely control the sample over a Matter-enabled Thread network.
 
diff --git a/samples/matter/manufacturer_specific/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/manufacturer_specific/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# Enable LTO to decrease the flash usage.
+CONFIG_LTO=y
+CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
diff --git a/samples/matter/manufacturer_specific/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/manufacturer_specific/boards/nrf7002dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+
+/ {
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
+	};
+
+	aliases {
+		watchdog0 = &wdt0;
+	};
+
+};
+
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+	zephyr,priority = <0 PRIO_COOP>;
+};
diff --git a/samples/matter/manufacturer_specific/pm_static_nrf7002dk_nrf5340_cpuapp.yml b/samples/matter/manufacturer_specific/pm_static_nrf7002dk_nrf5340_cpuapp.yml
@@ -0,0 +1,56 @@
+mcuboot:
+  address: 0x0
+  size: 0xC000
+  region: flash_primary
+mcuboot_pad:
+  address: 0xC000
+  size: 0x200
+app:
+  address: 0xC200
+  size: 0xeae00
+mcuboot_primary:
+  orig_span: &id001
+  - mcuboot_pad
+  - app
+  span: *id001
+  address: 0xC000
+  size: 0xeb000
+  region: flash_primary
+mcuboot_primary_app:
+  orig_span: &id002
+  - app
+  span: *id002
+  address: 0xC200
+  size: 0xeae00
+factory_data:
+  address: 0xf7000
+  size: 0x1000
+  region: flash_primary
+settings_storage:
+  address: 0xf8000
+  size: 0x8000
+  region: flash_primary
+mcuboot_primary_1:
+  address: 0x0
+  size: 0x40000
+  device: flash_ctrl
+  region: ram_flash
+mcuboot_secondary:
+  address: 0x0
+  size: 0xeb000
+  device: MX25R64
+  region: external_flash
+mcuboot_secondary_1:
+  address: 0xeb000
+  size: 0x40000
+  device: MX25R64
+  region: external_flash
+external_flash:
+  address: 0x12b000
+  size: 0x6D5000
+  device: MX25R64
+  region: external_flash
+pcd_sram:
+  address: 0x20000000
+  size: 0x2000
+  region: sram_primary
diff --git a/samples/matter/manufacturer_specific/sample.yaml b/samples/matter/manufacturer_specific/sample.yaml
@@ -11,12 +11,14 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp/ns
       - nrf54l15dk/nrf54l10/cpuapp
+      - nrf7002dk/nrf5340/cpuapp
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp/ns
       - nrf54l15dk/nrf54l10/cpuapp
+      - nrf7002dk/nrf5340/cpuapp
     tags:
       - sysbuild
       - ci_samples_matter
diff --git a/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf
@@ -0,0 +1,45 @@
+#
+# Copyright (c) 2023 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# Disable serial and UART interface.
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
+CONFIG_LOG=n
+
+# RAM usage configuration
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+
+# BT configuration
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+CONFIG_BT_MAX_CONN=1
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=n
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+
+# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1)
+CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4
+
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+CONFIG_BT_CTLR_PHY_2M=n
+
+# Debug and assert configuration
+CONFIG_ASSERT=y
+CONFIG_DEBUG_INFO=y
+CONFIG_RESET_ON_FATAL_ERROR=n
+CONFIG_REBOOT=n
+
+# IPC
+CONFIG_MBOX=y
+CONFIG_IPC_SERVICE=y
+
+# ipc_radio
+CONFIG_IPC_RADIO_BT=y
+CONFIG_IPC_RADIO_BT_HCI_IPC=y
diff --git a/samples/matter/manufacturer_specific/sysbuild/ipc_radio/prj_release.conf b/samples/matter/manufacturer_specific/sysbuild/ipc_radio/prj_release.conf
diff --git a/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2023 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# nRF7002DK uses SPI NOR external flash
+CONFIG_GPIO=y
+CONFIG_SPI=y
+CONFIG_SPI_NOR=y
+CONFIG_SPI_NOR_SFDP_DEVICETREE=y
+CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
+
+CONFIG_MULTITHREADING=y
+CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
+
+# The following configurations are required to support simultaneous multi image update
+CONFIG_PCD_APP=y
+CONFIG_UPDATEABLE_IMAGE_NUMBER=2
+
+# Multi-image updates do not support image swapping yet.
+CONFIG_BOOT_UPGRADE_ONLY=y
+
+# The network core cannot access external flash directly. The flash simulator must be used to
+# provide a memory region that is used to forward the new firmware to the network core.
+CONFIG_FLASH_SIMULATOR=y
+CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y
+CONFIG_FLASH_SIMULATOR_STATS=n
+
+CONFIG_ZCBOR=y
diff --git a/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,code-partition = &boot_partition;
+		nordic,pm-ext-flash = &mx25r64;
+	};
+};
