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 - postupmerge #2492

Open
wants to merge 14 commits into
base: main
Choose a base branch
from

Conversation

nika-nordic
Copy link
Contributor

Post-upmerge continuation of #2460 .

Keeping both PRs opened for now to make sure nothing was missed during rebase (and nrfx 3.10 has quite a few dependencies)

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 13, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
hal_nordic zephyrproject-rtos/hal_nordic@ecea8cd zephyrproject-rtos/hal_nordic@a1db06a zephyrproject-rtos/[email protected]

All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@nika-nordic nika-nordic force-pushed the integrate_nrfx_3_10_sdkzephyr_postupmerge branch 3 times, most recently from f4ea13d to 36d760d Compare February 18, 2025 08:49
aescolar and others added 11 commits February 20, 2025 10:14
…g driver

Update with the latest nordic hal

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 2a95e2291f90d0e38490c4b922f8bcf50e67705a)
… 3.10.0

New nrfx version contains support for nRF7120 Eng A device.

Signed-off-by: Nikodem Kastelik <[email protected]>
(cherry picked from commit 3fe559a0c6bb23ac04758d89cfd494562bd1ae90)
…nction

Avoid unhandled event calling assert function

Signed-off-by: Matthias Hauser <[email protected]>
(cherry picked from commit 543864321cbdf5a60ed7e76976f52e28147c75e5)
…nts for now

New events from nrfx_clock driver are not utilized for now
by the clock_control, so should be ignored to avoid assertion.

Signed-off-by: Nikodem Kastelik <[email protected]>
(cherry picked from commit 2692f167576b74c0a9f13309d5a55f88a93f2cc6)
…4H20"

This reverts commit b978fbb.

Signed-off-by: Nikodem Kastelik <[email protected]>
Adding support for reset reasons in the nRF54H20 SoC.

Signed-off-by: Karol Lasończyk <[email protected]>
(cherry picked from commit f551b2dc009c2b12d3a708d0629416afcc807869)
…EXTENDED_ENABLED

nrfx_config is setting NRFX_SPIM_EXTENDED_ENABLED based on presence of
a DT property. However, there are test cases when it is expected that
extended SPIM features will be disabled on a target that supports
extended features. Allow that by not setting the value if it is already
defined.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit eebaf81)
There is no reason to duplicate `nrfx_config_*.h` files.
Use configuration files from `hal_nordic/nrfx/templates`.

Signed-off-by: Marcin Szymczyk <[email protected]>
(cherry picked from commit aa3f787)
* Move all KConfig configuration from CMake to `nrfx_kconfig.h`
* Move macro utils from `nrfx_kconfig.h` to `nrfx_zephyr_utils.h`
* Move GRTC channels allocation from `nrfx_kconfig.h` to
  `nrfx_reserved_resources.h`

Signed-off-by: Marcin Szymczyk <[email protected]>
(cherry picked from commit 94589b7)
Added ncs-specific modules to nrfx_config_reserved_resources.
The modules are:
- mpsl
- nrfe

Signed-off-by: Rafał Kuźnia <[email protected]>
nika-nordic and others added 3 commits February 20, 2025 13:49
As nrfx_config is included before MDK, MDK-specific device symbols
cannot be used. Use Kconfig symbols instead.

Signed-off-by: Nikodem Kastelik <[email protected]>
…MakeLists

534916c2253 moved some defines from CMakeLists.txt to nrfx_kconfig.h
but those defines are used by MDK which does not include nrfx_kconfig.h
and that broke some nrf platforms (e.g. nrf54l20). Moving those
defines back to CMakeLists.txt.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit 738549e)
Update gpio config for more correct handling.

Signed-off-by: Raffael Rostagno <[email protected]>
(cherry picked from commit 931c671cc2e87670b4e49fa44807664721990426)
@nika-nordic nika-nordic force-pushed the integrate_nrfx_3_10_sdkzephyr_postupmerge branch from 3d19096 to 857e1c3 Compare February 20, 2025 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants