Skip to content

Commit 59325d1

Browse files
maciejbaczmanskicarlescufi
authored andcommitted
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]>
1 parent 8b391dc commit 59325d1

File tree

3 files changed

+197
-110
lines changed

3 files changed

+197
-110
lines changed

modules/openthread/CMakeLists.txt

Lines changed: 115 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ elseif(CONFIG_OPENTHREAD_MTD)
2828
set(OT_MTD ON CACHE BOOL "Enable MTD" FORCE)
2929
endif()
3030

31+
if(CONFIG_OPENTHREAD_ANYCAST_LOCATOR)
32+
set(OT_ANYCAST_LOCATOR ON CACHE BOOL "Enable anycast locator" FORCE)
33+
else()
34+
set(OT_ANYCAST_LOCATOR OFF CACHE BOOL "Enable anycast locator" FORCE)
35+
endif()
36+
3137
if(CONFIG_ASSERT)
3238
set(OT_ASSERT ON CACHE BOOL "Enable assert function OT_ASSERT()" FORCE)
3339
else()
@@ -40,6 +46,18 @@ else()
4046
set(OT_BACKBONE_ROUTER OFF CACHE BOOL "Enable backbone router functionality" FORCE)
4147
endif()
4248

49+
if(CONFIG_OPENTHREAD_BACKBONE_ROUTER_DUA_NDPROXYING)
50+
set(OT_BACKBONE_ROUTER_DUA_NDPROXYING ON CACHE BOOL "Enable BBR DUA ND Proxy support" FORCE)
51+
else()
52+
set(OT_BACKBONE_ROUTER_DUA_NDPROXYING OFF CACHE BOOL "Enable BBR DUA ND Proxy support" FORCE)
53+
endif()
54+
55+
if(CONFIG_OPENTHREAD_BACKBONE_ROUTER_MULTICAST_ROUTING)
56+
set(OT_BACKBONE_ROUTER_MULTICAST_ROUTING ON CACHE BOOL "Enable BBR MR support" FORCE)
57+
else()
58+
set(OT_BACKBONE_ROUTER_MULTICAST_ROUTING OFF CACHE BOOL "Enable BBR MR support" FORCE)
59+
endif()
60+
4361
if(CONFIG_OPENTHREAD_BORDER_AGENT)
4462
set(OT_BORDER_AGENT ON CACHE BOOL "Enable Border Agent" FORCE)
4563
else()
@@ -52,70 +70,70 @@ else()
5270
set(OT_BORDER_ROUTER OFF CACHE BOOL "Enable Border Router" FORCE)
5371
endif()
5472

55-
if(CONFIG_OPENTHREAD_BORDER_ROUTING_NAT64)
56-
set(OT_BORDER_ROUTING_NAT64 ON CACHE BOOL "Enable border routing NAT64 support" FORCE)
73+
if(CONFIG_OPENTHREAD_BORDER_ROUTING)
74+
set(OT_BORDER_ROUTING ON CACHE BOOL "Enable Border routing" FORCE)
5775
else()
58-
set(OT_BORDER_ROUTING_NAT64 OFF CACHE BOOL "Enable border routing NAT64 support" FORCE)
76+
set(OT_BORDER_ROUTING OFF CACHE BOOL "Enable Border routing" FORCE)
5977
endif()
6078

61-
if(CONFIG_OPENTHREAD_COAP)
62-
set(OT_COAP ON CACHE BOOL "Enable CoAP API" FORCE)
79+
if(CONFIG_OPENTHREAD_BORDER_ROUTING_COUNTERS)
80+
set(OT_BORDER_ROUTING_COUNTERS ON CACHE BOOL "Enable Border routing counters" FORCE)
6381
else()
64-
set(OT_COAP OFF CACHE BOOL "Enable CoAP API" FORCE)
82+
set(OT_BORDER_ROUTING_COUNTERS OFF CACHE BOOL "Enable Border routing counters" FORCE)
6583
endif()
6684

67-
if(CONFIG_OPENTHREAD_COAPS)
68-
set(OT_COAPS ON CACHE BOOL "Enable secure CoAP API support" FORCE)
85+
if(CONFIG_OPENTHREAD_CHANNEL_MANAGER)
86+
set(OT_CHANNEL_MANAGER ON CACHE BOOL "Enable channel manager support" FORCE)
6987
else()
70-
set(OT_COAPS OFF CACHE BOOL "Enable secure CoAP API support" FORCE)
88+
set(OT_CHANNEL_MANAGER OFF CACHE BOOL "Enable channel manager support" FORCE)
7189
endif()
7290

73-
if(CONFIG_OPENTHREAD_COAP_BLOCK)
74-
set(OT_COAP_BLOCK ON CACHE BOOL "Enable CoAP Block-wise option support" FORCE)
91+
if(CONFIG_OPENTHREAD_CHANNEL_MONITOR)
92+
set(OT_CHANNEL_MONITOR ON CACHE BOOL "Enable channel monitor support" FORCE)
7593
else()
76-
set(OT_COAP_BLOCK OFF CACHE BOOL "Enable CoAP Block-wise option support" FORCE)
94+
set(OT_CHANNEL_MONITOR OFF CACHE BOOL "Enable channel monitor support" FORCE)
7795
endif()
7896

79-
if(CONFIG_OPENTHREAD_COAP_OBSERVE)
80-
set(OT_COAP_OBSERVE ON CACHE BOOL "Enable CoAP Observe option support" FORCE)
97+
if(CONFIG_OPENTHREAD_CHILD_SUPERVISION)
98+
set(OT_CHILD_SUPERVISION ON CACHE BOOL "Enable child supervision support" FORCE)
8199
else()
82-
set(OT_COAP_OBSERVE OFF CACHE BOOL "Enable CoAP Observe option support" FORCE)
100+
set(OT_CHILD_SUPERVISION OFF CACHE BOOL "Enable child supervision support" FORCE)
83101
endif()
84102

85-
if(CONFIG_OPENTHREAD_COMMISSIONER)
86-
set(OT_COMMISSIONER ON CACHE BOOL "Enable Commissioner" FORCE)
103+
if(CONFIG_OPENTHREAD_COAP)
104+
set(OT_COAP ON CACHE BOOL "Enable CoAP API" FORCE)
87105
else()
88-
set(OT_COMMISSIONER OFF CACHE BOOL "Enable Commissioner" FORCE)
106+
set(OT_COAP OFF CACHE BOOL "Enable CoAP API" FORCE)
89107
endif()
90108

91-
if(CONFIG_OPENTHREAD_CHANNEL_MANAGER)
92-
set(OT_CHANNEL_MANAGER ON CACHE BOOL "Enable channel manager support" FORCE)
109+
if(CONFIG_OPENTHREAD_COAP_BLOCK)
110+
set(OT_COAP_BLOCK ON CACHE BOOL "Enable CoAP Block-wise option support" FORCE)
93111
else()
94-
set(OT_CHANNEL_MANAGER OFF CACHE BOOL "Enable channel manager support" FORCE)
112+
set(OT_COAP_BLOCK OFF CACHE BOOL "Enable CoAP Block-wise option support" FORCE)
95113
endif()
96114

97-
if(CONFIG_OPENTHREAD_CHANNEL_MONITOR)
98-
set(OT_CHANNEL_MONITOR ON CACHE BOOL "Enable channel monitor support" FORCE)
115+
if(CONFIG_OPENTHREAD_COAP_OBSERVE)
116+
set(OT_COAP_OBSERVE ON CACHE BOOL "Enable CoAP Observe option support" FORCE)
99117
else()
100-
set(OT_CHANNEL_MONITOR OFF CACHE BOOL "Enable channel monitor support" FORCE)
118+
set(OT_COAP_OBSERVE OFF CACHE BOOL "Enable CoAP Observe option support" FORCE)
101119
endif()
102120

103-
if(CONFIG_OPENTHREAD_CHILD_SUPERVISION)
104-
set(OT_CHILD_SUPERVISION ON CACHE BOOL "Enable child supervision support" FORCE)
121+
if(CONFIG_OPENTHREAD_COAPS)
122+
set(OT_COAPS ON CACHE BOOL "Enable secure CoAP API support" FORCE)
105123
else()
106-
set(OT_CHILD_SUPERVISION OFF CACHE BOOL "Enable child supervision support" FORCE)
124+
set(OT_COAPS OFF CACHE BOOL "Enable secure CoAP API support" FORCE)
107125
endif()
108126

109-
if(CONFIG_OPENTHREAD_CSL_AUTO_SYNC)
110-
set(OT_CSL_AUTO_SYNC ON CACHE BOOL "Enable csl autosync" FORCE)
127+
if(CONFIG_OPENTHREAD_COMMISSIONER)
128+
set(OT_COMMISSIONER ON CACHE BOOL "Enable Commissioner" FORCE)
111129
else()
112-
set(OT_CSL_AUTO_SYNC OFF CACHE BOOL "Enable csl autosync" FORCE)
130+
set(OT_COMMISSIONER OFF CACHE BOOL "Enable Commissioner" FORCE)
113131
endif()
114132

115-
if(CONFIG_OPENTHREAD_CSL_RECEIVER)
116-
set(OT_CSL_RECEIVER ON CACHE BOOL "Enable CSL receiver feature for Thread 1.2" FORCE)
133+
if(CONFIG_OPENTHREAD_CSL_AUTO_SYNC)
134+
set(OT_CSL_AUTO_SYNC ON CACHE BOOL "Enable csl autosync" FORCE)
117135
else()
118-
set(OT_CSL_RECEIVER OFF CACHE BOOL "Enable CSL receiver feature for Thread 1.2" FORCE)
136+
set(OT_CSL_AUTO_SYNC OFF CACHE BOOL "Enable csl autosync" FORCE)
119137
endif()
120138

121139
if(CONFIG_OPENTHREAD_CSL_DEBUG)
@@ -124,7 +142,13 @@ else()
124142
set(OT_CSL_DEBUG OFF CACHE BOOL "Enable CSL debug" FORCE)
125143
endif()
126144

127-
if(CONFIG_OPENTHREAD_DATSET_UPDATER)
145+
if(CONFIG_OPENTHREAD_CSL_RECEIVER)
146+
set(OT_CSL_RECEIVER ON CACHE BOOL "Enable CSL receiver feature for Thread 1.2" FORCE)
147+
else()
148+
set(OT_CSL_RECEIVER OFF CACHE BOOL "Enable CSL receiver feature for Thread 1.2" FORCE)
149+
endif()
150+
151+
if(CONFIG_OPENTHREAD_DATASET_UPDATER)
128152
set(OT_DATASET_UPDATER ON CACHE BOOL "Enable Dataset updater" FORCE)
129153
else()
130154
set(OT_DATASET_UPDATER OFF CACHE BOOL "Enable Dataset updater" FORCE)
@@ -178,24 +202,36 @@ else()
178202
set(OT_ECDSA OFF CACHE BOOL "Enable ECDSA support" FORCE)
179203
endif()
180204

181-
if(CONFIG_OPENTHREAD_EXCLUDE_TCPLP_LIB)
182-
set(OT_EXCLUDE_TCPLP_LIB ON CACHE BOOL "Exclude TCPlp library from build" FORCE)
183-
else()
184-
set(OT_EXCLUDE_TCPLP_LIB OFF CACHE BOOL "Exclude TCPlp library from build" FORCE)
185-
endif()
186-
187205
if(CONFIG_OPENTHREAD_ENABLE_SERVICE)
188206
set(OT_SERVICE ON CACHE BOOL "Enable Service entries in Thread Network Data" FORCE)
189207
else()
190208
set(OT_SERVICE OFF CACHE BOOL "Enable Service entries in Thread Network Data" FORCE)
191209
endif()
192210

211+
if(CONFIG_OPENTHREAD_EXCLUDE_TCPLP_LIB)
212+
set(OT_EXCLUDE_TCPLP_LIB ON CACHE BOOL "Exclude TCPlp library from build" FORCE)
213+
else()
214+
set(OT_EXCLUDE_TCPLP_LIB OFF CACHE BOOL "Exclude TCPlp library from build" FORCE)
215+
endif()
216+
193217
if(CONFIG_OPENTHREAD_EXTERNAL_HEAP)
194218
set(OT_EXTERNAL_HEAP ON CACHE BOOL "Enable external heap support" FORCE)
195219
else()
196220
set(OT_EXTERNAL_HEAP OFF CACHE BOOL "Enable external heap support" FORCE)
197221
endif()
198222

223+
if(CONFIG_OPENTHREAD_FIREWALL)
224+
set(OT_FIREWALL ON CACHE BOOL "Enable firewall" FORCE)
225+
else()
226+
set(OT_FIREWALL OFF CACHE BOOL "Enable firewall" FORCE)
227+
endif()
228+
229+
if(CONFIG_OPENTHREAD_FULL_LOGS)
230+
set(OT_FULL_LOGS ON CACHE BOOL "Enable full logs" FORCE)
231+
else()
232+
set(OT_FULL_LOGS OFF CACHE BOOL "Enable full logs" FORCE)
233+
endif()
234+
199235
if(CONFIG_OPENTHREAD_HISTORY_TRACKER)
200236
set(OT_HISTORY_TRACKER ON CACHE BOOL "Enable history tracker support." FORCE)
201237
else()
@@ -250,6 +286,12 @@ else()
250286
set(OT_MAC_FILTER OFF CACHE BOOL "Enable MAC filter support" FORCE)
251287
endif()
252288

289+
if(CONFIG_OPENTHREAD_MESSAGE_USE_HEAP)
290+
set(OT_MESSAGE_USE_HEAP ON CACHE BOOL "Enable heap allocator for message buffers" FORCE)
291+
else()
292+
set(OT_MESSAGE_USE_HEAP OFF CACHE BOOL "Enable heap allocator for message buffers" FORCE)
293+
endif()
294+
253295
if(CONFIG_OPENTHREAD_MLE_LONG_ROUTES)
254296
set(OT_MLE_LONG_ROUTES ON CACHE BOOL "Enable MLE long routes support (Experimental)" FORCE)
255297
else()
@@ -274,6 +316,18 @@ else()
274316
set(OT_MULTIPLE_INSTANCE OFF CACHE BOOL "Enable multiple instances" FORCE)
275317
endif()
276318

319+
if(CONFIG_OPENTHREAD_NAT64_BORDER_ROUTING)
320+
set(OT_NAT64_BORDER_ROUTING ON CACHE BOOL "Enable border routing NAT64 support" FORCE)
321+
else()
322+
set(OT_NAT64_BORDER_ROUTING OFF CACHE BOOL "Enable border routing NAT64 support" FORCE)
323+
endif()
324+
325+
if(CONFIG_OPENTHREAD_NAT64_TRANSLATOR)
326+
set(OT_NAT64_TRANSLATOR ON CACHE BOOL "Enable NAT64 translator" FORCE)
327+
else()
328+
set(OT_NAT64_TRANSLATOR OFF CACHE BOOL "Enable NAT64 translator" FORCE)
329+
endif()
330+
277331
if(CONFIG_OPENTHREAD_NEIGHBOR_DISCOVERY_AGENT)
278332
set(OT_NEIGHBOR_DISCOVERY_AGENT ON CACHE BOOL "Enable neighbor discovery agent support" FORCE)
279333
else()
@@ -286,6 +340,12 @@ else()
286340
set(OT_NETDATA_PUBLISHER OFF CACHE BOOL "Enable Thread Network Data publisher" FORCE)
287341
endif()
288342

343+
if(CONFIG_OPENTHREAD_OTNS)
344+
set(OT_OTNS ON CACHE BOOL "Enable OTNS support" FORCE)
345+
else()
346+
set(OT_OTNS OFF CACHE BOOL "Enable OTNS support" FORCE)
347+
endif()
348+
289349
if(CONFIG_OPENTHREAD_PING_SENDER)
290350
set(OT_PING_SENDER ON CACHE BOOL "Enable ping sender support" FORCE)
291351
else()
@@ -304,6 +364,12 @@ else()
304364
set(OT_PLATFORM_UDP OFF CACHE BOOL "Enable platform UDP support" FORCE)
305365
endif()
306366

367+
if(CONFIG_OPENTHREAD_RADIO_LINK_IEEE_802_15_4_ENABLE)
368+
set(OT_15_4 ON CACHE BOOL "Enable 802.15.4 radio" FORCE)
369+
else()
370+
set(OT_15_4 OFF CACHE BOOL "Enable 802.15.4 radio" FORCE)
371+
endif()
372+
307373
if(CONFIG_OPENTHREAD_RAW)
308374
set(OT_LINK_RAW ON CACHE BOOL "Enable Link Raw" FORCE)
309375
else()
@@ -346,16 +412,22 @@ else()
346412
set(OT_SRP_SERVER OFF CACHE BOOL "Enable SRP Server support" FORCE)
347413
endif()
348414

415+
if(CONFIG_OPENTHREAD_TIME_SYNC)
416+
set(OT_TIME_SYNC ON CACHE BOOL "Enable the time synchronization service feature" FORCE)
417+
else()
418+
set(OT_TIME_SYNC OFF CACHE BOOL "Enable the time synchronization service feature" FORCE)
419+
endif()
420+
349421
if(CONFIG_OPENTHREAD_TREL)
350422
set(OT_TREL ON CACHE BOOL "Enable TREL radio link for Thread over Infrastructure feature" FORCE)
351423
else()
352424
set(OT_TREL OFF CACHE BOOL "Enable TREL radio link for Thread over Infrastructure feature" FORCE)
353425
endif()
354426

355-
if(CONFIG_OPENTHREAD_TIME_SYNC)
356-
set(OT_TIME_SYNC ON CACHE BOOL "Enable the time synchronization service feature" FORCE)
427+
if(CONFIG_OPENTHREAD_TX_BEACON_PAYLOAD)
428+
set(OT_TX_BEACON_PAYLOAD ON CACHE BOOL "Enable tx beacon payload support" FORCE)
357429
else()
358-
set(OT_TIME_SYNC OFF CACHE BOOL "Enable the time synchronization service feature" FORCE)
430+
set(OT_TX_BEACON_PAYLOAD OFF CACHE BOOL "Enable tx beacon payload support" FORCE)
359431
endif()
360432

361433
if(CONFIG_OPENTHREAD_UDP_FORWARD)
@@ -370,18 +442,6 @@ else()
370442
set(OT_UPTIME OFF CACHE BOOL "Enable support for tracking OpenThread instance's uptime" FORCE)
371443
endif()
372444

373-
if(CONFIG_OPENTHREAD_OTNS)
374-
set(OT_OTNS ON CACHE BOOL "Enable OTNS support" FORCE)
375-
else()
376-
set(OT_OTNS OFF CACHE BOOL "Enable OTNS support" FORCE)
377-
endif()
378-
379-
if(CONFIG_OPENTHREAD_FULL_LOGS)
380-
set(OT_FULL_LOGS ON CACHE BOOL "Enable full logs" FORCE)
381-
else()
382-
set(OT_FULL_LOGS OFF CACHE BOOL "Enable full logs" FORCE)
383-
endif()
384-
385445
if(CONFIG_OPENTHREAD_COPROCESSOR_VENDOR_HOOK_SOURCE)
386446
set(OT_NCP_VENDOR_HOOK_SOURCE ${CONFIG_OPENTHREAD_COPROCESSOR_VENDOR_HOOK_SOURCE} CACHE STRING "NCP vendor hook source file name" FORCE)
387447
endif()

0 commit comments

Comments
 (0)