From 1db3ebb980299533c836224831f4c8ecf5f2484d Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Tue, 30 Sep 2025 12:54:27 +0200 Subject: [PATCH] [nrf toup] [nrfconnect] Remove dependency to DK in Matter configuration In Matter configuration there must not be anything related to DK. All DK-related Kconfigs must be defined in the application. Signed-off-by: Arkadiusz Balys --- config/nrfconnect/chip-module/Kconfig | 3 ++- .../nrfconnect/chip-module/Kconfig.defaults | 19 +++---------------- .../nrfconnect/chip-module/Kconfig.features | 8 ++------ 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/config/nrfconnect/chip-module/Kconfig b/config/nrfconnect/chip-module/Kconfig index a2b36e335d..633a51441e 100644 --- a/config/nrfconnect/chip-module/Kconfig +++ b/config/nrfconnect/chip-module/Kconfig @@ -462,10 +462,10 @@ config CHIP_SYSTEM_PACKETBUFFER_POOL_SIZE config CHIP_WIFI bool "Enable nrfconnect Wi-Fi support" - default y if SHIELD_NRF7002EK || BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 select WIFI_NRF70 select WIFI select WIFI_NM_WPA_SUPPLICANT + select NETWORKING imply NORDIC_SECURITY_BACKEND imply MBEDTLS_ENTROPY_C imply MBEDTLS_PSA_CRYPTO_C @@ -480,6 +480,7 @@ config CHIP_WIFI imply NET_IPV6_NBR_CACHE imply NET_STATISTICS_IPV6 imply NET_STATISTICS_USER_API + imply NET_CONFIG_NEED_IPV6 config CHIP_IM_PRETTY_PRINT bool "Enable detailed logging of Matter messages" diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults index d3157eb1ec..97fdac397c 100644 --- a/config/nrfconnect/chip-module/Kconfig.defaults +++ b/config/nrfconnect/chip-module/Kconfig.defaults @@ -244,19 +244,6 @@ config NFC_THREAD_CALLBACK config CHIP_OTA_REQUESTOR default y -# All boards except nRF7002DK use QSPI NOR external flash -config CHIP_QSPI_NOR - default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840 - -# nRF7002DK uses SPI NOR external flash - -if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || BOARD_NRF54L15DK || BOARD_NRF54LM20DK - -config CHIP_SPI_NOR - default y - -endif # BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || BOARD_NRF54L15DK || BOARD_NRF54LM20DK - config BOOT_IMAGE_ACCESS_HOOKS default y if SOC_SERIES_NRF53X @@ -275,7 +262,7 @@ config NRF_WIFI_FW_PATCH_DFU # ============================================================================== config NET_L2_OPENTHREAD - default y if !WIFI_NRF70 && NETWORKING + default y if !CHIP_WIFI && NETWORKING if NET_L2_OPENTHREAD @@ -290,7 +277,7 @@ endif # NET_L2_OPENTHREAD # ============================================================================== config OPENTHREAD - default y if !WIFI_NRF70 + default y if !CHIP_WIFI if OPENTHREAD @@ -306,7 +293,7 @@ config OPENTHREAD_DEFAULT_TX_POWER endif # OPENTHREAD config CHIP_USE_ZEPHYR_NETWORKING - default n if !CHIP_WIFI + default n # ============================================================================== # ICD configuration diff --git a/config/nrfconnect/chip-module/Kconfig.features b/config/nrfconnect/chip-module/Kconfig.features index c4ed5f9e04..4942c0dade 100644 --- a/config/nrfconnect/chip-module/Kconfig.features +++ b/config/nrfconnect/chip-module/Kconfig.features @@ -21,7 +21,7 @@ if CHIP config CHIP_QSPI_NOR bool "Enable QSPI NOR feature set" - imply NORDIC_QSPI_NOR + default y if NORDIC_QSPI_NOR help Enables QSPI NOR flash with a set of options for configuring pages and buffer sizes. @@ -35,9 +35,7 @@ endif # CHIP_QSPI_NOR config CHIP_SPI_NOR bool "Enable SPI NOR feature set" - imply SPI - imply SPI_NOR - imply MULTITHREADING + default y if SPI_NOR imply PM_OVERRIDE_EXTERNAL_DRIVER_CHECK imply MCUMGR_GRP_IMG_ALLOW_ERASE_PENDING help @@ -130,8 +128,6 @@ 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_NRF5340_CPUAPP_NRF7001 || BOARD_NRF54L15DK || BOARD_NRF54LM20DK imply BOOTLOADER_MCUBOOT select MCUMGR select MCUMGR_TRANSPORT_BT