From 42444916624edbfcdf8c0694aae03600d9cd2633 Mon Sep 17 00:00:00 2001 From: Maciej Baczmanski Date: Wed, 4 Dec 2024 13:59:37 +0100 Subject: [PATCH] [nrf toup] [nrfconnect] Change `CHIP_SPI_NOR` config dependency Set `CHIP_SPI_NOR` to y for all targets that are built for nRF54L15DK, regardless of target SoC. Signed-off-by: Maciej Baczmanski --- config/nrfconnect/chip-module/Kconfig.defaults | 4 ++-- config/nrfconnect/chip-module/Kconfig.features | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults index babf93da7c..3fc3381a3b 100644 --- a/config/nrfconnect/chip-module/Kconfig.defaults +++ b/config/nrfconnect/chip-module/Kconfig.defaults @@ -207,12 +207,12 @@ config CHIP_QSPI_NOR # nRF7002DK uses SPI NOR external flash -if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS +if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF54L15DK config CHIP_SPI_NOR default y -endif # BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS +endif # BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF54L15DK 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 index 299be9b89f..350e67caaa 100644 --- a/config/nrfconnect/chip-module/Kconfig.features +++ b/config/nrfconnect/chip-module/Kconfig.features @@ -152,7 +152,7 @@ config CHIP_DFU_OVER_BT_SMP bool "Enable DFU over Bluetooth LE SMP feature set" depends on !CHIP_BOOTLOADER_NONE 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 || BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS + imply CHIP_SPI_NOR if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP || BOARD_NRF54L15DK select CHIP_DFU_LIBRARY_MCUMGR select MCUMGR_TRANSPORT_BT # Enable custom SMP request to erase settings partition.