Skip to content

Commit e64e2eb

Browse files
[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 <[email protected]>
1 parent 4031bf3 commit e64e2eb

File tree

3 files changed

+7
-23
lines changed

3 files changed

+7
-23
lines changed

config/nrfconnect/chip-module/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,10 +462,10 @@ config CHIP_SYSTEM_PACKETBUFFER_POOL_SIZE
462462

463463
config CHIP_WIFI
464464
bool "Enable nrfconnect Wi-Fi support"
465-
default y if SHIELD_NRF7002EK || BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
466465
select WIFI_NRF70
467466
select WIFI
468467
select WIFI_NM_WPA_SUPPLICANT
468+
select NETWORKING
469469
imply NORDIC_SECURITY_BACKEND
470470
imply MBEDTLS_ENTROPY_C
471471
imply MBEDTLS_PSA_CRYPTO_C
@@ -480,6 +480,7 @@ config CHIP_WIFI
480480
imply NET_IPV6_NBR_CACHE
481481
imply NET_STATISTICS_IPV6
482482
imply NET_STATISTICS_USER_API
483+
imply NET_CONFIG_NEED_IPV6
483484

484485
config CHIP_IM_PRETTY_PRINT
485486
bool "Enable detailed logging of Matter messages"

config/nrfconnect/chip-module/Kconfig.defaults

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -244,19 +244,6 @@ config NFC_THREAD_CALLBACK
244244
config CHIP_OTA_REQUESTOR
245245
default y
246246

247-
# All boards except nRF7002DK use QSPI NOR external flash
248-
config CHIP_QSPI_NOR
249-
default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
250-
251-
# nRF7002DK uses SPI NOR external flash
252-
253-
if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || BOARD_NRF54L15DK || BOARD_NRF54LM20DK
254-
255-
config CHIP_SPI_NOR
256-
default y
257-
258-
endif # BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || BOARD_NRF54L15DK || BOARD_NRF54LM20DK
259-
260247
config BOOT_IMAGE_ACCESS_HOOKS
261248
default y if SOC_SERIES_NRF53X
262249

@@ -275,7 +262,7 @@ config NRF_WIFI_FW_PATCH_DFU
275262
# ==============================================================================
276263

277264
config NET_L2_OPENTHREAD
278-
default y if !WIFI_NRF70 && NETWORKING
265+
default y if !CHIP_WIFI && NETWORKING
279266

280267
if NET_L2_OPENTHREAD
281268

@@ -290,7 +277,7 @@ endif # NET_L2_OPENTHREAD
290277
# ==============================================================================
291278

292279
config OPENTHREAD
293-
default y if !WIFI_NRF70
280+
default y if !CHIP_WIFI
294281

295282
if OPENTHREAD
296283

@@ -306,7 +293,7 @@ config OPENTHREAD_DEFAULT_TX_POWER
306293
endif # OPENTHREAD
307294

308295
config CHIP_USE_ZEPHYR_NETWORKING
309-
default n if !CHIP_WIFI
296+
default n
310297

311298
# ==============================================================================
312299
# ICD configuration

config/nrfconnect/chip-module/Kconfig.features

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if CHIP
2121

2222
config CHIP_QSPI_NOR
2323
bool "Enable QSPI NOR feature set"
24-
imply NORDIC_QSPI_NOR
24+
default y if NORDIC_QSPI_NOR
2525
help
2626
Enables QSPI NOR flash with a set of options for configuring pages and
2727
buffer sizes.
@@ -35,9 +35,7 @@ endif # CHIP_QSPI_NOR
3535

3636
config CHIP_SPI_NOR
3737
bool "Enable SPI NOR feature set"
38-
imply SPI
39-
imply SPI_NOR
40-
imply MULTITHREADING
38+
default y if SPI_NOR
4139
imply PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
4240
imply MCUMGR_GRP_IMG_ALLOW_ERASE_PENDING
4341
help
@@ -130,8 +128,6 @@ endif
130128

131129
config CHIP_DFU_OVER_BT_SMP
132130
bool "Enable DFU over Bluetooth LE SMP feature set"
133-
imply CHIP_QSPI_NOR if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
134-
imply CHIP_SPI_NOR if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || BOARD_NRF54L15DK || BOARD_NRF54LM20DK
135131
imply BOOTLOADER_MCUBOOT
136132
select MCUMGR
137133
select MCUMGR_TRANSPORT_BT

0 commit comments

Comments
 (0)