From 0ea8a100bb2e3b45f86cfaff6552ff19eb75943b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?= Date: Mon, 3 Nov 2025 11:04:49 +0100 Subject: [PATCH 1/2] Revert "modules: hal_nordic: use hal_nordic for nrfx 4.0-rc1 release" This reverts commit 5ce1b7ffc789411f1fa99ae27b5d2284fe2befa4. --- 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 17e37604a38516e3d3398a55366e90eb2e87cb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?= Date: Mon, 3 Nov 2025 14:23:59 +0100 Subject: [PATCH 2/2] manifest: Update nrfx and zephyr with grtc and flag32 update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update nrfx with changing in nrfx_flag32_allocator and nrfx_grtc. Signed-off-by: Krzysztof Chruściński --- west.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/west.yml b/west.yml index 790ca1300b66..15eeb3810a2c 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/3461/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: pull/1015/head # West-related configuration for the nrf repository. self: