Skip to content

Commit

Permalink
openthread: fix diags modules
Browse files Browse the repository at this point in the history
Pull OT and Zephyr with diagnostic module related fixes.

Signed-off-by: Maciej Baczmanski <[email protected]>
  • Loading branch information
maciejbaczmanski committed Jan 14, 2025
1 parent f38d311 commit 58a108e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion subsys/net/openthread/Kconfig.defconfig
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
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: 2c7f6efa7220ef2fbdd70e8597aedf1a07e86067
revision: pull/2426/head
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: pull/98/head
userdata:
ncs:
upstream-url: https://github.com/openthread/openthread
Expand Down

0 comments on commit 58a108e

Please sign in to comment.