Skip to content

Nrfx 8369 align paths to bsp #24471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 26, 2025
Merged

Nrfx 8369 align paths to bsp #24471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
794dc1b
manifest: add development nrfx and change zephyr revision
mib1-nordic Sep 10, 2025
b1645e2
modules: hal_nordic: set NRFX_DIR to point to nrfx in development
mib1-nordic Sep 10, 2025
c3617d1
manifest: update sdk-zephyr to be aligned to BSP
magp-nordic Sep 10, 2025
1890b75
modules: hal_nordic: nrfx: align MDK path to BSP
magp-nordic Sep 12, 2025
445afde
manifest: update nrfx with fixes for NCS BSP alignment
magp-nordic Sep 12, 2025
828c6f5
tests: drivers: nrfx_integration_test: remove selecting PRS BOX > 0
magp-nordic Sep 15, 2025
9c2953f
lib: ram_pwrdn: replace deprecated NRF_POWER symbol
mstasiaknordic Sep 18, 2025
fa2fdb1
manifest: add group filter for nrfx
magp-nordic Sep 18, 2025
37b841c
scripts: quarantine: add not passing tests to quarantine
magp-nordic Sep 18, 2025
f25664d
scripts: quarantine: add not passing thingy tests to quarantine
magp-nordic Sep 24, 2025
6ddd688
scripts: quarantine: add failing nRF54LV10 event manager proxy test
magp-nordic Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/ram_pwrdn/ram_pwrdn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ static const struct ram_bank banks[] = {
static void ram_bank_power_down(uint8_t bank_id, uint8_t first_section_id, uint8_t last_section_id)
{
#if defined(CONFIG_SOC_NRF52840) || defined(CONFIG_SOC_NRF52833)
uint32_t mask = GENMASK(NRF_POWER_RAMPOWER_S0POWER + last_section_id,
NRF_POWER_RAMPOWER_S0POWER + first_section_id);
uint32_t mask = GENMASK(NRF_POWER_RAMPOWER_S0POWER_POS + last_section_id,
NRF_POWER_RAMPOWER_S0POWER_POS + first_section_id);
nrf_power_rampower_mask_off(NRF_POWER, bank_id, mask);
#elif defined(CONFIG_SOC_NRF5340_CPUAPP)
uint32_t mask = GENMASK(VMC_RAM_POWER_S0POWER_Pos + last_section_id,
Expand All @@ -106,8 +106,8 @@ static void ram_bank_power_down(uint8_t bank_id, uint8_t first_section_id, uint8
static void ram_bank_power_up(uint8_t bank_id, uint8_t first_section_id, uint8_t last_section_id)
{
#if defined(CONFIG_SOC_NRF52840) || defined(CONFIG_SOC_NRF52833)
uint32_t mask = GENMASK(NRF_POWER_RAMPOWER_S0POWER + last_section_id,
NRF_POWER_RAMPOWER_S0POWER + first_section_id);
uint32_t mask = GENMASK(NRF_POWER_RAMPOWER_S0POWER_POS + last_section_id,
NRF_POWER_RAMPOWER_S0POWER_POS + first_section_id);
nrf_power_rampower_mask_on(NRF_POWER, bank_id, mask);
#elif defined(CONFIG_SOC_NRF5340_CPUAPP)
uint32_t mask = GENMASK(VMC_RAM_POWER_S0POWER_Pos + last_section_id,
Expand Down
5 changes: 5 additions & 0 deletions modules/hal_nordic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Comment on lines +3 to +7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why ?

And also, never assume a given Zephyr module is placed relative to another, as a west manifest could define other location. Use the module name dir location.

Copy link
Contributor Author

@magp-nordic magp-nordic Sep 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tejlmand, this change is from #24454 PR, which this PR is based on. Generally, it is a temporary change and is needed only for the collab-nrfx-4.0 branch, to change the nrfx directory to the internal one, which is fetched with west. If you have any more notes regarding those changes, please report them in #24454 Changes from #24454 will be merged with this PR, so we can keep the conversation here.

zephyr_get(NRFX_DIR SYSBUILD GLOBAL)

if(NOT DEFINED NRFX_DIR)
Expand Down
5 changes: 4 additions & 1 deletion modules/hal_nordic/nrfx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

zephyr_library_amend(${ZEPHYR_NRF_MODULE_DIR})

set(BSP_DIR ${NRFX_DIR}/bsp)
set(SOC_DIR ${BSP_DIR}/${CONFIG_SOC_NORDIC_BSP_NAME})
set(MDK_DIR ${SOC_DIR}/mdk)
set(mdk_dir ${NRFX_DIR}/mdk)

# Add definitions for products which are yet to be upstreamed.
Expand All @@ -18,7 +21,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF7120_ENGA NRF7120_ENGA_XXAA)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF7120_ENGA_CPUAPP NRF_APPLICATION)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF7120_ENGA_CPUFLPR NRF_FLPR)

zephyr_library_sources_ifdef(CONFIG_SOC_NRF7120_ENGA ${mdk_dir}/system_nrf7120_enga.c)
zephyr_library_sources_ifdef(CONFIG_SOC_NRF7120_ENGA ${MDK_DIR}/system_nrf7120_enga.c)

mdk_svd_ifdef(CONFIG_SOC_NRF54LM20A_ENGA_CPUAPP nrf54lm20a_enga_application.svd)
mdk_svd_ifdef(CONFIG_SOC_NRF54LM20A_ENGA_CPUFLPR nrf54lm20a_enga_flpr.svd)
Expand Down
33 changes: 33 additions & 0 deletions scripts/quarantine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,36 @@
platforms:
- [email protected]/nrf54h20/cpuapp
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35605"

- scenarios:
- applications.nrf_desktop.*
platforms:
- nrf52kbd/nrf52832
comment: "Needs alignment to new errata system in nrfx - NRFX-8421"

- scenarios:
- sample.bluetooth.mesh.light_ctrl
platforms:
- nrf52dk/nrf52832
comment: "Needs alignment to new errata system in nrfx - NRFX-8421"

- scenarios:
- sample.bluetooth.nrf_dm.timeslot
platforms:
- nrf52dk/nrf52832
comment: "Needs alignment to new errata system in nrfx - NRFX-8421"

- scenarios:
- sample.bluetooth.mesh.light_ctrl.emds
platforms:
- thingy53/nrf5340/cpuapp

- scenarios:
- applications.matter_weather_station.debug
platforms:
- thingy53/nrf5340/cpuapp

- scenarios:
- event_manager_proxy.icmsg.cpuflpr
platforms:
- nrf54lv10dk/nrf54lv10a/cpuapp
4 changes: 0 additions & 4 deletions tests/drivers/nrfx_integration_test/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,5 @@ config NRFX_ALL_DRIVERS
select NRFX_WDT31 if HAS_HW_NRF_WDT31
select NRFX_WDT130 if HAS_HW_NRF_WDT130
select NRFX_PRS_BOX_0
select NRFX_PRS_BOX_1
select NRFX_PRS_BOX_2
select NRFX_PRS_BOX_3
select NRFX_PRS_BOX_4

source "Kconfig.zephyr"
9 changes: 8 additions & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ manifest:
- -libmodem
- -bsec
- -doc-internal
- -nrfx
- +optional

# "projects" is a list of git repositories which make up the NCS
Expand All @@ -65,7 +66,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: d792280a1c8639ac103ce0dd094f8d5dd4e5377d
revision: 0c9648fe64f0a4b82eaa5db7d0d1af5386cc91de
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -274,6 +275,12 @@ manifest:
revision: d5fad6bd094899101a4e5fd53af7298160ced6ab
groups:
- benchmark
- name: nrfx
remote: ncs
path: nrfx
groups:
- nrfx
revision: eadf25033e69b9908f36add188ac62b354914922

# West-related configuration for the nrf repository.
self:
Expand Down
Loading