Skip to content

Commit 463c39f

Browse files
committed
[nrf noup] modules: hal_nordic: Use GPPI for NRF54LX
Use GPPI even when DPPIC nodes are not enabled if platform is NRF54LX. Currently DPPIC nodes are not enabled in FLPR and that allows to use GPPI there. Update path to SoC specific GPPI files which are now located in bsp. Signed-off-by: Krzysztof Chruściński <[email protected]>
1 parent 2bd6027 commit 463c39f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

modules/hal_nordic/nrfx/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,10 @@ zephyr_library_sources_ifdef(CONFIG_HAS_NORDIC_RAM_CTRL ${HELPERS_DIR}/nrf
129129

130130
if(CONFIG_NRFX_GPPI AND NOT CONFIG_NRFX_GPPI_V1)
131131
zephyr_library_sources_ifdef(CONFIG_HAS_HW_NRF_PPI ${HELPERS_DIR}/nrfx_gppi_ppi.c)
132-
zephyr_library_sources_ifdef(CONFIG_HAS_HW_NRF_DPPIC ${HELPERS_DIR}/nrfx_gppi_dppi.c)
133-
zephyr_library_sources_ifdef(CONFIG_SOC_COMPATIBLE_NRF54LX ${HELPERS_DIR}/nrfx_gppi_lumos.c)
132+
if(CONFIG_SOC_SERIES_NRF54LX OR CONFIG_HAS_HW_NRF_DPPIC)
133+
zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi.c)
134+
endif()
135+
zephyr_library_sources_ifdef(CONFIG_SOC_COMPATIBLE_NRF54LX ${BSP_DIR}/soc/interconnect/nrfx_gppi_lumos.c)
134136
endif()
135137

136138
zephyr_library_sources_ifdef(CONFIG_NRFX_PRS ${SRC_DIR}/prs/nrfx_prs.c)

soc/nordic/nrf54l/soc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <lib/nrfx_coredep.h>
2424
#include <soc.h>
2525
#include <helpers/nrfx_gppi.h>
26-
#include <helpers/nrfx_gppi_lumos.h>
26+
#include <soc/interconnect/nrfx_gppi_lumos.h>
2727
LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
2828

2929
#if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) || \

0 commit comments

Comments
 (0)