From f59f694798e882c8cdc09369b618d5440cdc8ded Mon Sep 17 00:00:00 2001 From: Andrzej Kuros Date: Thu, 13 Jul 2023 16:16:15 +0200 Subject: [PATCH 1/2] manifest: update zephyr and tf-m with nrfx 3.1.0 integration This commit brings in zephyr and trusted-firmware-m with changes needed for nrfx v3.1.0 integration. Signed-off-by: Andrzej Kuros --- west.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/west.yml b/west.yml index c42d212ca0e..df8af616c22 100644 --- a/west.yml +++ b/west.yml @@ -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 @@ -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 From ae8158d13f25071d1a477ff07ff83d6cda01838e Mon Sep 17 00:00:00 2001 From: Andrzej Kuros Date: Mon, 17 Jul 2023 09:55:16 +0200 Subject: [PATCH 2/2] applications: nrf_desktop: quarantine due to flash overflow Disabling configurations that do not build with NRFX 3.1.0 due to flash overflow. Signed-off-by: Andrzej Kuros --- scripts/quarantine.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index a2299d5df85..f02fa0ca22a 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -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"