Skip to content
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.

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

[nrf fromtree] Integrate nrfx 3.10.0 #2460

Closed
Closed
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8c1001f
[nrf fromtree] soc: nordic: enable DPPI and PPIB nodes by default
e-rk Nov 28, 2024
954fb3c
[nrf fromtree] drivers: serial: nrfx_uarte: Fix endtx-stoptx property…
e-rk Nov 29, 2024
273b094
[nrf fromtree] manifest: update hal_nordic revision
ankuns Dec 23, 2024
00b754c
[nrf fromtree] modules: hal_nordic: remove setting of NRF_802154_USE_…
ankuns Jan 3, 2025
c3d95c8
[nrf fromtree] manifest: update hal_nordic
gmarull Jan 8, 2025
7c966bb
[nrf fromtree] manifest: Update hal_nordic with new cracen hal and rn…
aescolar Jan 14, 2025
b5ad20b
[nrf fromtree] manifest: update hal_nordic revision to integrate nrfx…
nika-nordic Jan 21, 2025
6dd3744
[nrf fromtree] drivers: nrfx: Avoid unhandled event calling assert fu…
mah-eiSmart Jan 17, 2025
3e78599
[nrf fromtree] drivers: clock_control: nrf: ignore XOTUNE-related eve…
nika-nordic Jan 22, 2025
e509253
Revert "[nrf fromlist] drivers: hwinfo: Support for reset reasons in …
nika-nordic Feb 4, 2025
79bce38
[nrf fromtree] drivers: hwinfo: Support for reset reasons in nRF54H20
kl-cruz Nov 22, 2024
745bf59
[nrf fromtree] modules: hal_nordic: NRFX_GPPI enables GPPI on all pla…
e-rk Nov 19, 2024
254cc2b
[nrf fromtree] modules: hal_nordic: nrfx: Add missing GPIOTE logging …
awojasinski Dec 19, 2024
b9cc89e
[nrf fromtree] modules: hal_nordic: nrfx: Compile NRFX_GPPI modules f…
rugeGerritsen Dec 20, 2024
7675981
[nrf fromtree] soc: nordic: nrf54l: Add nrf54l09 enga SoC
nordic-krch Nov 29, 2024
c3dec90
[nrf fromtree] modules: hal_nordic: nrfx_config: Customize NRFX_SPIM_…
nordic-krch Dec 4, 2024
02bf231
Revert "[nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS"
nika-nordic Feb 11, 2025
26207d0
[nrf fromtree] modules: hal_nordic: nrfx: use templates from hal_nordic
masz-nordic Nov 20, 2024
8380653
[nrf fromtree] modules: hal_nordic: nrfx: cleanup
masz-nordic Nov 20, 2024
6c5c154
[nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS
e-rk Oct 22, 2024
23a9366
[nrf noup] modules: hal_nordic: use Kconfig symbols in NCS reservation
nika-nordic Feb 12, 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
Prev Previous commit
Next Next commit
[nrf fromtree] modules: hal_nordic: NRFX_GPPI enables GPPI on all pla…
…tforms

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.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit d2cb0bd)
  • Loading branch information
e-rk authored and nika-nordic committed Feb 12, 2025

Verified

This commit was signed with the committer’s verified signature. The key has expired.
danny-avila Danny Avila
commit 745bf59ab6d226af50adc65493760923ac3b4b3e
6 changes: 2 additions & 4 deletions modules/hal_nordic/nrfx/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -113,7 +113,7 @@ zephyr_library_sources(nrfx_glue.c)
zephyr_library_sources(${HELPERS_DIR}/nrfx_flag32_allocator.c)
zephyr_library_sources_ifdef(CONFIG_HAS_NORDIC_RAM_CTRL ${HELPERS_DIR}/nrfx_ram_ctrl.c)
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI ${HELPERS_DIR}/nrfx_gppi_dppi.c)
zephyr_library_sources_ifdef(CONFIG_NRFX_PPI ${HELPERS_DIR}/nrfx_gppi_ppi.c)
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI ${HELPERS_DIR}/nrfx_gppi_ppi.c)

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

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

if(CONFIG_SOC_SERIES_NRF54HX AND
(CONFIG_DT_HAS_NORDIC_NRF_DPPIC_LOCAL_ENABLED OR
CONFIG_DT_HAS_NORDIC_NRF_DPPIC_GLOBAL_ENABLED))
if(CONFIG_SOC_SERIES_NRF54HX AND CONFIG_NRFX_GPPI)
zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi_ppib.c)
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/apb/nrfx_interconnect_apb.c)
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/ipct/nrfx_interconnect_ipct.c)