Skip to content

Commit 1afce77

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 ed4fee8 commit 1afce77

File tree

11 files changed

+58
-8
lines changed

11 files changed

+58
-8
lines changed

‎applications/matter_bridge/Kconfig‎

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

177177
endif # OPENTHREAD
178178

179+
if WIFI_NRF70
180+
181+
config CHIP_WIFI
182+
default y
183+
184+
endif # WIFI_NRF70
185+
179186
# Dummy Kconfig just to select experimental for some of the configurations.
180187
config BRIDGE_EXPERIMENTAL
181188
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 WIFI_NRF70
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 # WIFI_NRF70
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 set the :kconfig:option:`CHIP_WIFI` if the :kconfig:option:`WIFI_NRF70` Kconfig option is enabled.
83+
Previously, the :kconfig:option:`CHIP_WIFI` was set if nRF7002 DK or nRF70 EK was used wchich caused problems when building the application with custom boards.
84+
85+
To build your custom board with Wi-Fi support, set the :kconfig:option:`CHIP_WIFI` Kconfig option 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 :ref:`migration guide <migration_3.2_required>` for more information.
188189

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

‎samples/matter/light_bulb/Kconfig‎

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

1919
endif # OPENTHREAD
2020

21+
if WIFI_NRF70
22+
23+
config CHIP_WIFI
24+
default y
25+
26+
endif # WIFI_NRF70
27+
2128
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
2229
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
2330
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 WIFI_NRF70
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 # WIFI_NRF70
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 WIFI_NRF70
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 # WIFI_NRF70
139142

140143
config NCS_SAMPLE_MATTER_PERSISTENT_STORAGE
141144
default y

‎samples/matter/manufacturer_specific/Kconfig‎

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

1919
endif # OPENTHREAD
2020

21+
if WIFI_NRF70
22+
23+
config CHIP_WIFI
24+
default y
25+
26+
endif # WIFI_NRF70
27+
2128
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
2229
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
2330
source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig"

‎samples/matter/template/Kconfig‎

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

1919
endif # OPENTHREAD
2020

21+
if WIFI_NRF70
22+
23+
config CHIP_WIFI
24+
default y
25+
26+
endif # WIFI_NRF70
27+
2128
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
2229
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
2330
source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig"

‎samples/matter/thermostat/Kconfig‎

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

4343
endif # OPENTHREAD
4444

45+
if WIFI_NRF70
46+
47+
config CHIP_WIFI
48+
default y
49+
50+
endif # WIFI_NRF70
51+
4552
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
4653
source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
4754
source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig"

0 commit comments

Comments
 (0)