Skip to content

Commit 82341ed

Browse files
tomi-fontrlubos
authored andcommitted
manifest: upmerge TF-M 2025.05.27
Update our TF-M fork to the latest state of Zephyr's. At the same time pull in changes needed from Zephyr and import `cmsis_6` from Zephyr's manifest now that it's used by TF-M. Signed-off-by: Tomi Fontanilles <[email protected]>
1 parent cffb09c commit 82341ed

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

west.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ manifest:
6565
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
6666
- name: zephyr
6767
repo-path: sdk-zephyr
68-
revision: ba8fd23f0a7e96d53015259dd499f0afea2afa6d
68+
revision: 9761288d1c61d676cf5e7501563c199db9007ae0
6969
import:
7070
# In addition to the zephyr repository itself, NCS also
7171
# imports the contents of zephyr/west.yml at the above
@@ -85,6 +85,7 @@ manifest:
8585
- cmsis
8686
- cmsis-dsp
8787
- cmsis-nn
88+
- cmsis_6
8889
- edtt
8990
- fatfs
9091
- hal_nordic
@@ -148,7 +149,7 @@ manifest:
148149
- name: trusted-firmware-m
149150
repo-path: sdk-trusted-firmware-m
150151
path: modules/tee/tf-m/trusted-firmware-m
151-
revision: b23519df291d9c5475e13ee2b5ac700552a589a8
152+
revision: bf3105bd6f49a758dee722e124e0dc0db9119afe
152153
- name: psa-arch-tests
153154
repo-path: sdk-psa-arch-tests
154155
path: modules/tee/tf-m/psa-arch-tests

0 commit comments

Comments
 (0)