Skip to content

[nrf toup][nrfconnect] Align OpenThread Kconfigs with Zephyr changes #611

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
rlubos merged 2 commits into from
May 19, 2025
Merged

[nrf toup][nrfconnect] Align OpenThread Kconfigs with Zephyr changes #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f55d4b
[nrf toup][nrfconnect] Align OpenThread Kconfigs with Zephyr changes
adigie May 16, 2025
21c33d2
[nrf toup][nrfconnect] Remove config CHIP_OPENTHREAD_JOINER_ENABLED
adigie May 16, 2025
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
6 changes: 3 additions & 3 deletions config/nrfconnect/chip-module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ matter_add_gn_arg_string("zephyr_cc" ${CMAKE_C_COMP
matter_add_gn_arg_string("zephyr_cxx" ${CMAKE_CXX_COMPILER})
matter_add_gn_arg_string("chip_app_zap_dir" ${CHIP_APP_ZAP_DIR})
matter_add_gn_arg_bool ("chip_logging" CONFIG_LOG)
matter_add_gn_arg_bool ("chip_enable_openthread" CONFIG_NET_L2_OPENTHREAD)
matter_add_gn_arg_bool ("chip_enable_openthread" CONFIG_OPENTHREAD)
matter_add_gn_arg_bool ("chip_openthread_ftd" CONFIG_OPENTHREAD_FTD)
matter_add_gn_arg_bool ("chip_config_network_layer_ble" CONFIG_BT)
matter_add_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_CHIP_IPV4)
Expand All @@ -167,7 +167,7 @@ matter_add_gn_arg_bool ("chip_enable_icd_server" CONFIG_CHIP_EN
matter_add_gn_arg_bool ("chip_enable_factory_data" CONFIG_CHIP_FACTORY_DATA)
matter_add_gn_arg_bool ("chip_enable_read_client" CONFIG_CHIP_ENABLE_READ_CLIENT)
matter_add_gn_arg_bool ("chip_mdns_minimal" CONFIG_WIFI_NRF70)
matter_add_gn_arg_bool ("chip_mdns_platform" CONFIG_NET_L2_OPENTHREAD)
matter_add_gn_arg_bool ("chip_mdns_platform" CONFIG_OPENTHREAD)

if (CONFIG_CHIP_ENABLE_ICD_SUPPORT)
matter_add_gn_arg_bool ("chip_enable_icd_lit" CONFIG_CHIP_ICD_LIT_SUPPORT)
Expand All @@ -189,7 +189,7 @@ endif()

if(CONFIG_WIFI_NRF70)
matter_add_gn_arg_string("chip_mdns" "minimal")
elseif (CONFIG_NET_L2_OPENTHREAD)
elseif (CONFIG_OPENTHREAD)
matter_add_gn_arg_string("chip_mdns" "platform")
else()
matter_add_gn_arg_string("chip_mdns" "none")
Expand Down
9 changes: 0 additions & 9 deletions config/nrfconnect/chip-module/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,6 @@ config CHIP_IPV4
with IPv4 support independently of the Matter stack still
running over IPv6.

config CHIP_OPENTHREAD_JOINER_ENABLED
Copy link
Copy Markdown
Collaborator

@LuDuda LuDuda May 16, 2025

Choose a reason for hiding this comment

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

👍

bool "Specify whether the Thread Joiner functionality is used when it is enabled"
default n
depends on NET_L2_OPENTHREAD
depends on OPENTHREAD_JOINER
help
If disabled, it allows to optimize memory usage even if Thread Joiner
support is enabled.

config CHIP_ENABLE_READ_CLIENT
bool "Enable Read Client in the Interaction Model"
help
Expand Down
21 changes: 18 additions & 3 deletions config/nrfconnect/chip-module/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ config HEAP_MEM_POOL_IGNORE_MIN

config CHIP_MALLOC_SYS_HEAP_SIZE
default 10240 if SOC_SERIES_NRF54LX # nRF54L requires more memory due to crypto backend
default 8192 if NET_L2_OPENTHREAD
default 8192 if OPENTHREAD

config MPSL_WORK_STACK_SIZE
default 2048 if SOC_SERIES_NRF54LX # nRF54L requires more memory due to crypto backend
Expand Down Expand Up @@ -104,6 +104,8 @@ endif # MPSL
# Zephyr networking configuration
# ==============================================================================

if NETWORKING

config NET_IPV6_MLD
default y

Expand Down Expand Up @@ -135,6 +137,8 @@ config NET_BUF_TX_COUNT
config NET_SOCKETS_POLL_MAX
default 6 if CHIP_WIFI

endif # NETWORKING

# ==============================================================================
# Bluetooth Low Energy configuration
# ==============================================================================
Expand Down Expand Up @@ -260,7 +264,7 @@ config NRF_WIFI_FW_PATCH_DFU
default y if NRF_WIFI_PATCHES_EXT_FLASH_STORE

# ==============================================================================
# OpenThread configuration
# OpenThread L2 configuration
# ==============================================================================

config NET_L2_OPENTHREAD
Expand All @@ -272,6 +276,17 @@ if NET_L2_OPENTHREAD
config IEEE802154_NRF5_RX_STACK_SIZE
default 1024

endif # NET_L2_OPENTHREAD
Copy link
Copy Markdown
Collaborator

@LuDuda LuDuda May 16, 2025

Choose a reason for hiding this comment

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

Should we change line 271:

default y if !WIFI_NRF70
to
default y if OPENTHREAD

Copy link
Copy Markdown
Member Author

@adigie adigie May 16, 2025

Choose a reason for hiding this comment

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

Currently OPENTHREAD is selected by NET_L2_OPENTHREAD so no.
We can change this when we switch to the new radio implementation.


# ==============================================================================
# OpenThread configuration
# ==============================================================================

config OPENTHREAD
default y if !WIFI_NRF70

if OPENTHREAD

config OPENTHREAD_THREAD_STACK_SIZE
default 6144 if (PSA_CRYPTO_DRIVER_CC3XX && PSA_CRYPTO_DRIVER_OBERON) || PSA_CRYPTO_DRIVER_CRACEN
default 4096
Expand All @@ -281,7 +296,7 @@ config OPENTHREAD_DEFAULT_TX_POWER
default 3 if SOC_SERIES_NRF53X
default 8 if SOC_SERIES_NRF52X || SOC_SERIES_NRF54LX

endif # NET_L2_OPENTHREAD
endif # OPENTHREAD

# ==============================================================================
# Wi-Fi configuration
Expand Down
8 changes: 4 additions & 4 deletions config/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ config CHIP_PROJECT_CONFIG
config CHIP_ENABLE_DNSSD_SRP
bool "OpenThread Service Registration Protocol"
default y
depends on NET_L2_OPENTHREAD
depends on OPENTHREAD
imply OPENTHREAD_ECDSA
imply OPENTHREAD_SRP_CLIENT
help
Expand All @@ -339,15 +339,15 @@ config CHIP_ENABLE_DNSSD_SRP
config CHIP_ENABLE_DNS_CLIENT
bool "OpenThread DNS client"
default y
depends on NET_L2_OPENTHREAD
depends on OPENTHREAD
imply OPENTHREAD_DNS_CLIENT
help
Enables using the OpenThread DNS client for the Matter service discovery.

config CHIP_ENABLE_ICD_SUPPORT
bool "Matter Intermittently Connected Devices support"
default n
imply OPENTHREAD_MTD_SED if NET_L2_OPENTHREAD
imply OPENTHREAD_MTD_SED if OPENTHREAD
help
Enables the Intermittently Connected Device (ICD) support in Matter.

Expand Down Expand Up @@ -456,7 +456,7 @@ config CHIP_THREAD_SSED

config CHIP_OPENTHREAD_CONFIG
string "Custom OpenThread configuration file"
depends on NET_L2_OPENTHREAD
depends on OPENTHREAD
help
Provides a path to an OpenThread configuration file. The path can be
either absolute or relative to the application directory. When this option
Expand Down
6 changes: 3 additions & 3 deletions config/zephyr/chip-module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ if(CONFIG_CHIP)
matter_add_gn_arg_bool("chip_progress_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 3)
matter_add_gn_arg_bool("chip_detail_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 4)
matter_add_gn_arg_bool("chip_automation_logging" FALSE)
matter_add_gn_arg_bool("chip_enable_openthread" CONFIG_NET_L2_OPENTHREAD)
matter_add_gn_arg_bool("chip_enable_openthread" CONFIG_OPENTHREAD)
Copy link
Copy Markdown
Collaborator

@LuDuda LuDuda May 16, 2025

Choose a reason for hiding this comment

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

It will take some time after we would be able to upstream it I guess (due to TLink or others)..

Copy link
Copy Markdown
Member Author

@adigie adigie May 16, 2025

Choose a reason for hiding this comment

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

It should work the same, as NET_L2_OPENTHREAD selects OPENTHREAD.

matter_add_gn_arg_bool("chip_openthread_ftd" CONFIG_OPENTHREAD_FTD)
matter_add_gn_arg_bool("chip_inet_config_enable_ipv4" CONFIG_CHIP_IPV4)
matter_add_gn_arg_bool("chip_enable_wifi" CONFIG_WIFI)
matter_add_gn_arg_bool("chip_config_network_layer_ble" CONFIG_BT)
matter_add_gn_arg_bool("chip_mdns_minimal" CONFIG_WIFI)
matter_add_gn_arg_bool("chip_mdns_minimal" CONFIG_NET_L2_ETHERNET)
matter_add_gn_arg_bool("chip_mdns_platform" CONFIG_NET_L2_OPENTHREAD)
matter_add_gn_arg_bool("chip_mdns_platform" CONFIG_OPENTHREAD)
matter_add_gn_arg_bool("chip_inet_config_enable_tcp_endpoint" CONFIG_CHIP_BUILD_TESTS)
matter_add_gn_arg_bool("chip_malloc_sys_heap" CONFIG_CHIP_MALLOC_SYS_HEAP)
matter_add_gn_arg_bool("chip_inet_config_enable_tcp_endpoint" FALSE)
Expand All @@ -122,7 +122,7 @@ if(CONFIG_CHIP)
matter_add_gn_arg_string("chip_mdns" "minimal")
elseif(CONFIG_NET_L2_ETHERNET)
matter_add_gn_arg_string("chip_mdns" "minimal")
elseif(CONFIG_NET_L2_OPENTHREAD)
elseif(CONFIG_OPENTHREAD)
matter_add_gn_arg_string("chip_mdns" "platform")
else()
matter_add_gn_arg_string("chip_mdns" "none")
Expand Down
4 changes: 2 additions & 2 deletions examples/all-clusters-app/nrfconnect/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ config STATE_LEDS
the device into a network or the factory reset initiation.

# Sample configuration used for Thread networking
if NET_L2_OPENTHREAD
if OPENTHREAD

choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
default OPENTHREAD_NORDIC_LIBRARY_MTD
Expand All @@ -33,7 +33,7 @@ choice OPENTHREAD_DEVICE_TYPE
default OPENTHREAD_MTD
endchoice

endif # NET_L2_OPENTHREAD
endif # OPENTHREAD

rsource "../../../config/nrfconnect/chip-module/Kconfig.features"
rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults"
Expand Down
6 changes: 3 additions & 3 deletions examples/all-clusters-app/nrfconnect/main/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ CHIP_ERROR AppTask::Init()
return err;
}

#if defined(CONFIG_NET_L2_OPENTHREAD)
#if defined(CONFIG_OPENTHREAD)
err = ThreadStackMgr().InitThreadStack();
if (err != CHIP_NO_ERROR)
{
Expand All @@ -164,7 +164,7 @@ CHIP_ERROR AppTask::Init()
sWiFiCommissioningInstance.Init();
#else
return CHIP_ERROR_INTERNAL;
#endif // CONFIG_NET_L2_OPENTHREAD
#endif // CONFIG_OPENTHREAD

// Initialize LEDs
LEDWidget::InitGpio();
Expand Down Expand Up @@ -507,7 +507,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;
UpdateStatusLED();
break;
#if defined(CONFIG_NET_L2_OPENTHREAD)
#if defined(CONFIG_OPENTHREAD)
case DeviceEventType::kDnssdInitialized:
#if CONFIG_CHIP_OTA_REQUESTOR
InitBasicOTARequestor();
Expand Down
4 changes: 2 additions & 2 deletions examples/all-clusters-minimal-app/nrfconnect/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ config STATE_LEDS
the device into a network or the factory reset initiation.

# Sample configuration used for Thread networking
if NET_L2_OPENTHREAD
if OPENTHREAD

choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
default OPENTHREAD_NORDIC_LIBRARY_MTD
Expand All @@ -33,7 +33,7 @@ choice OPENTHREAD_DEVICE_TYPE
default OPENTHREAD_MTD
endchoice

endif # NET_L2_OPENTHREAD
endif # OPENTHREAD

rsource "../../../config/nrfconnect/chip-module/Kconfig.features"
rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults"
Expand Down
4 changes: 2 additions & 2 deletions examples/light-switch-app/nrfconnect/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ config STATE_LEDS
'n' does not disable the LED indicating the state of the simulated bolt.

# Sample configuration used for Thread networking
if NET_L2_OPENTHREAD
if OPENTHREAD

choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
default OPENTHREAD_NORDIC_LIBRARY_MTD
Expand All @@ -38,7 +38,7 @@ config CHIP_ENABLE_ICD_SUPPORT
bool
default y

endif # NET_L2_OPENTHREAD
endif # OPENTHREAD

if CHIP_WIFI

Expand Down
4 changes: 2 additions & 2 deletions examples/light-switch-app/nrfconnect/main/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ CHIP_ERROR AppTask::Init()
return err;
}

#if defined(CONFIG_NET_L2_OPENTHREAD)
#if defined(CONFIG_OPENTHREAD)
err = ThreadStackMgr().InitThreadStack();
if (err != CHIP_NO_ERROR)
{
Expand Down Expand Up @@ -486,7 +486,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;
UpdateStatusLED();
break;
#if defined(CONFIG_NET_L2_OPENTHREAD)
#if defined(CONFIG_OPENTHREAD)
case DeviceEventType::kDnssdInitialized:
#if CONFIG_CHIP_OTA_REQUESTOR
InitBasicOTARequestor();
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/nrfconnect/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
mainmenu "Matter nRF Connect Lighting Example Application"

# Sample configuration used for Thread networking
if NET_L2_OPENTHREAD
if OPENTHREAD

choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
default OPENTHREAD_NORDIC_LIBRARY_FTD
Expand All @@ -26,7 +26,7 @@ choice OPENTHREAD_DEVICE_TYPE
default OPENTHREAD_FTD
endchoice

endif # NET_L2_OPENTHREAD
endif # OPENTHREAD


rsource "../../../config/nrfconnect/chip-module/Kconfig.features"
Expand Down
6 changes: 3 additions & 3 deletions examples/lighting-app/nrfconnect/main/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ CHIP_ERROR AppTask::Init()
return err;
}

#if defined(CONFIG_NET_L2_OPENTHREAD)
#if defined(CONFIG_OPENTHREAD)
err = ThreadStackMgr().InitThreadStack();
if (err != CHIP_NO_ERROR)
{
Expand All @@ -185,7 +185,7 @@ CHIP_ERROR AppTask::Init()
sWiFiCommissioningInstance.Init();
#else
return CHIP_ERROR_INTERNAL;
#endif // CONFIG_NET_L2_OPENTHREAD
#endif // CONFIG_OPENTHREAD

// Initialize LEDs
LEDWidget::InitGpio();
Expand Down Expand Up @@ -613,7 +613,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;
UpdateStatusLED();
break;
#if defined(CONFIG_NET_L2_OPENTHREAD)
#if defined(CONFIG_OPENTHREAD)
case DeviceEventType::kDnssdInitialized:
#if CONFIG_CHIP_OTA_REQUESTOR
InitBasicOTARequestor();
Expand Down
4 changes: 2 additions & 2 deletions examples/lit-icd-app/nrfconnect/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ config STATE_LEDS
'n' does not disable the LED indicating the state of the simulated bolt.

# Sample configuration used for Thread networking
if NET_L2_OPENTHREAD
if OPENTHREAD

choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
default OPENTHREAD_NORDIC_LIBRARY_MTD
Expand All @@ -34,7 +34,7 @@ choice OPENTHREAD_DEVICE_TYPE
default OPENTHREAD_MTD
endchoice

endif # NET_L2_OPENTHREAD
endif # OPENTHREAD

rsource "../../../config/nrfconnect/chip-module/Kconfig.features"
rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults"
Expand Down
8 changes: 4 additions & 4 deletions examples/lit-icd-app/nrfconnect/main/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ CHIP_ERROR AppTask::Init()
return err;
}

#if defined(CONFIG_NET_L2_OPENTHREAD)
#if defined(CONFIG_OPENTHREAD)
err = ThreadStackMgr().InitThreadStack();
if (err != CHIP_NO_ERROR)
{
Expand All @@ -147,7 +147,7 @@ CHIP_ERROR AppTask::Init()
}
#else
return CHIP_ERROR_INTERNAL;
#endif // CONFIG_NET_L2_OPENTHREAD
#endif // CONFIG_OPENTHREAD

// Initialize LEDs
LEDWidget::InitGpio();
Expand Down Expand Up @@ -507,7 +507,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;
UpdateStatusLED();
break;
#if defined(CONFIG_NET_L2_OPENTHREAD)
#if defined(CONFIG_OPENTHREAD)
case DeviceEventType::kDnssdInitialized:
#if CONFIG_CHIP_OTA_REQUESTOR
InitBasicOTARequestor();
Expand All @@ -518,7 +518,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
sIsNetworkEnabled = ConnectivityMgr().IsThreadEnabled();
UpdateStatusLED();
break;
#endif // CONFIG_NET_L2_OPENTHREAD
#endif // CONFIG_OPENTHREAD
default:
break;
}
Expand Down
4 changes: 2 additions & 2 deletions examples/lock-app/nrfconnect/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ config STATE_LEDS
'n' does not disable the LED indicating the state of the simulated bolt.

# Sample configuration used for Thread networking
if NET_L2_OPENTHREAD
if OPENTHREAD

choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
default OPENTHREAD_NORDIC_LIBRARY_MTD
Expand All @@ -50,7 +50,7 @@ config CHIP_ENABLE_ICD_SUPPORT
bool
default y

endif # NET_L2_OPENTHREAD
endif # OPENTHREAD

if CHIP_WIFI

Expand Down
Loading
Loading