Skip to content

Commit ad05cad

Browse files
kkasperczyk-noArekBalysNordic
kkasperczyk-no
authored and
ArekBalysNordic
committed
samples: matter: Added support for nRF7002EBII
Added support for variants enabling Wi-Fi support for nRF54LM20A with nRF7002EB2. Signed-off-by: Kamil Kasperczyk <[email protected]>
1 parent 5375d6e commit ad05cad

File tree

21 files changed

+218
-27
lines changed

21 files changed

+218
-27
lines changed

‎applications/matter_bridge/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ endchoice
176176
endif # OPENTHREAD
177177

178178
config CHIP_WIFI
179-
default y if BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK
179+
default y if BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK || SHIELD_NRF7002EB2
180180

181181
# Dummy Kconfig just to select experimental for some of the configurations.
182182
config BRIDGE_EXPERIMENTAL

‎applications/matter_bridge/Kconfig.sysbuild‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66

7+
# This config has to be enabled manually for variants with shields, because sysbuild does not support it.
78
config WIFI_NRF70
89
default y if BOARD_NRF7002DK
910

@@ -61,8 +62,8 @@ endif # SOC_SERIES_NRF53X
6162

6263
endif # BOOTLOADER_MCUBOOT
6364

64-
# Store the Wi-Fi firmware patch on external flash by default
65-
if WIFI_NRF70
65+
# Store the Wi-Fi firmware patch on external flash by default for nRF5340 with nRF7002
66+
if WIFI_NRF70 && SOC_NRF5340_CPUAPP
6667

6768
choice WIFI_PATCHES_EXT_FLASH_SUPPORT
6869
default WIFI_PATCHES_EXT_FLASH_STORE

‎samples/matter/light_bulb/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endchoice
1919
endif # OPENTHREAD
2020

2121
config CHIP_WIFI
22-
default y if BOARD_NRF7002DK_NRF5340_CPUAPP
22+
default y if BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB2
2323

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

‎samples/matter/light_bulb/Kconfig.sysbuild‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66

7+
# This config has to be enabled manually for variants with shields, because sysbuild does not support it.
78
config WIFI_NRF70
89
default y if BOARD_NRF7002DK
910

@@ -68,8 +69,8 @@ endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK
6869

6970
endif # BOOTLOADER_MCUBOOT
7071

71-
# Store the Wi-Fi firmware patch on external flash by default
72-
if WIFI_NRF70
72+
# Store the Wi-Fi firmware patch on external flash by default for nRF5340 with nRF7002
73+
if WIFI_NRF70 && SOC_NRF5340_CPUAPP
7374

7475
choice WIFI_PATCHES_EXT_FLASH_SUPPORT
7576
default WIFI_PATCHES_EXT_FLASH_STORE

‎samples/matter/light_bulb/sample.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@ tests:
2323
- nrf54l15dk/nrf54l15/cpuapp
2424
- nrf54l15dk/nrf54l15/cpuapp/ns
2525
- nrf54lm20dk/nrf54lm20a/cpuapp
26+
sample.matter.light_bulb.nrf7002eb2.debug:
27+
sysbuild: true
28+
build_only: true
29+
extra_args:
30+
- light_bulb_SHIELD=nrf7002eb2
31+
- SB_CONFIG_WIFI_NRF70=y
32+
integration_platforms:
33+
- nrf54lm20dk/nrf54lm20a/cpuapp
34+
platform_allow:
35+
- nrf54lm20dk/nrf54lm20a/cpuapp
2636
sample.matter.light_bulb.release:
2737
sysbuild: true
2838
build_only: true
@@ -42,6 +52,19 @@ tests:
4252
- nrf7002dk/nrf5340/cpuapp
4353
- nrf54l15dk/nrf54l15/cpuapp
4454
- nrf54lm20dk/nrf54lm20a/cpuapp
55+
sample.matter.light_bulb.nrf7002eb2.release:
56+
sysbuild: true
57+
build_only: true
58+
extra_args:
59+
- FILE_SUFFIX=release
60+
- SB_CONFIG_BOOTLOADER_MCUBOOT=y
61+
- SB_CONFIG_PARTITION_MANAGER=y
62+
- light_bulb_SHIELD=nrf7002eb2
63+
- SB_CONFIG_WIFI_NRF70=y
64+
integration_platforms:
65+
- nrf54lm20dk/nrf54lm20a/cpuapp
66+
platform_allow:
67+
- nrf54lm20dk/nrf54lm20a/cpuapp
4568
sample.matter.light_bulb.ffs:
4669
sysbuild: true
4770
build_only: true
@@ -98,6 +121,19 @@ tests:
98121
- nrf54l15dk/nrf54l15/cpuapp
99122
- nrf7002dk/nrf5340/cpuapp
100123
- nrf54lm20dk/nrf54lm20a/cpuapp
124+
sample.matter.light_bulb.nrf7002eb2.memory_profiling:
125+
sysbuild: true
126+
build_only: true
127+
extra_args:
128+
- CONFIG_CHIP_MEMORY_PROFILING=y
129+
- CONFIG_SHELL_MINIMAL=y
130+
- CONFIG_CHIP_FACTORY_RESET_TIME_MEASUREMENT=y
131+
- light_bulb_SHIELD=nrf7002eb2
132+
- SB_CONFIG_WIFI_NRF70=y
133+
platform_allow:
134+
- nrf54lm20dk/nrf54lm20a/cpuapp
135+
integration_platforms:
136+
- nrf54lm20dk/nrf54lm20a/cpuapp
101137
sample.matter.light_bulb.aws:
102138
sysbuild: true
103139
build_only: true

‎samples/matter/light_switch/Kconfig‎

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

3434
endif # OPENTHREAD
3535

36-
if BOARD_NRF7002DK_NRF5340_CPUAPP
36+
if BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB2
3737

3838
config CHIP_WIFI
3939
default y
4040

4141
config NRF_WIFI_LOW_POWER
4242
default y
4343

44-
endif # BOARD_NRF7002DK_NRF5340_CPUAPP
44+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB2
4545

4646
# Enable Read Client functionality for all build configurations.
4747
config CHIP_ENABLE_READ_CLIENT

‎samples/matter/light_switch/Kconfig.sysbuild‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66

7+
# This config has to be enabled manually for variants with shields, because sysbuild does not support it.
78
config WIFI_NRF70
89
default y if BOARD_NRF7002DK
910

@@ -70,8 +71,8 @@ endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK
7071

7172
endif # BOOTLOADER_MCUBOOT
7273

73-
# Store the Wi-Fi firmware patch on external flash by default
74-
if WIFI_NRF70
74+
# Store the Wi-Fi firmware patch on external flash by default for nRF5340 with nRF7002
75+
if WIFI_NRF70 && SOC_NRF5340_CPUAPP
7576

7677
choice WIFI_PATCHES_EXT_FLASH_SUPPORT
7778
default WIFI_PATCHES_EXT_FLASH_STORE

‎samples/matter/light_switch/sample.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@ tests:
2323
- nrf54l15dk/nrf54l15/cpuapp
2424
- nrf54l15dk/nrf54l15/cpuapp/ns
2525
- nrf54lm20dk/nrf54lm20a/cpuapp
26+
sample.matter.light_switch.nrf7002eb2.debug:
27+
sysbuild: true
28+
build_only: true
29+
extra_args:
30+
- light_switch_SHIELD=nrf7002eb2
31+
- SB_CONFIG_WIFI_NRF70=y
32+
integration_platforms:
33+
- nrf54lm20dk/nrf54lm20a/cpuapp
34+
platform_allow:
35+
- nrf54lm20dk/nrf54lm20a/cpuapp
2636
sample.matter.light_switch.release:
2737
sysbuild: true
2838
build_only: true
@@ -42,6 +52,19 @@ tests:
4252
- nrf7002dk/nrf5340/cpuapp
4353
- nrf54l15dk/nrf54l15/cpuapp
4454
- nrf54lm20dk/nrf54lm20a/cpuapp
55+
sample.matter.light_switch.nrf7002eb2.release:
56+
sysbuild: true
57+
build_only: true
58+
extra_args:
59+
- FILE_SUFFIX=release
60+
- SB_CONFIG_BOOTLOADER_MCUBOOT=y
61+
- SB_CONFIG_PARTITION_MANAGER=y
62+
- light_switch_SHIELD=nrf7002eb2
63+
- SB_CONFIG_WIFI_NRF70=y
64+
integration_platforms:
65+
- nrf54lm20dk/nrf54lm20a/cpuapp
66+
platform_allow:
67+
- nrf54lm20dk/nrf54lm20a/cpuapp
4568
sample.matter.light_switch.lit_icd:
4669
sysbuild: true
4770
build_only: true

‎samples/matter/lock/Kconfig‎

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

131131
endif # OPENTHREAD
132132

133-
if BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK
133+
if BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK || SHIELD_NRF7002EB2
134134

135135
config CHIP_WIFI
136136
default y
137137

138138
config NRF_WIFI_LOW_POWER
139139
default y
140140

141-
endif # BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK
141+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EK || SHIELD_NRF7002EB2
142142

143143
config NCS_SAMPLE_MATTER_PERSISTENT_STORAGE
144144
default y

‎samples/matter/lock/Kconfig.sysbuild‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66

7+
# This config has to be enabled manually for variants with shields, because sysbuild does not support it.
78
config WIFI_NRF70
89
default y if BOARD_NRF7002DK
910

@@ -70,8 +71,8 @@ endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK
7071

7172
endif # BOOTLOADER_MCUBOOT
7273

73-
# Store the Wi-Fi firmware patch on external flash by default
74-
if WIFI_NRF70
74+
# Store the Wi-Fi firmware patch on external flash by default for nRF5340 with nRF7002
75+
if WIFI_NRF70 && SOC_NRF5340_CPUAPP
7576

7677
choice WIFI_PATCHES_EXT_FLASH_SUPPORT
7778
default WIFI_PATCHES_EXT_FLASH_STORE

0 commit comments

Comments
 (0)