From 504ff81f8dfb35a255cf6912ebb6d4f6def14b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Stasiak?= Date: Tue, 30 Sep 2025 11:17:23 +0200 Subject: [PATCH 1/3] manifest: update collab-nrfx-4.0 to have wdt_nrfx reworked MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Manifest updated. Also updated sdk-mcuboot to nrfx_wdt changes. Signed-off-by: Michał Stasiak --- west.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/west.yml b/west.yml index 9a9798c3491..7eda17b6db5 100644 --- a/west.yml +++ b/west.yml @@ -66,7 +66,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: c3b37acdd1d91054f7767fea38b907710849a852 + revision: b9bf21a1e92d9416dcf191c502c20c2b6b862e77 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -129,7 +129,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: 40861fd7351604d38af6345e56fe7422529561e6 + revision: pull/558/head path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR @@ -280,7 +280,7 @@ manifest: path: nrfx groups: - nrfx - revision: 125d3e9fa2dcfd9fe3187d6f5e47e269e01023f1 + revision: 0746a590c62e039fd1e453b423d594f5fa57ddc9 # West-related configuration for the nrf repository. self: From b188d59b83e859702bb5cb4169fedb6ebecb2664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Stasiak?= Date: Tue, 30 Sep 2025 13:03:12 +0200 Subject: [PATCH 2/3] tests: drivers: nrfx_integration_test: remove WDT configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed instance specific WDT config symbols. Signed-off-by: Michał Stasiak --- tests/drivers/nrfx_integration_test/Kconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/drivers/nrfx_integration_test/Kconfig b/tests/drivers/nrfx_integration_test/Kconfig index 702432f336e..4dad9893770 100644 --- a/tests/drivers/nrfx_integration_test/Kconfig +++ b/tests/drivers/nrfx_integration_test/Kconfig @@ -104,11 +104,6 @@ config NRFX_ALL_DRIVERS select NRFX_UARTE137 if HAS_HW_NRF_UARTE137 select NRFX_USBD if HAS_HW_NRF_USBD select NRFX_USBREG if HAS_HW_NRF_USBREG - select NRFX_WDT0 if HAS_HW_NRF_WDT0 - select NRFX_WDT1 if HAS_HW_NRF_WDT1 - select NRFX_WDT30 if HAS_HW_NRF_WDT30 - select NRFX_WDT31 if HAS_HW_NRF_WDT31 - select NRFX_WDT130 if HAS_HW_NRF_WDT130 select NRFX_PRS_BOX_0 source "Kconfig.zephyr" From 262d07f3ab277cff126cbbbd720608968bc2a981 Mon Sep 17 00:00:00 2001 From: Magdalena Pastula Date: Wed, 29 Oct 2025 14:28:43 +0100 Subject: [PATCH 3/3] quarantine: temporarily add tests that do not build Temporarily add tests that do not build due to branch collab-nrfx-4.0 not being rebased on main. Signed-off-by: Magdalena Pastula --- scripts/quarantine.yaml | 9 +++++++++ scripts/quarantine_zephyr.yaml | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index a1c51efb58e..ca7297d5ff4 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -214,3 +214,12 @@ platforms: - thingy53/nrf5340/cpuapp comment: "https://nordicsemi.atlassian.net/browse/NRFX-8605" + +- scenarios: + - sample.mcumgr.smp_svr.bt.* + - sample.mcumgr.smp_svr.serial.* + - sample.dfu.dfu_target + platforms: + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + - nrf54l15dk/nrf54l15/cpuapp + comment: "Requires rebase on collab-nrfx-4.0 branch" diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index 0d60b63585b..8e8e95faa19 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -591,3 +591,10 @@ - platforms: - .*ns comment: "https://nordicsemi.atlassian.net/browse/NRFX-8563" + +- scenarios: + - sample.mcumgr.smp_svr.serial.* + - sample.usbd.dfu + platforms: + - nrf54h20dk@0.9.0/nrf54h20/cpuapp + comment: "Requires rebase on collab-nrfx-4.0 branch"