Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest: rebase most OSS trees #8660

Merged
merged 2 commits into from
Sep 8, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 3db330717c1ca3ec4fb133400bf3eb7156aa6cbd
revision: 3afbbacd2ea218f0f203a1c45cb55d5f0eba2820
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -103,28 +103,28 @@ manifest:
revision: 76bd09efa5424a4039a234a7244fe32fa495d9cf
- name: mcuboot
repo-path: sdk-mcuboot
revision: 8b3d00abb132de5f5c46310f88c2208ddf6270d4
revision: 1d535d0ccbf4d213752a58b235e8e46c6a39a6a1
path: bootloader/mcuboot
- name: mbedtls-nrf
path: mbedtls
repo-path: sdk-mbedtls
revision: v3.1.0-ncs1-rc1
revision: cfc83308dd686c4e923e9f278afbdbda7e21af9a
- name: nrfxlib
repo-path: sdk-nrfxlib
path: nrfxlib
revision: ee0d1c66944f15a47d08883c4826b3b4b4cb317e
- name: trusted-firmware-m
repo-path: sdk-trusted-firmware-m
path: modules/tee/tf-m/trusted-firmware-m
revision: a9bbcff01c584b9bfb99abf1ab7f6bb4b6cdf2cc
revision: 43782540336a256fe24c28d5d6bf02d8e2b3a706
- name: tfm-mcuboot # This is used by the trusted-firmware-m module.
repo-path: sdk-mcuboot
path: modules/tee/tfm-mcuboot
revision: v1.7.2-ncs2-rc1
- name: matter
repo-path: sdk-connectedhomeip
path: modules/lib/matter
revision: b8c6fe4ca632dd802a828f886e1decdd98a3952b
revision: 5faaee50ed398de2109881d1aa5320f489131264
submodules:
- name: nlio
path: third_party/nlio/repo
Expand Down