Skip to content

openthread: fix diags modules #19891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2025
Merged

openthread: fix diags modules #19891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion subsys/net/openthread/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ config OPENTHREAD_LIBRARY_AVAILABLE
# Switch:
# - To `y` when libraries for the current OpenThread revision are provided
# - To `n` on the next OpenThread upmerge
default y
default n
depends on OPENTHREAD_THREAD_VERSION_1_4
depends on (OPENTHREAD_NORDIC_LIBRARY_MASTER && (SOC_NRF52840 || SOC_NRF54L15_CPUAPP)) || \
OPENTHREAD_NORDIC_LIBRARY_FTD || OPENTHREAD_NORDIC_LIBRARY_MTD
Expand Down
4 changes: 2 additions & 2 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: ffa5be0dbbfd941f2156fe6237bdc5bd58772836
revision: 52a1ceee359c93ecf0cfeee835b60e7b4c8c78a5
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -235,7 +235,7 @@ manifest:
- name: openthread
repo-path: sdk-openthread
path: modules/lib/openthread
revision: ncs-thread-reference-20241002
revision: e344d15117bfb00c583b3667a047329210ee0ee8
userdata:
ncs:
upstream-url: https://github.com/openthread/openthread
Expand Down