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.

Sign up for GitHub

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

Jump to bottom

manifest: update zephyr and tf-m with nrfx 3.1.0 integration #11800

Merged
merged 2 commits into from
Aug 17, 2023
Merged

manifest: update zephyr and tf-m with nrfx 3.1.0 integration #11800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f59f694
manifest: update zephyr and tf-m with nrfx 3.1.0 integration
ankuns Jul 13, 2023
ae8158d
applications: nrf_desktop: quarantine due to flash overflow
ankuns Jul 17, 2023
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
7 changes: 7 additions & 0 deletions scripts/quarantine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,10 @@
platforms:
- all
comment: "Temporary disable till the issue is fixed"

- scenarios:
- applications.nrf_desktop.zrelease
platforms:
- nrf52833dk_nrf52820
- nrf52820dongle_nrf52820
comment: "Temporary disabled due to flash overflow"
4 changes: 2 additions & 2 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: d5254ae5f0f9a8182b47ecc984928aa3d5b77c16
revision: 451c1c4b439597b6f4fa6466cb070a0b15aea641
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -143,7 +143,7 @@ manifest:
- name: trusted-firmware-m
repo-path: sdk-trusted-firmware-m
path: modules/tee/tf-m/trusted-firmware-m
revision: 7815216da6115cfd563355ebf1e6e00dfeefa2dc
revision: 6ad9c58f9bd55f386970533d0c9942dabe122945
- name: matter
repo-path: sdk-connectedhomeip
path: modules/lib/matter
Expand Down
Loading