Skip to content

Commit fc97d4f

Browse files
ArekBalysNordicArekBalysNordic
committed
samples: matter: Enable CHIP_WIFI if WIFI_NRF70 is enabled
CHIP_WIFI cannot depend on DK, it must rely on WIFI_NRF70. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
1 parent b7988ca commit fc97d4f

12 files changed

Lines changed: 41 additions & 11 deletions

File tree

‎applications/matter_bridge/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,9 @@ endchoice
176176

177177
endif # OPENTHREAD
178178

179+
config CHIP_WIFI
180+
default y if BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK
181+
179182
# Dummy Kconfig just to select experimental for some of the configurations.
180183
config BRIDGE_EXPERIMENTAL
181184
bool

‎applications/matter_weather_station/Kconfig‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,15 @@ config CHIP_ENABLE_ICD_SUPPORT
3232

3333
endif # OPENTHREAD
3434

35-
if CHIP_WIFI
35+
if SHIELD_NRF7002EB
36+
37+
config CHIP_WIFI
38+
default y
3639

3740
config NRF_WIFI_LOW_POWER
3841
default y
3942

40-
endif # CHIP_WIFI
43+
endif # SHIELD_NRF7002EB
4144

4245
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
4346
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"

‎doc/nrf/includes/matter_building_nrf5340dk_70ek‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ To build the Matter over Wi-Fi sample variant on nRF5340 DK with nRF7002 EK shie
1010

1111
.. code-block:: console
1212

13-
-- -DSHIELD=nrf7002ek -DFILE_SUFFIX=nrf70ek -DSB_CONFIG_WIFI_NRF70=y
13+
-- -DSHIELD=nrf7002ek -DFILE_SUFFIX=nrf70ek -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y
1414

1515
.. group-tab:: Command line
1616

@@ -20,11 +20,11 @@ To build the Matter over Wi-Fi sample variant on nRF5340 DK with nRF7002 EK shie
2020

2121
.. code-block:: console
2222

23-
west build -p -b nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf7002ek -DFILE_SUFFIX=nrf70ek -DSB_CONFIG_WIFI_NRF70=y
23+
west build -p -b nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf7002ek -DFILE_SUFFIX=nrf70ek -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y
2424

2525
* CMake with the following command:
2626

2727
.. code-block:: console
2828

29-
cmake -GNinja -Bbuild -DBOARD=nrf5340dk/nrf5340/cpuapp -DSHIELD=nrf7002ek -DFILE_SUFFIX=nrf70ek -DSB_CONFIG_WIFI_NRF70=y -DAPP_DIR=*app_path* *path_to_zephyr*/share/sysbuild
29+
cmake -GNinja -Bbuild -DBOARD=nrf5340dk/nrf5340/cpuapp -DSHIELD=nrf7002ek -DFILE_SUFFIX=nrf70ek -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -DAPP_DIR=*app_path* *path_to_zephyr*/share/sysbuild
3030
ninja -C build

‎doc/nrf/releases_and_maturity/migration/migration_guide_3.2.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ Matter
7979
#. Set the :kconfig:option:`SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH` Kconfig option to ``n``.
8080
#. Set the :kconfig:option:`SB_CONFIG_MCUBOOT_UPDATEABLE_IMAGES` Kconfig option to ``2``.
8181

82+
* All Matter over Wi-Fi samples and applications now enable the :kconfig:option:`CONFIG_CHIP_WIFI` and :kconfig:option:`CONFIG_WIFI_NRF70` Kconfig options, depending on the board used.
83+
Previously, :kconfig:option:`CONFIG_CHIP_WIFI` was enabled in the Matter stack configuration if the nRF7002 DK or nRF7002 EK was used, which caused issues when building the application with custom boards.
84+
85+
To build your custom board with Wi-Fi support, set both the :kconfig:option:`CONFIG_CHIP_WIFI` and :kconfig:option:`CONFIG_WIFI_NRF70` Kconfig options to ``y``.
86+
8287
Libraries
8388
=========
8489

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ Matter
190190
Matter fork
191191
+++++++++++
192192

193-
|no_changes_yet_note|
193+
* Removed dependencies on Nordic DK-specific configurations in Matter configurations.
194+
See the `Migration guide for nRF Connect SDK v3.2.0`_ for more information.
194195

195196
nRF IEEE 802.15.4 radio driver
196197
------------------------------

‎samples/matter/light_bulb/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ endchoice
1818

1919
endif # OPENTHREAD
2020

21+
config CHIP_WIFI
22+
default y if BOARD_NRF7002DK_NRF5340_CPUAPP
23+
2124
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
2225
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
2326
source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig"

‎samples/matter/light_switch/Kconfig‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,15 @@ config OPENTHREAD_DEFAULT_TX_POWER
3333

3434
endif # OPENTHREAD
3535

36-
if CHIP_WIFI
36+
if BOARD_NRF7002DK_NRF5340_CPUAPP
37+
38+
config CHIP_WIFI
39+
default y
3740

3841
config NRF_WIFI_LOW_POWER
3942
default y
4043

41-
endif # CHIP_WIFI
44+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP
4245

4346
# Enable Read Client functionality for all build configurations.
4447
config CHIP_ENABLE_READ_CLIENT

‎samples/matter/lock/Kconfig‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,15 @@ config OPENTHREAD_DEFAULT_TX_POWER
130130

131131
endif # OPENTHREAD
132132

133-
if CHIP_WIFI
133+
if BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK
134+
135+
config CHIP_WIFI
136+
default y
134137

135138
config NRF_WIFI_LOW_POWER
136139
default y
137140

138-
endif # CHIP_WIFI
141+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK
139142

140143
config NCS_SAMPLE_MATTER_PERSISTENT_STORAGE
141144
default y

‎samples/matter/manufacturer_specific/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ endchoice
1818

1919
endif # OPENTHREAD
2020

21+
config CHIP_WIFI
22+
default y if BOARD_NRF7002DK_NRF5340_CPUAPP
23+
2124
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
2225
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
2326
source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig"

‎samples/matter/template/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ endchoice
1818

1919
endif # OPENTHREAD
2020

21+
config CHIP_WIFI
22+
default y if BOARD_NRF7002DK_NRF5340_CPUAPP
23+
2124
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
2225
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
2326
source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig"

0 commit comments

Comments
 (0)