[nrf fromtree] manifest: openthread upmerge up to commit a1979fd

Cleanup of Kconfig and CMakeLists for openthread module.

Added build flags:
- `OT_15_4`
- `OT_ANYCAST_LOCATOR`
- `OT_BACKBONE_ROUTER_DUA_NDPROXYING`
- `OT_BACKBONE_ROUTER_MULTICAST_ROUTING`
- `OT_BORDER_ROUTING`
- `OT_BORDER_ROUTING_COUNTERS`
- `OT_FIREWALL`
- `OT_MESSAGE_USE_HEAP`
- `OT_NAT64_TRANSLATOR`
- `OT_TX_BEACON_PAYLOAD`

Renamed flags:
- `DATSET_UPDATER` to `DATASET_UPDATER`
- `CONFIG_OPENTHREAD_BORDER_ROUTING_NAT64`
to `CONFIG_OPENTHREAD_NAT64_BORDER_ROUTING`

Rearranged flags in alphabetical order.
Signed-off-by: Maciej Baczmanski <[email protected]>
(cherry picked from commit 59325d1)

Author: maciejbaczmanski

modules/openthread/CMakeLists.txt

@@ -28,6 +28,12 @@ elseif(CONFIG_OPENTHREAD_MTD)
   set(OT_MTD ON CACHE BOOL "Enable MTD" FORCE)
 endif()
 
+if(CONFIG_OPENTHREAD_ANYCAST_LOCATOR)
+  set(OT_ANYCAST_LOCATOR ON CACHE BOOL "Enable anycast locator" FORCE)
+else()
+  set(OT_ANYCAST_LOCATOR OFF CACHE BOOL "Enable anycast locator" FORCE)
+endif()
+
 if(CONFIG_ASSERT)
   set(OT_ASSERT ON CACHE BOOL "Enable assert function OT_ASSERT()" FORCE)
 else()
@@ -40,6 +46,18 @@ else()
   set(OT_BACKBONE_ROUTER OFF CACHE BOOL "Enable backbone router functionality" FORCE)
 endif()
 
+if(CONFIG_OPENTHREAD_BACKBONE_ROUTER_DUA_NDPROXYING)
+  set(OT_BACKBONE_ROUTER_DUA_NDPROXYING ON CACHE BOOL "Enable BBR DUA ND Proxy support" FORCE)
+else()
+  set(OT_BACKBONE_ROUTER_DUA_NDPROXYING OFF CACHE BOOL "Enable BBR DUA ND Proxy support" FORCE)
+endif()
+
+if(CONFIG_OPENTHREAD_BACKBONE_ROUTER_MULTICAST_ROUTING)
+  set(OT_BACKBONE_ROUTER_MULTICAST_ROUTING ON CACHE BOOL "Enable BBR MR support" FORCE)
+else()
+  set(OT_BACKBONE_ROUTER_MULTICAST_ROUTING OFF CACHE BOOL "Enable BBR MR support" FORCE)
+endif()
+
 if(CONFIG_OPENTHREAD_BORDER_AGENT)
   set(OT_BORDER_AGENT ON CACHE BOOL "Enable Border Agent" FORCE)
 else()
@@ -52,70 +70,70 @@ else()
   set(OT_BORDER_ROUTER OFF CACHE BOOL "Enable Border Router" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_BORDER_ROUTING_NAT64)
-  set(OT_BORDER_ROUTING_NAT64 ON CACHE BOOL "Enable border routing NAT64 support" FORCE)
+if(CONFIG_OPENTHREAD_BORDER_ROUTING)
+  set(OT_BORDER_ROUTING ON CACHE BOOL "Enable Border routing" FORCE)
 else()
-  set(OT_BORDER_ROUTING_NAT64 OFF CACHE BOOL "Enable border routing NAT64 support" FORCE)
+  set(OT_BORDER_ROUTING OFF CACHE BOOL "Enable Border routing" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_COAP)
-  set(OT_COAP ON CACHE BOOL "Enable CoAP API" FORCE)
+if(CONFIG_OPENTHREAD_BORDER_ROUTING_COUNTERS)
+  set(OT_BORDER_ROUTING_COUNTERS ON CACHE BOOL "Enable Border routing counters" FORCE)
 else()
-  set(OT_COAP OFF CACHE BOOL "Enable CoAP API" FORCE)
+  set(OT_BORDER_ROUTING_COUNTERS OFF CACHE BOOL "Enable Border routing counters" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_COAPS)
-  set(OT_COAPS ON CACHE BOOL "Enable secure CoAP API support" FORCE)
+if(CONFIG_OPENTHREAD_CHANNEL_MANAGER)
+  set(OT_CHANNEL_MANAGER ON CACHE BOOL "Enable channel manager support" FORCE)
 else()
-  set(OT_COAPS OFF CACHE BOOL "Enable secure CoAP API support" FORCE)
+  set(OT_CHANNEL_MANAGER OFF CACHE BOOL "Enable channel manager support" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_COAP_BLOCK)
-  set(OT_COAP_BLOCK ON CACHE BOOL "Enable CoAP Block-wise option support" FORCE)
+if(CONFIG_OPENTHREAD_CHANNEL_MONITOR)
+  set(OT_CHANNEL_MONITOR ON CACHE BOOL "Enable channel monitor support" FORCE)
 else()
-  set(OT_COAP_BLOCK OFF CACHE BOOL "Enable CoAP Block-wise option support" FORCE)
+  set(OT_CHANNEL_MONITOR OFF CACHE BOOL "Enable channel monitor support" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_COAP_OBSERVE)
-  set(OT_COAP_OBSERVE ON CACHE BOOL "Enable CoAP Observe option support" FORCE)
+if(CONFIG_OPENTHREAD_CHILD_SUPERVISION)
+  set(OT_CHILD_SUPERVISION ON CACHE BOOL "Enable child supervision support" FORCE)
 else()
-  set(OT_COAP_OBSERVE OFF CACHE BOOL "Enable CoAP Observe option support" FORCE)
+  set(OT_CHILD_SUPERVISION OFF CACHE BOOL "Enable child supervision support" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_COMMISSIONER)
-  set(OT_COMMISSIONER ON CACHE BOOL "Enable Commissioner" FORCE)
+if(CONFIG_OPENTHREAD_COAP)
+  set(OT_COAP ON CACHE BOOL "Enable CoAP API" FORCE)
 else()
-  set(OT_COMMISSIONER OFF CACHE BOOL "Enable Commissioner" FORCE)
+  set(OT_COAP OFF CACHE BOOL "Enable CoAP API" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_CHANNEL_MANAGER)
-  set(OT_CHANNEL_MANAGER ON CACHE BOOL "Enable channel manager support" FORCE)
+if(CONFIG_OPENTHREAD_COAP_BLOCK)
+  set(OT_COAP_BLOCK ON CACHE BOOL "Enable CoAP Block-wise option support" FORCE)
 else()
-  set(OT_CHANNEL_MANAGER OFF CACHE BOOL "Enable channel manager support" FORCE)
+  set(OT_COAP_BLOCK OFF CACHE BOOL "Enable CoAP Block-wise option support" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_CHANNEL_MONITOR)
-  set(OT_CHANNEL_MONITOR ON CACHE BOOL "Enable channel monitor support" FORCE)
+if(CONFIG_OPENTHREAD_COAP_OBSERVE)
+  set(OT_COAP_OBSERVE ON CACHE BOOL "Enable CoAP Observe option support" FORCE)
 else()
-  set(OT_CHANNEL_MONITOR OFF CACHE BOOL "Enable channel monitor support" FORCE)
+  set(OT_COAP_OBSERVE OFF CACHE BOOL "Enable CoAP Observe option support" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_CHILD_SUPERVISION)
-  set(OT_CHILD_SUPERVISION ON CACHE BOOL "Enable child supervision support" FORCE)
+if(CONFIG_OPENTHREAD_COAPS)
+  set(OT_COAPS ON CACHE BOOL "Enable secure CoAP API support" FORCE)
 else()
-  set(OT_CHILD_SUPERVISION OFF CACHE BOOL "Enable child supervision support" FORCE)
+  set(OT_COAPS OFF CACHE BOOL "Enable secure CoAP API support" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_CSL_AUTO_SYNC)
-  set(OT_CSL_AUTO_SYNC ON CACHE BOOL "Enable csl autosync" FORCE)
+if(CONFIG_OPENTHREAD_COMMISSIONER)
+  set(OT_COMMISSIONER ON CACHE BOOL "Enable Commissioner" FORCE)
 else()
-  set(OT_CSL_AUTO_SYNC OFF CACHE BOOL "Enable csl autosync" FORCE)
+  set(OT_COMMISSIONER OFF CACHE BOOL "Enable Commissioner" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_CSL_RECEIVER)
-  set(OT_CSL_RECEIVER ON CACHE BOOL "Enable CSL receiver feature for Thread 1.2" FORCE)
+if(CONFIG_OPENTHREAD_CSL_AUTO_SYNC)
+  set(OT_CSL_AUTO_SYNC ON CACHE BOOL "Enable csl autosync" FORCE)
 else()
-  set(OT_CSL_RECEIVER OFF CACHE BOOL "Enable CSL receiver feature for Thread 1.2" FORCE)
+  set(OT_CSL_AUTO_SYNC OFF CACHE BOOL "Enable csl autosync" FORCE)
 endif()
 
 if(CONFIG_OPENTHREAD_CSL_DEBUG)
@@ -124,7 +142,13 @@ else()
   set(OT_CSL_DEBUG OFF CACHE BOOL "Enable CSL debug" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_DATSET_UPDATER)
+if(CONFIG_OPENTHREAD_CSL_RECEIVER)
+  set(OT_CSL_RECEIVER ON CACHE BOOL "Enable CSL receiver feature for Thread 1.2" FORCE)
+else()
+  set(OT_CSL_RECEIVER OFF CACHE BOOL "Enable CSL receiver feature for Thread 1.2" FORCE)
+endif()
+
+if(CONFIG_OPENTHREAD_DATASET_UPDATER)
   set(OT_DATASET_UPDATER ON CACHE BOOL "Enable Dataset updater" FORCE)
 else()
   set(OT_DATASET_UPDATER OFF CACHE BOOL "Enable Dataset updater" FORCE)
@@ -178,24 +202,36 @@ else()
   set(OT_ECDSA OFF CACHE BOOL "Enable ECDSA support" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_EXCLUDE_TCPLP_LIB)
-  set(OT_EXCLUDE_TCPLP_LIB ON CACHE BOOL "Exclude TCPlp library from build" FORCE)
-else()
-  set(OT_EXCLUDE_TCPLP_LIB OFF CACHE BOOL "Exclude TCPlp library from build" FORCE)
-endif()
-
 if(CONFIG_OPENTHREAD_ENABLE_SERVICE)
   set(OT_SERVICE ON CACHE BOOL "Enable Service entries in Thread Network Data" FORCE)
 else()
   set(OT_SERVICE OFF CACHE BOOL "Enable Service entries in Thread Network Data" FORCE)
 endif()
 
+if(CONFIG_OPENTHREAD_EXCLUDE_TCPLP_LIB)
+  set(OT_EXCLUDE_TCPLP_LIB ON CACHE BOOL "Exclude TCPlp library from build" FORCE)
+else()
+  set(OT_EXCLUDE_TCPLP_LIB OFF CACHE BOOL "Exclude TCPlp library from build" FORCE)
+endif()
+
 if(CONFIG_OPENTHREAD_EXTERNAL_HEAP)
   set(OT_EXTERNAL_HEAP ON CACHE BOOL "Enable external heap support" FORCE)
 else()
   set(OT_EXTERNAL_HEAP OFF CACHE BOOL "Enable external heap support" FORCE)
 endif()
 
+if(CONFIG_OPENTHREAD_FIREWALL)
+  set(OT_FIREWALL ON CACHE BOOL "Enable firewall" FORCE)
+else()
+  set(OT_FIREWALL OFF CACHE BOOL "Enable firewall" FORCE)
+endif()
+
+if(CONFIG_OPENTHREAD_FULL_LOGS)
+  set(OT_FULL_LOGS ON CACHE BOOL "Enable full logs" FORCE)
+else()
+  set(OT_FULL_LOGS OFF CACHE BOOL "Enable full logs" FORCE)
+endif()
+
 if(CONFIG_OPENTHREAD_HISTORY_TRACKER)
   set(OT_HISTORY_TRACKER ON CACHE BOOL "Enable history tracker support." FORCE)
 else()
@@ -250,6 +286,12 @@ else()
   set(OT_MAC_FILTER OFF CACHE BOOL "Enable MAC filter support" FORCE)
 endif()
 
+if(CONFIG_OPENTHREAD_MESSAGE_USE_HEAP)
+  set(OT_MESSAGE_USE_HEAP ON CACHE BOOL "Enable heap allocator for message buffers" FORCE)
+else()
+  set(OT_MESSAGE_USE_HEAP OFF CACHE BOOL "Enable heap allocator for message buffers" FORCE)
+endif()
+
 if(CONFIG_OPENTHREAD_MLE_LONG_ROUTES)
   set(OT_MLE_LONG_ROUTES ON CACHE BOOL "Enable MLE long routes support (Experimental)" FORCE)
 else()
@@ -274,6 +316,18 @@ else()
   set(OT_MULTIPLE_INSTANCE OFF CACHE BOOL "Enable multiple instances" FORCE)
 endif()
 
+if(CONFIG_OPENTHREAD_NAT64_BORDER_ROUTING)
+  set(OT_NAT64_BORDER_ROUTING ON CACHE BOOL "Enable border routing NAT64 support" FORCE)
+else()
+  set(OT_NAT64_BORDER_ROUTING OFF CACHE BOOL "Enable border routing NAT64 support" FORCE)
+endif()
+
+if(CONFIG_OPENTHREAD_NAT64_TRANSLATOR)
+  set(OT_NAT64_TRANSLATOR ON CACHE BOOL "Enable NAT64 translator" FORCE)
+else()
+  set(OT_NAT64_TRANSLATOR OFF CACHE BOOL "Enable NAT64 translator" FORCE)
+endif()
+
 if(CONFIG_OPENTHREAD_NEIGHBOR_DISCOVERY_AGENT)
   set(OT_NEIGHBOR_DISCOVERY_AGENT ON CACHE BOOL "Enable neighbor discovery agent support" FORCE)
 else()
@@ -286,6 +340,12 @@ else()
   set(OT_NETDATA_PUBLISHER OFF CACHE BOOL "Enable Thread Network Data publisher" FORCE)
 endif()
 
+if(CONFIG_OPENTHREAD_OTNS)
+  set(OT_OTNS ON CACHE BOOL "Enable OTNS support" FORCE)
+else()
+  set(OT_OTNS OFF CACHE BOOL "Enable OTNS support" FORCE)
+endif()
+
 if(CONFIG_OPENTHREAD_PING_SENDER)
   set(OT_PING_SENDER ON CACHE BOOL "Enable ping sender support" FORCE)
 else()
@@ -304,6 +364,12 @@ else()
   set(OT_PLATFORM_UDP OFF CACHE BOOL "Enable platform UDP support" FORCE)
 endif()
 
+if(CONFIG_OPENTHREAD_RADIO_LINK_IEEE_802_15_4_ENABLE)
+  set(OT_15_4 ON CACHE BOOL "Enable 802.15.4 radio" FORCE)
+else()
+  set(OT_15_4 OFF CACHE BOOL "Enable 802.15.4 radio" FORCE)
+endif()
+
 if(CONFIG_OPENTHREAD_RAW)
   set(OT_LINK_RAW ON CACHE BOOL "Enable Link Raw" FORCE)
 else()
@@ -346,16 +412,22 @@ else()
   set(OT_SRP_SERVER OFF CACHE BOOL "Enable SRP Server support" FORCE)
 endif()
 
+if(CONFIG_OPENTHREAD_TIME_SYNC)
+  set(OT_TIME_SYNC ON CACHE BOOL "Enable the time synchronization service feature" FORCE)
+else()
+  set(OT_TIME_SYNC OFF CACHE BOOL "Enable the time synchronization service feature" FORCE)
+endif()
+
 if(CONFIG_OPENTHREAD_TREL)
   set(OT_TREL ON CACHE BOOL "Enable TREL radio link for Thread over Infrastructure feature" FORCE)
 else()
   set(OT_TREL OFF CACHE BOOL "Enable TREL radio link for Thread over Infrastructure feature" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_TIME_SYNC)
-  set(OT_TIME_SYNC ON CACHE BOOL "Enable the time synchronization service feature" FORCE)
+if(CONFIG_OPENTHREAD_TX_BEACON_PAYLOAD)
+  set(OT_TX_BEACON_PAYLOAD ON CACHE BOOL "Enable tx beacon payload support" FORCE)
 else()
-  set(OT_TIME_SYNC OFF CACHE BOOL "Enable the time synchronization service feature" FORCE)
+  set(OT_TX_BEACON_PAYLOAD OFF CACHE BOOL "Enable tx beacon payload support" FORCE)
 endif()
 
 if(CONFIG_OPENTHREAD_UDP_FORWARD)
@@ -370,18 +442,6 @@ else()
   set(OT_UPTIME OFF CACHE BOOL "Enable support for tracking OpenThread instance's uptime" FORCE)
 endif()
 
-if(CONFIG_OPENTHREAD_OTNS)
-  set(OT_OTNS ON CACHE BOOL "Enable OTNS support" FORCE)
-else()
-  set(OT_OTNS OFF CACHE BOOL "Enable OTNS support" FORCE)
-endif()
-
-if(CONFIG_OPENTHREAD_FULL_LOGS)
-  set(OT_FULL_LOGS ON CACHE BOOL "Enable full logs" FORCE)
-else()
-  set(OT_FULL_LOGS OFF CACHE BOOL "Enable full logs" FORCE)
-endif()
-
 if(CONFIG_OPENTHREAD_COPROCESSOR_VENDOR_HOOK_SOURCE)
   set(OT_NCP_VENDOR_HOOK_SOURCE ${CONFIG_OPENTHREAD_COPROCESSOR_VENDOR_HOOK_SOURCE} CACHE STRING "NCP vendor hook source file name" FORCE)
 endif()