[nrf noup] Adapt Matter SDK to te WiFi FW patch on external flash

This commit sets the default kconfigs if the WiFi FW patch on external flash is enabled.
nrfconnect · Feb 20, 2024 · c847afe · c847afe
1 parent c36fcaf
commit c847afe
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -205,9 +205,18 @@ config CHIP_SPI_NOR
 config BOOT_IMAGE_ACCESS_HOOKS
     default y if SOC_SERIES_NRF53X
 
+choice NRF_WIFI_PATCHES_EXT_FLASH_SUPPORT
+	default NRF_WIFI_PATCHES_EXT_FLASH_STORE if CHIP_WIFI_PATCHES_EXT_FLASH_STORE
+
+endchoice
+
 config UPDATEABLE_IMAGE_NUMBER
+    default 3 if CHIP_WIFI_PATCHES_EXT_FLASH_STORE
     default 2 if SOC_SERIES_NRF53X
 
+config DFU_MULTI_IMAGE_MAX_IMAGE_COUNT
+    default 3 if CHIP_WIFI_PATCHES_EXT_FLASH_STORE
+
 # ==============================================================================
 # OpenThread configuration
 # ==============================================================================

diff --git a/config/nrfconnect/chip-module/Kconfig.features b/config/nrfconnect/chip-module/Kconfig.features
@@ -207,6 +207,9 @@ config MCUMGR_GRP_ZBASIC
 config MCUMGR_GRP_ZBASIC_STORAGE_ERASE
 	default y
 
+config NRF_WIFI_FW_PATCH_DFU
+	default y if NRF_WIFI_PATCHES_EXT_FLASH_STORE
+
 endif # SOC_SERIES_NRF53X
 
 endif # CHIP_DFU_OVER_BT_SMP
@@ -290,4 +293,14 @@ config CHIP_LAST_FABRIC_REMOVED_ACTION_DELAY
 	  an action chosen by the CHIP_LAST_FABRIC_REMOVED_ACTION option. This schedule will allow for
 	  avoiding race conditions before the device removes non-volatile data.
 
+config CHIP_WIFI_PATCHES_EXT_FLASH_STORE
+    bool "Store nRF700x FW patches in external memory"
+	depends on SHIELD_NRF7002EK
+	depends on SOC_SERIES_NRF53X
+	depends on !BOARD_NRF7002DK_NRF5340_CPUAPP
+	imply NRF_WIFI_FW_PATCH_DFU
+    help
+      Helper for enabling the 3rd partition in mcuboot image when WiFi firmware patch 
+      is stored in the external memory
+
 endif # CHIP
diff --git a/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults b/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults
@@ -16,6 +16,14 @@
 
 # The purpose of this file is to define new default values of settings used when building mcuboot child image for Matter samples.
 
+config CHIP_WIFI_PATCHES_EXT_FLASH_STORE
+    bool "Store nRF700x FW patches in external memory"
+	depends on SOC_SERIES_NRF53X
+	depends on !BOARD_NRF7002DK_NRF5340_CPUAPP
+    help
+      Helper for enabling the 3rd partition in mcuboot image when WiFi firmware patch 
+      is stored in the external memory
+
 config MAIN_STACK_SIZE
     default 10240
 
@@ -122,8 +130,12 @@ config PCD_APP
     default y
 
 config UPDATEABLE_IMAGE_NUMBER
+    default 3 if CHIP_WIFI_PATCHES_EXT_FLASH_STORE
     default 2
 
+config MCUBOOT_VERIFY_IMG_ADDRESS
+    default n if CHIP_WIFI_PATCHES_EXT_FLASH_STORE
+
 # Multi-image updates do not support image swapping yet.
 choice BOOT_IMAGE_UPGRADE_MODE
     default BOOT_UPGRADE_ONLY