From d536d8b9ca8ef1264ca6abaa3a21ff9e0693217a Mon Sep 17 00:00:00 2001 From: Magdalena Pastula Date: Tue, 30 Sep 2025 14:55:32 +0200 Subject: [PATCH 1/2] manifest: update zephyr to have it aligned to BSP outside of nrfx Update sdk-zephyr revision to have it aligned to BSP outside of hal_nordic directory. Signed-off-by: Magdalena Pastula --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index bef1f072851c..61bc5888fe5b 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: c475e9f2c9eedd5aef47e2e0a36eb02d05e87a7f + revision: pull/3342/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From df94c871b96b8825ace9a66ef0c3aec1c3cd5ade Mon Sep 17 00:00:00 2001 From: Magdalena Pastula Date: Mon, 29 Sep 2025 17:19:31 +0200 Subject: [PATCH 2/2] modules: hal_nordic: align to BSP outside of nrfx Align to external BSP outside of nrfx directory. Signed-off-by: Magdalena Pastula --- modules/hal_nordic/nrfx/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt index d8efb042f0c2..a9d0be8ea908 100644 --- a/modules/hal_nordic/nrfx/CMakeLists.txt +++ b/modules/hal_nordic/nrfx/CMakeLists.txt @@ -4,9 +4,15 @@ zephyr_library_amend(${ZEPHYR_NRF_MODULE_DIR}) set(BSP_DIR ${NRFX_DIR}/bsp) -set(SOC_DIR ${BSP_DIR}/${CONFIG_SOC_NORDIC_BSP_NAME}) + +if(CONFIG_SOC_NORDIC_BSP_NAME STREQUAL "stable") + set(SOC_DIR ${BSP_DIR}/${CONFIG_SOC_NORDIC_BSP_NAME}) +else() + string(TOUPPER ${CONFIG_SOC_NORDIC_BSP_NAME} BSP_MODULE_NAME) + set(SOC_DIR "${ZEPHYR_${BSP_MODULE_NAME}_MODULE_DIR}") +endif() + set(MDK_DIR ${SOC_DIR}/mdk) -set(mdk_dir ${NRFX_DIR}/mdk) # Add definitions for products which are yet to be upstreamed. zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A_ENGA NRF54LM20A_ENGA_XXAA)