[nrf toup] Enable SPI configuration for nRF54L.

The external flash on nRF54L DK is driven by SPI, so we need to enable appropriate drivers. Also enabled MCUMGR_GRP_IMG_ALLOW_ERASE_PENDING config that allows to overwrite the secondary slot image even if the pending flag is set on that image. Signed-off-by: Marcin Kajor <[email protected]>
nrfconnect · Jun 4, 2024 · b0acf15 · b0acf15
1 parent 0ae05f2
commit b0acf15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -204,12 +204,12 @@ config CHIP_QSPI_NOR
 
 # nRF7002DK uses SPI NOR external flash
 
-if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF54L15PDK_NRF54L15_CPUAPP
 
 config CHIP_SPI_NOR
     default y
 
-endif # BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+endif # BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF54L15PDK_NRF54L15_CPUAPP
 
 config BOOT_IMAGE_ACCESS_HOOKS
     default y if SOC_SERIES_NRF53X

diff --git a/config/nrfconnect/chip-module/Kconfig.features b/config/nrfconnect/chip-module/Kconfig.features
@@ -60,6 +60,7 @@ config CHIP_SPI_NOR
 	imply SPI_NOR
 	imply MULTITHREADING
 	imply PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
+	imply MCUMGR_GRP_IMG_ALLOW_ERASE_PENDING
 	help
 	  Enables SPI NOR flash with a set of options for configuring pages and
 	  buffer sizes.
@@ -149,7 +150,7 @@ endif
 config CHIP_DFU_OVER_BT_SMP
 	bool "Enable DFU over Bluetooth LE SMP feature set"
 	imply CHIP_QSPI_NOR if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
-	imply CHIP_SPI_NOR if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+	imply CHIP_SPI_NOR if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF54L15PDK_NRF54L15_CPUAPP
 	imply BOOTLOADER_MCUBOOT
 	select MCUMGR
 	select MCUMGR_TRANSPORT_BT