diff --git a/lib/ram_pwrdn/ram_pwrdn.c b/lib/ram_pwrdn/ram_pwrdn.c index 99cf09019e0f..3c1186ea67e6 100644 --- a/lib/ram_pwrdn/ram_pwrdn.c +++ b/lib/ram_pwrdn/ram_pwrdn.c @@ -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, @@ -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, 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) diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt index b413d595705b..d8efb042f0c2 100644 --- a/modules/hal_nordic/nrfx/CMakeLists.txt +++ b/modules/hal_nordic/nrfx/CMakeLists.txt @@ -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. @@ -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) diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index 3f21e9da2d10..40babbdc7068 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -139,3 +139,36 @@ platforms: - nrf54h20dk@0.9.0/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 diff --git a/tests/drivers/nrfx_integration_test/Kconfig b/tests/drivers/nrfx_integration_test/Kconfig index b3775f55a876..ce977a92737e 100644 --- a/tests/drivers/nrfx_integration_test/Kconfig +++ b/tests/drivers/nrfx_integration_test/Kconfig @@ -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" diff --git a/west.yml b/west.yml index 90fa9136c877..0755fea7eb18 100644 --- a/west.yml +++ b/west.yml @@ -49,6 +49,7 @@ manifest: - -libmodem - -bsec - -doc-internal + - -nrfx - +optional # "projects" is a list of git repositories which make up the NCS @@ -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 @@ -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: