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

Replace `NET_L2_OPENTHREAD` with `OPENTHREAD` as OpenThread Kconfigs
were moved from L2 to OpenThread module.

Keep `NET_L2_OPENTHREAD` if there is dependency to networking.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

config/nrfconnect/chip-module/CMakeLists.txt

@@ -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)
@@ -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)
@@ -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")

config/nrfconnect/chip-module/Kconfig

@@ -314,7 +314,7 @@ config CHIP_IPV4
 config CHIP_OPENTHREAD_JOINER_ENABLED
 	bool "Specify whether the Thread Joiner functionality is used when it is enabled"
 	default n
-	depends on NET_L2_OPENTHREAD
+	depends on OPENTHREAD
 	depends on OPENTHREAD_JOINER
 	help
 	  If disabled, it allows to optimize memory usage even if Thread Joiner

config/nrfconnect/chip-module/Kconfig.defaults

@@ -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
@@ -104,6 +104,8 @@ endif # MPSL
 # Zephyr networking configuration
 # ==============================================================================
 
+if CONFIG_NETWORKING
+
 config NET_IPV6_MLD
     default y
 
@@ -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
 # ==============================================================================
@@ -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
@@ -272,6 +276,17 @@ if NET_L2_OPENTHREAD
 config IEEE802154_NRF5_RX_STACK_SIZE
     default 1024
 
+endif # NET_L2_OPENTHREAD
+
+# ==============================================================================
+# 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
@@ -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

config/zephyr/Kconfig

@@ -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
@@ -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.
 
@@ -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

config/zephyr/chip-module/CMakeLists.txt

@@ -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)
     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)
@@ -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")

examples/all-clusters-app/nrfconnect/Kconfig

@@ -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
@@ -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"

examples/all-clusters-app/nrfconnect/main/AppTask.cpp

@@ -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)
     {
@@ -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();
@@ -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();

examples/all-clusters-minimal-app/nrfconnect/Kconfig

@@ -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
@@ -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"

examples/light-switch-app/nrfconnect/Kconfig

@@ -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
@@ -38,7 +38,7 @@ config CHIP_ENABLE_ICD_SUPPORT
 	bool
 	default y
 
-endif # NET_L2_OPENTHREAD
+endif # OPENTHREAD
 
 if CHIP_WIFI
 

examples/light-switch-app/nrfconnect/main/AppTask.cpp

@@ -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)
     {
@@ -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();