Skip to content

[nrf toup] [nrfconnect] Remove dependency to DK in Matter configuration #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2025
Merged

[nrf toup] [nrfconnect] Remove dependency to DK in Matter configuration #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/nrfconnect/chip-module/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why have you removed selecting WI_FI symbols? Isn't better to have single Kconfig that selects all what we need?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those symbols are not needed here anymore, I will try to leave WIFI_NRF70 here and set CHIP_WIFI in samples.

select WIFI
select WIFI_NM_WPA_SUPPLICANT
select NETWORKING
imply NORDIC_SECURITY_BACKEND
imply MBEDTLS_ENTROPY_C
imply MBEDTLS_PSA_CRYPTO_C
Expand All @@ -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"
Expand Down
19 changes: 3 additions & 16 deletions config/nrfconnect/chip-module/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -290,7 +277,7 @@ endif # NET_L2_OPENTHREAD
# ==============================================================================

config OPENTHREAD
default y if !WIFI_NRF70
default y if !CHIP_WIFI

if OPENTHREAD

Expand All @@ -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
Expand Down
8 changes: 2 additions & 6 deletions config/nrfconnect/chip-module/Kconfig.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading