Skip to content

Commit 2f89c25

Browse files
committed
modules: hal_nordic: NRFX_GPPI enables GPPI on all platforms
Changed the CMakeLists to enable the nrfx_gppi utilities based solely on the CONFIG_NRFX_GPPI Kconfig. This unifies the configuration on all nRF SoC families. Upstream PR: zephyrproject-rtos/zephyr#81602 Signed-off-by: Rafał Kuźnia <[email protected]>
1 parent bb7a3ca commit 2f89c25

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

modules/hal_nordic/nrfx/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ zephyr_library_sources(nrfx_glue.c)
116116
zephyr_library_sources(${HELPERS_DIR}/nrfx_flag32_allocator.c)
117117
zephyr_library_sources_ifdef(CONFIG_RETAINED_MEM_NRF_RAM_CTRL ${HELPERS_DIR}/nrfx_ram_ctrl.c)
118118
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI ${HELPERS_DIR}/nrfx_gppi_dppi.c)
119-
zephyr_library_sources_ifdef(CONFIG_NRFX_PPI ${HELPERS_DIR}/nrfx_gppi_ppi.c)
119+
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI ${HELPERS_DIR}/nrfx_gppi_ppi.c)
120120

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

@@ -204,9 +204,7 @@ if(CONFIG_SOC_SERIES_NRF54LX AND CONFIG_NRFX_GPPI)
204204
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/dppic_ppib/nrfx_interconnect_dppic_ppib.c)
205205
endif()
206206

207-
if(CONFIG_SOC_SERIES_NRF54HX AND
208-
(CONFIG_DT_HAS_NORDIC_NRF_DPPIC_LOCAL_ENABLED OR
209-
CONFIG_DT_HAS_NORDIC_NRF_DPPIC_GLOBAL_ENABLED))
207+
if(CONFIG_SOC_SERIES_NRF54HX AND CONFIG_NRFX_GPPI)
210208
zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi_ppib.c)
211209
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/apb/nrfx_interconnect_apb.c)
212210
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/ipct/nrfx_interconnect_ipct.c)

0 commit comments

Comments
 (0)