Skip to content

Commit 815ebc3

Browse files
rluboscarlescufi
authored andcommitted
net: openthread: Move glue code into module directory
Move OpenThread's glue code along with the Kconfig files that configure OpenThread stack itself into module directory. Update the maintainers file to reflect this change. Signed-off-by: Robert Lubos <[email protected]>
1 parent 7f0fb63 commit 815ebc3

27 files changed

+32
-19
lines changed

MAINTAINERS.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,6 @@ Networking:
13341334
- samples/net/lwm2m_client/
13351335
- subsys/net/lib/coap/
13361336
- subsys/net/lib/lwm2m/
1337-
- subsys/net/lib/openthread/
13381337
- subsys/net/lib/tls_credentials/
13391338
labels:
13401339
- "area: Networking"
@@ -1410,7 +1409,6 @@ Networking:
14101409
- pdgendt
14111410
files:
14121411
- subsys/net/l2/openthread/
1413-
- subsys/net/lib/openthread/
14141412
- samples/net/openthread/
14151413
labels:
14161414
- "area: Networking"
@@ -2384,7 +2382,8 @@ West:
23842382
- rlubos
23852383
collaborators:
23862384
- pdgendt
2387-
files: []
2385+
files:
2386+
- modules/openthread/
23882387
labels:
23892388
- manifest-openthread
23902389

modules/openthread/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
if(CONFIG_OPENTHREAD)
12
if(CONFIG_OPENTHREAD_SOURCES)
23

34
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
@@ -484,3 +485,7 @@ endif()
484485
zephyr_link_libraries(${ot_libs})
485486

486487
endif()
488+
489+
add_subdirectory(platform)
490+
491+
endif()

modules/openthread/Kconfig

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright (c) 2022 Nordic Semiconductor ASA
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
config OPENTHREAD
5+
bool "OpenThread Support"
6+
help
7+
This option enables the OpenThread library
8+
9+
if OPENTHREAD
10+
11+
menu "OpenThread stack features"
12+
rsource "Kconfig.features"
13+
endmenu
14+
15+
menu "Thread Network configuration"
16+
rsource "Kconfig.thread"
17+
endmenu
18+
19+
endif # OPENTHREAD

subsys/net/l2/openthread/Kconfig.thread renamed to modules/openthread/Kconfig.thread

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ config OPENTHREAD_JOINER_PSKD
3939
depends on OPENTHREAD_JOINER_AUTOSTART
4040
default "J01NME"
4141

42-
choice
42+
choice OPENTHREAD_DEVICE_TYPE
4343
prompt "OpenThread device type"
4444
help
4545
This option selects Thread network device type

0 commit comments

Comments
 (0)