Skip to content

Commit

Permalink
manifest: update manifest for upmerge
Browse files Browse the repository at this point in the history
Updates manifest for upmerge

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
  • Loading branch information
bjarki-andreasen committed Sep 10, 2024
1 parent 9d2c0f9 commit 19f7a98
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 83195a39ab74db0debb05c3ac07f35d56c33fb75
revision: pull/1953/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 @@ -140,7 +140,7 @@ manifest:
compare-by-default: true
- name: mcuboot
repo-path: sdk-mcuboot
revision: v2.1.0-ncs1
revision: pull/327/head
path: bootloader/mcuboot
- name: qcbor
url: https://github.com/laurencelundblade/QCBOR
Expand All @@ -149,19 +149,19 @@ manifest:
- name: mbedtls
path: modules/crypto/mbedtls
repo-path: sdk-mbedtls
revision: v3.5.2-ncs2
revision: pull/36/head
- name: oberon-psa-crypto
path: modules/crypto/oberon-psa-crypto
repo-path: sdk-oberon-psa-crypto
revision: 5bfe42c2375204e38a067fe15bd33d581fbfbd01
revision: pull/15/head
- name: nrfxlib
repo-path: sdk-nrfxlib
path: nrfxlib
revision: a21499e8ac4bbf00e41879ade74dc95a26f7edb9
revision: pull/head/1464
- name: trusted-firmware-m
repo-path: sdk-trusted-firmware-m
path: modules/tee/tf-m/trusted-firmware-m
revision: 9f68daeafd7b662c96d6fdf61c83222248e3ed9f
revision: pull/head/169
- name: psa-arch-tests
repo-path: sdk-psa-arch-tests
path: modules/tee/tf-m/psa-arch-tests
Expand Down

0 comments on commit 19f7a98

Please sign in to comment.