From b2bbe04552ffd84e7c49f0951eb759d1b0af2553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bainczyk?= Date: Wed, 5 Nov 2025 14:43:09 +0100 Subject: [PATCH 1/3] Revert "quarantine: add nrfx samples to quarantine" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e0c0dda815543162b3b9bea6d1a24ac3a29b657d. Signed-off-by: Michał Bainczyk --- scripts/quarantine_zephyr.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index 2d7be22219e1..8e8e95faa190 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -598,7 +598,3 @@ platforms: - nrf54h20dk@0.9.0/nrf54h20/cpuapp comment: "Requires rebase on collab-nrfx-4.0 branch" - -- scenarios: - - examples.nrfx.* - comment: "https://nordicsemi.atlassian.net/browse/NRFX-8588" From ef3827914232d41f2dae41776aeb0689751eb60e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bainczyk?= Date: Wed, 5 Nov 2025 14:44:20 +0100 Subject: [PATCH 2/3] Revert "modules: hal_nordic: use hal_nordic for nrfx 4.0-rc1 release" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5ce1b7ffc789411f1fa99ae27b5d2284fe2befa4. Signed-off-by: Michał Bainczyk --- modules/hal_nordic/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt index 3c5945d6dd03..4291e78e21e8 100644 --- a/modules/hal_nordic/CMakeLists.txt +++ b/modules/hal_nordic/CMakeLists.txt @@ -1,5 +1,10 @@ # Copyright (c) 2025 Nordic Semiconductor ASA # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# Set path to the latest version of nrfx +set(NRFX_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../nrfx/) +set(NRFX_DIR ${NRFX_DIR} CACHE STRING "Path to nrfx") + zephyr_get(NRFX_DIR SYSBUILD GLOBAL) if(NOT DEFINED NRFX_DIR) From b1c5c1a2e57da3641d785200447bdade55b55088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bainczyk?= Date: Wed, 5 Nov 2025 15:19:42 +0100 Subject: [PATCH 3/3] manifest: Update nrfx and Zephyr to have updated samples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Testing. Signed-off-by: Michał Bainczyk --- west.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/west.yml b/west.yml index 790ca1300b66..54c5dabf816e 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: a0491b6ceaf072ff7fa108ecfeddb7cbc6c3afa7 + revision: pull/3472/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -280,7 +280,7 @@ manifest: path: nrfx groups: - nrfx - revision: 438fc5f49a2cfdef455b3f3b273814489ff7a571 + revision: 6c464bfd952620d44c4ac4550760b480047586c2 # West-related configuration for the nrf repository. self: