Skip to content

Commit 48cd642

Browse files
ArekBalysNordicArekBalysNordic
committed
samples: matter: Add missing Kconfig for WiFi Patch
In some samples there were missing configs that enables storing Wi-Fi firmware patch in external flash memory. Signed-off-by: Arkadiusz Balys <[email protected]>
1 parent a3b8136 commit 48cd642

File tree

8 files changed

+114
-38
lines changed

8 files changed

+114
-38
lines changed

‎applications/matter_bridge/Kconfig.sysbuild‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ config NETCORE_APP_UPDATE
5757
config DFU_MULTI_IMAGE_PACKAGE_NET
5858
default y
5959

60+
endif # SOC_SERIES_NRF53X
61+
62+
endif # BOOTLOADER_MCUBOOT
63+
6064
# Store the Wi-Fi firmware patch on external flash by default
6165
if WIFI_NRF70
6266

@@ -70,10 +74,6 @@ config DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH
7074

7175
endif # WIFI_NRF70
7276

73-
endif # SOC_SERIES_NRF53X
74-
75-
endif # BOOTLOADER_MCUBOOT
76-
7777
#### Enable generating factory data
7878
config MATTER_FACTORY_DATA_GENERATE
7979
default y

‎samples/matter/light_bulb/Kconfig.sysbuild‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,15 @@ config NETCORE_APP_UPDATE
5858
config DFU_MULTI_IMAGE_PACKAGE_NET
5959
default y
6060

61+
if BOARD_NRF54L15DK
62+
63+
config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
64+
default y
65+
66+
endif # BOARD_NRF54L15DK
67+
68+
endif # BOOTLOADER_MCUBOOT
69+
6170
# Store the Wi-Fi firmware patch on external flash by default
6271
if WIFI_NRF70
6372

@@ -73,15 +82,6 @@ endif # WIFI_NRF70
7382

7483
endif # SOC_SERIES_NRF53X
7584

76-
if BOARD_NRF54L15DK
77-
78-
config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
79-
default y
80-
81-
endif # BOARD_NRF54L15DK
82-
83-
endif # BOOTLOADER_MCUBOOT
84-
8585
#### Enable generating factory data
8686
config MATTER_FACTORY_DATA_GENERATE
8787
default y if !BOARD_NRF21540DK

‎samples/matter/light_switch/Kconfig.sysbuild‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,19 @@ endif # BOARD_NRF54L15DK
6969

7070
endif # BOOTLOADER_MCUBOOT
7171

72+
# Store the Wi-Fi firmware patch on external flash by default
73+
if WIFI_NRF70
74+
75+
choice WIFI_PATCHES_EXT_FLASH_SUPPORT
76+
default WIFI_PATCHES_EXT_FLASH_STORE
77+
78+
endchoice
79+
80+
config DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH
81+
default y
82+
83+
endif # WIFI_NRF70
84+
7285
#### Enable generating factory data
7386
config MATTER_FACTORY_DATA_GENERATE
7487
default y if !BOARD_NRF21540DK

‎samples/matter/lock/Kconfig.sysbuild‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,19 @@ endif # BOARD_NRF54L15DK
6969

7070
endif # BOOTLOADER_MCUBOOT
7171

72+
# Store the Wi-Fi firmware patch on external flash by default
73+
if WIFI_NRF70
74+
75+
choice WIFI_PATCHES_EXT_FLASH_SUPPORT
76+
default WIFI_PATCHES_EXT_FLASH_STORE
77+
78+
endchoice
79+
80+
config DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH
81+
default y
82+
83+
endif # WIFI_NRF70
84+
7285
#### Enable generating factory data
7386
config MATTER_FACTORY_DATA_GENERATE
7487
default y if !BOARD_NRF21540DK

‎samples/matter/lock/pm_static_nrf7002dk_nrf5340_cpuapp_nrf7001.yml‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
mcuboot:
22
address: 0x0
3-
size: 0xC000
3+
size: 0x8000
44
region: flash_primary
55
mcuboot_pad:
6-
address: 0xC000
6+
address: 0x8000
77
size: 0x200
88
app:
9-
address: 0xC200
10-
size: 0xeae00
9+
address: 0x8200
10+
size: 0xeee00
1111
mcuboot_primary:
1212
orig_span: &id001
1313
- mcuboot_pad
1414
- app
1515
span: *id001
16-
address: 0xC000
17-
size: 0xeb000
16+
address: 0x8000
17+
size: 0xef000
1818
region: flash_primary
1919
mcuboot_primary_app:
2020
orig_span: &id002
2121
- app
2222
span: *id002
23-
address: 0xC200
24-
size: 0xeae00
23+
address: 0x8200
24+
size: 0xeee00
2525
factory_data:
2626
address: 0xf7000
2727
size: 0x1000
@@ -37,17 +37,41 @@ mcuboot_primary_1:
3737
region: ram_flash
3838
mcuboot_secondary:
3939
address: 0x0
40-
size: 0xeb000
40+
size: 0xef000
4141
device: MX25R64
4242
region: external_flash
4343
mcuboot_secondary_1:
44-
address: 0xeb000
44+
address: 0xef000
4545
size: 0x40000
4646
device: MX25R64
4747
region: external_flash
48+
nrf70_wifi_fw_mcuboot_pad:
49+
address: 0x12F000
50+
size: 0x200
51+
device: MX25R64
52+
region: external_flash
53+
nrf70_wifi_fw:
54+
address: 0x12F200
55+
size: 0x20000
56+
device: MX25R64
57+
region: external_flash
58+
mcuboot_primary_2:
59+
orig_span: &id003
60+
- nrf70_wifi_fw_mcuboot_pad
61+
- nrf70_wifi_fw
62+
span: *id003
63+
address: 0x12F000
64+
size: 0x21000
65+
device: MX25R64
66+
region: external_flash
67+
mcuboot_secondary_2:
68+
address: 0x150000
69+
size: 0x21000
70+
device: MX25R64
71+
region: external_flash
4872
external_flash:
49-
address: 0x12b000
50-
size: 0x6D5000
73+
address: 0x171000
74+
size: 0x68F000
5175
device: MX25R64
5276
region: external_flash
5377
pcd_sram:

‎samples/matter/manufacturer_specific/Kconfig.sysbuild‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,19 @@ endif # SOC_NRF54L10
7777

7878
endif # BOOTLOADER_MCUBOOT
7979

80+
# Store the Wi-Fi firmware patch on external flash by default
81+
if WIFI_NRF70
82+
83+
choice WIFI_PATCHES_EXT_FLASH_SUPPORT
84+
default WIFI_PATCHES_EXT_FLASH_STORE
85+
86+
endchoice
87+
88+
config DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH
89+
default y
90+
91+
endif # WIFI_NRF70
92+
8093
#### Enable generating factory data
8194
config MATTER_FACTORY_DATA_GENERATE
8295
default y

‎samples/matter/template/Kconfig.sysbuild‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,6 @@ config NETCORE_APP_UPDATE
5858
config DFU_MULTI_IMAGE_PACKAGE_NET
5959
default y
6060

61-
# Store the Wi-Fi firmware patch on external flash by default
62-
if WIFI_NRF70
63-
64-
choice WIFI_PATCHES_EXT_FLASH_SUPPORT
65-
default WIFI_PATCHES_EXT_FLASH_STORE
66-
67-
endchoice
68-
69-
config DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH
70-
default y
71-
72-
endif # WIFI_NRF70
73-
7461
endif # SOC_SERIES_NRF53X
7562

7663
if (BOARD_NRF54L15DK || BOARD_NRF54LM20DK)
@@ -90,6 +77,19 @@ endif # SOC_NRF54L10
9077

9178
endif # BOOTLOADER_MCUBOOT
9279

80+
# Store the Wi-Fi firmware patch on external flash by default
81+
if WIFI_NRF70
82+
83+
choice WIFI_PATCHES_EXT_FLASH_SUPPORT
84+
default WIFI_PATCHES_EXT_FLASH_STORE
85+
86+
endchoice
87+
88+
config DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH
89+
default y
90+
91+
endif # WIFI_NRF70
92+
9393
#### Enable generating factory data
9494
config MATTER_FACTORY_DATA_GENERATE
9595
default y if !BOARD_NRF21540DK

‎samples/matter/thermostat/Kconfig.sysbuild‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,17 @@ endif # BOOTLOADER_MCUBOOT
7373
config MATTER_FACTORY_DATA_GENERATE
7474
default y
7575

76+
# Store the Wi-Fi firmware patch on external flash by default
77+
if WIFI_NRF70
78+
79+
choice WIFI_PATCHES_EXT_FLASH_SUPPORT
80+
default WIFI_PATCHES_EXT_FLASH_STORE
81+
82+
endchoice
83+
84+
config DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH
85+
default y
86+
87+
endif # WIFI_NRF70
88+
7689
source "share/sysbuild/Kconfig"

0 commit comments

Comments
 (0)