Skip to content

Commit 94f1314

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 <[email protected]>
1 parent 6df6566 commit 94f1314

File tree

11 files changed

+79
-8
lines changed

11 files changed

+79
-8
lines changed

‎applications/matter_bridge/Kconfig‎

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

177177
endif # OPENTHREAD
178178

179+
if BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK
180+
181+
config WIFI_NRF70
182+
default y
183+
184+
config CHIP_WIFI
185+
default y
186+
187+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK
188+
179189
# Dummy Kconfig just to select experimental for some of the configurations.
180190
config BRIDGE_EXPERIMENTAL
181191
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/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:`CHIP_WIFI` and :kconfig:option:`WIFI_NRF70` Kconfig options, depending on the board used.
83+
Previously, :kconfig:option:`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:`CHIP_WIFI` and :kconfig:option:`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
@@ -184,7 +184,8 @@ Matter
184184
Matter fork
185185
+++++++++++
186186

187-
|no_changes_yet_note|
187+
* Removed dependencies to Nordic DK-specific configurations in Matter configurations.
188+
See the `Migration guide for nRF Connect SDK v3.2.0`_ for more information.
188189

189190
nRF IEEE 802.15.4 radio driver
190191
------------------------------

‎samples/matter/light_bulb/Kconfig‎

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

1919
endif # OPENTHREAD
2020

21+
if BOARD_NRF7002DK_NRF5340_CPUAPP
22+
23+
config WIFI_NRF70
24+
default y
25+
26+
config CHIP_WIFI
27+
default y
28+
29+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP
30+
2131
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
2232
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
2333
source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig"

‎samples/matter/light_switch/Kconfig‎

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

3434
endif # OPENTHREAD
3535

36-
if CHIP_WIFI
36+
if BOARD_NRF7002DK_NRF5340_CPUAPP
37+
38+
config WIFI_NRF70
39+
default y
40+
41+
config CHIP_WIFI
42+
default y
3743

3844
config NRF_WIFI_LOW_POWER
3945
default y
4046

41-
endif # CHIP_WIFI
47+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP
4248

4349
# Enable Read Client functionality for all build configurations.
4450
config CHIP_ENABLE_READ_CLIENT

‎samples/matter/lock/Kconfig‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,18 @@ 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 WIFI_NRF70
136+
default y
137+
138+
config CHIP_WIFI
139+
default y
134140

135141
config NRF_WIFI_LOW_POWER
136142
default y
137143

138-
endif # CHIP_WIFI
144+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK
139145

140146
config NCS_SAMPLE_MATTER_PERSISTENT_STORAGE
141147
default y

‎samples/matter/manufacturer_specific/Kconfig‎

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

1919
endif # OPENTHREAD
2020

21+
if BOARD_NRF7002DK_NRF5340_CPUAPP
22+
23+
config WIFI_NRF70
24+
default y
25+
26+
config CHIP_WIFI
27+
default y
28+
29+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP
30+
2131
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
2232
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
2333
source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig"

‎samples/matter/template/Kconfig‎

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

1919
endif # OPENTHREAD
2020

21+
if BOARD_NRF7002DK_NRF5340_CPUAPP
22+
23+
config WIFI_NRF70
24+
default y
25+
26+
config CHIP_WIFI
27+
default y
28+
29+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP
30+
2131
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
2232
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
2333
source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig"

‎samples/matter/thermostat/Kconfig‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ endchoice
4242

4343
endif # OPENTHREAD
4444

45+
if BOARD_NRF7002DK_NRF5340_CPUAPP
46+
47+
config WIFI_NRF70
48+
default y
49+
50+
config CHIP_WIFI
51+
default y
52+
53+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP
54+
4555
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
4656
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
4757
source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig"

0 commit comments

Comments
 (0)