Skip to content

Commit 2d188a7

Browse files
tomi-fontbjarki-andreasen
authored andcommitted
manifest: upmerge TF-M
Align the TF-M fork in NCS with that of Zephyr. As part of that one noup in `sdk-zephyr` is reverted now that its contents (54L15 NS board target) have been upstreamed. Signed-off-by: Tomi Fontanilles <[email protected]>
1 parent b828ce7 commit 2d188a7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

west.yml

Lines changed: 2 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: 6764a72b79c86fe5bddda464c9b66b9f35d9d433
68+
revision: 7af92582ecab16df529fbb4d77aad92ccf105352
6969
import:
7070
# In addition to the zephyr repository itself, NCS also
7171
# imports the contents of zephyr/west.yml at the above
@@ -148,7 +148,7 @@ manifest:
148148
- name: trusted-firmware-m
149149
repo-path: sdk-trusted-firmware-m
150150
path: modules/tee/tf-m/trusted-firmware-m
151-
revision: 0002817d4e50c8832028c280996dfeac47938138
151+
revision: 72d31e0afae0df6c4f2c6c35374f92d7c8dc60d6
152152
- name: psa-arch-tests
153153
repo-path: sdk-psa-arch-tests
154154
path: modules/tee/tf-m/psa-arch-tests

0 commit comments

Comments
 (0)