Skip to content

Commit c1ae40e

Browse files
maciejbaczmanskirlubos
authored andcommitted
openthread: align libraries for thread 1.4 and nrf54l15
- allow building from libraries for nrf54l15 target - allow building from libraries for Thread 1.3 and 1.4 - remove experimental mark for TCP in OT and set it to y for T1.4 - pull nrfxlib mbedtls path fixes Signed-off-by: Maciej Baczmanski <[email protected]>
1 parent 4e465b8 commit c1ae40e

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

subsys/net/openthread/Kconfig.defconfig

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ config OPENTHREAD_LIBRARY_AVAILABLE
2020
# - To `y` when libraries for the current OpenThread revision are provided
2121
# - To `n` on the next OpenThread upmerge
2222
default n
23-
depends on OPENTHREAD_THREAD_VERSION_1_3
24-
depends on (OPENTHREAD_NORDIC_LIBRARY_MASTER && SOC_NRF52840) || \
23+
depends on OPENTHREAD_THREAD_VERSION_1_3 || OPENTHREAD_THREAD_VERSION_1_4
24+
depends on (OPENTHREAD_NORDIC_LIBRARY_MASTER && (SOC_NRF52840 || SOC_NRF54L15_CPUAPP)) || \
2525
OPENTHREAD_NORDIC_LIBRARY_FTD || OPENTHREAD_NORDIC_LIBRARY_MTD
2626
depends on !OPENTHREAD_COPROCESSOR
27-
depends on SOC_NRF52840 || SOC_NRF5340_CPUAPP
27+
depends on SOC_NRF52840 || SOC_NRF5340_CPUAPP || SOC_NRF54L15_CPUAPP
2828

2929
choice OPENTHREAD_IMPLEMENTATION
3030
default OPENTHREAD_LIBRARY if OPENTHREAD_LIBRARY_AVAILABLE
@@ -251,6 +251,14 @@ endif # OPENTHREAD_CSL_RECEIVER
251251

252252
endif # !OPENTHREAD_THREAD_VERSION_1_1
253253

254+
if OPENTHREAD_THREAD_VERSION_1_4
255+
256+
# Thread 1.4 dependencies
257+
config OPENTHREAD_TCP_ENABLE
258+
default y
259+
260+
endif # OPENTHREAD_THREAD_VERSION_1_4
261+
254262
if OPENTHREAD_COPROCESSOR_RCP
255263

256264
config MBEDTLS_PSA_KEY_SLOT_COUNT
@@ -279,9 +287,6 @@ config NET_TX_STACK_SIZE
279287

280288
endif # OPENTHREAD_COPROCESSOR_RCP
281289

282-
config OPENTHREAD_TCP_ENABLE
283-
select EXPERIMENTAL
284-
285290
if OPENTHREAD_BLE_TCAT
286291

287292
config MBEDTLS_GCM_C

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ manifest:
149149
- name: nrfxlib
150150
repo-path: sdk-nrfxlib
151151
path: nrfxlib
152-
revision: 189f5c2cb54204aab05a6d9c887d08d5988c121d
152+
revision: 35863321fb3684292ddce606a1c72d3cf2b62222
153153
- name: trusted-firmware-m
154154
repo-path: sdk-trusted-firmware-m
155155
path: modules/tee/tf-m/trusted-firmware-m

0 commit comments

Comments
 (0)