openthread: Align Kconfigs with Zephyr changes

adigie · rlubos · commit 14a8618e6bda · 2025-05-19T15:42:50.000+02:00
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 &lt;adrian.gielniewski@nordicsemi.no&gt;
diff --git a/applications/matter_bridge/Kconfig b/applications/matter_bridge/Kconfig
@@ -164,7 +164,7 @@ config BRIDGE_SMART_PLUG_SUPPORT
 	default n
 
 # Sample configuration used for Thread networking
-if NET_L2_OPENTHREAD
+if OPENTHREAD
 
 choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
 	default OPENTHREAD_NORDIC_LIBRARY_FTD
@@ -174,12 +174,12 @@ choice OPENTHREAD_DEVICE_TYPE
 	default OPENTHREAD_FTD
 endchoice
 
-endif # NET_L2_OPENTHREAD
+endif # OPENTHREAD
 
 # Dummy Kconfig just to select experimental for some of the configurations.
 config BRIDGE_EXPERIMENTAL
 	bool
-	default y if NET_L2_OPENTHREAD || BRIDGE_SMART_PLUG_SUPPORT
+	default y if OPENTHREAD || BRIDGE_SMART_PLUG_SUPPORT
 	select EXPERIMENTAL
 
 source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features"
diff --git a/applications/matter_weather_station/Kconfig b/applications/matter_weather_station/Kconfig
@@ -14,7 +14,7 @@ config AVERAGE_CURRENT_CONSUMPTION
 	  device, used to estimate the remaining battery time.
 
 # Application configuration used for Thread networking
-if NET_L2_OPENTHREAD
+if OPENTHREAD
 
 choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
 	default OPENTHREAD_NORDIC_LIBRARY_MTD
@@ -30,7 +30,7 @@ config IEEE802154_NRF5_RX_STACK_SIZE
 config CHIP_ENABLE_ICD_SUPPORT
 	default y
 
-endif # NET_L2_OPENTHREAD
+endif # OPENTHREAD
 
 if CHIP_WIFI
 
diff --git a/samples/matter/common/src/app/matter_init.cpp b/samples/matter/common/src/app/matter_init.cpp
@@ -150,7 +150,7 @@ void FeedFromMatter(Nrf::Watchdog::WatchdogSource *watchdogSource)
 #endif
 
 /* Matter stack design implies different initialization procedure for Thread and Wi-Fi backend. */
-#if defined(CONFIG_NET_L2_OPENTHREAD)
+#if defined(CONFIG_OPENTHREAD)
 CHIP_ERROR ConfigureThreadRole()
 {
 	using ThreadRole = ConnectivityManager::ThreadDeviceType;
@@ -194,7 +194,7 @@ CHIP_ERROR InitNetworkingStack()
 }
 #else
 #error "No valid L2 network backend selected");
-#endif /* CONFIG_NET_L2_OPENTHREAD */
+#endif /* CONFIG_OPENTHREAD */
 
 #define VerifyInitResultOrReturn(ec, msg)                                                                              \
 	VerifyOrReturn(ec == CHIP_NO_ERROR, LOG_ERR(msg " [Error: %d]", sInitResult.Format()))
diff --git a/samples/matter/common/src/bridge/Kconfig b/samples/matter/common/src/bridge/Kconfig
@@ -57,24 +57,24 @@ config BRIDGE_BT_MINIMUM_SECURITY_LEVEL
 
 config BRIDGE_BT_SCAN_WINDOW
 	int "Time duration of a central actively scanning for devices within scan interval, it is equal BRIDGE_BT_SCAN_WINDOW*0.625 ms"
-	default 40  if NET_L2_OPENTHREAD # It is necessary to decrease Bluetooth LE activity to leave some radio time to Thread
+	default 40  if OPENTHREAD # It is necessary to decrease Bluetooth LE activity to leave some radio time to Thread
 	default 48
 
 config BRIDGE_BT_SCAN_INTERVAL
 	int "Time between consecutive Bluetooth scan windows, it is equal BRIDGE_BT_SCAN_INTERVAL*0.625 ms"
-	default 160 if NET_L2_OPENTHREAD # It is necessary to decrease Bluetooth LE activity to leave some radio time to Thread
+	default 160 if OPENTHREAD # It is necessary to decrease Bluetooth LE activity to leave some radio time to Thread
 	default 96
 
 config BRIDGE_BT_CONNECTION_INTERVAL_MIN
 	int "It is the minimum duration of time requested by central after the peripheral device should wake up to communicate, it is equal BRIDGE_BT_CONNECTION_INTERVAL_MIN*1.25 ms"
 	range 6 3200
-	default 80 if NET_L2_OPENTHREAD # It is necessary to decrease Bluetooth LE activity to leave some radio time to Thread
+	default 80 if OPENTHREAD # It is necessary to decrease Bluetooth LE activity to leave some radio time to Thread
 	default 24
 
 config BRIDGE_BT_CONNECTION_INTERVAL_MAX
 	int "It is the maximum duration of time requested by central after the peripheral device should wake up to communicate, it is equal BRIDGE_BT_CONNECTION_INTERVAL_MAX*1.25 ms"
 	range 6 3200
-	default 80 if NET_L2_OPENTHREAD # It is necessary to decrease Bluetooth LE activity to leave some radio time to Thread
+	default 80 if OPENTHREAD # It is necessary to decrease Bluetooth LE activity to leave some radio time to Thread
 	default 40
 
 config BRIDGE_BT_CONNECTION_TIMEOUT
diff --git a/samples/matter/light_bulb/Kconfig b/samples/matter/light_bulb/Kconfig
@@ -6,7 +6,7 @@
 mainmenu "Matter nRF Connect Light Bulb Example Application"
 
 # Sample configuration used for Thread networking
-if NET_L2_OPENTHREAD
+if OPENTHREAD
 
 choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
 	default OPENTHREAD_NORDIC_LIBRARY_FTD
@@ -16,7 +16,7 @@ choice OPENTHREAD_DEVICE_TYPE
 	default OPENTHREAD_FTD
 endchoice
 
-endif # NET_L2_OPENTHREAD
+endif # OPENTHREAD
 
 source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features"
 source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults"
diff --git a/samples/matter/light_switch/Kconfig b/samples/matter/light_switch/Kconfig
@@ -14,7 +14,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
@@ -32,7 +32,7 @@ config OPENTHREAD_DEFAULT_TX_POWER
 	int
 	default 0
 
-endif # NET_L2_OPENTHREAD
+endif # OPENTHREAD
 
 if CHIP_WIFI
 
diff --git a/samples/matter/lock/Kconfig b/samples/matter/lock/Kconfig
@@ -111,7 +111,7 @@ config THREAD_WIFI_SWITCHING_SHELL
 endif # THREAD_WIFI_SWITCHING
 
 # Sample configuration used for Thread networking
-if NET_L2_OPENTHREAD
+if OPENTHREAD
 
 choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
 	default OPENTHREAD_NORDIC_LIBRARY_MTD
@@ -129,7 +129,7 @@ config OPENTHREAD_DEFAULT_TX_POWER
 	int
 	default 0
 
-endif # NET_L2_OPENTHREAD
+endif # OPENTHREAD
 
 if CHIP_WIFI
 
diff --git a/samples/matter/manufacturer_specific/Kconfig b/samples/matter/manufacturer_specific/Kconfig
@@ -6,7 +6,7 @@
 mainmenu "Matter nRF Connect Manufacturer Specific Example Application"
 
 # Sample configuration used for Thread networking
-if NET_L2_OPENTHREAD
+if OPENTHREAD
 
 choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
 	default OPENTHREAD_NORDIC_LIBRARY_MTD
@@ -16,7 +16,7 @@ choice OPENTHREAD_DEVICE_TYPE
 	default OPENTHREAD_MTD
 endchoice
 
-endif # NET_L2_OPENTHREAD
+endif # OPENTHREAD
 
 source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features"
 source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults"
diff --git a/samples/matter/template/Kconfig b/samples/matter/template/Kconfig
@@ -6,7 +6,7 @@
 mainmenu "Matter nRF Connect Template Example Application"
 
 # Sample configuration used for Thread networking
-if NET_L2_OPENTHREAD
+if OPENTHREAD
 
 choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
 	default OPENTHREAD_NORDIC_LIBRARY_MTD
@@ -16,7 +16,7 @@ choice OPENTHREAD_DEVICE_TYPE
 	default OPENTHREAD_MTD
 endchoice
 
-endif # NET_L2_OPENTHREAD
+endif # OPENTHREAD
 
 source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features"
 source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults"
diff --git a/samples/matter/thermostat/Kconfig b/samples/matter/thermostat/Kconfig
@@ -30,7 +30,7 @@ config CHIP_ENABLE_READ_CLIENT
 	default y
 
 # Sample configuration used for Thread networking
-if NET_L2_OPENTHREAD
+if OPENTHREAD
 
 choice OPENTHREAD_NORDIC_LIBRARY_CONFIGURATION
 	default OPENTHREAD_NORDIC_LIBRARY_MTD
@@ -40,7 +40,7 @@ choice OPENTHREAD_DEVICE_TYPE
 	default OPENTHREAD_MTD
 endchoice
 
-endif # NET_L2_OPENTHREAD
+endif # OPENTHREAD
 
 source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features"
 source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults"
diff --git a/subsys/mpsl/init/Kconfig b/subsys/mpsl/init/Kconfig
@@ -6,7 +6,7 @@
 
 config MPSL_THREAD_COOP_PRIO
 	int
-	default 0 if NET_L2_OPENTHREAD
+	default 0 if OPENTHREAD
 	default BT_CTLR_SDC_RX_PRIO if BT_LL_SOFTDEVICE
 	default 8
 
