[nrf fromtree] Integrate nrfx 3.10.0 - postupmerge #2492
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The following west manifest projects have changed revision in this Pull Request:
✅ All manifest checks OK Note: This message is automatically posted and updated by the Manifest GitHub Action. |
nika-nordic
force-pushed
the
integrate_nrfx_3_10_sdkzephyr_postupmerge
branch
4 times, most recently
from
cc1176b to
3d19096
Compare
nika-nordic
force-pushed
the
integrate_nrfx_3_10_sdkzephyr_postupmerge
branch
from
3d19096 to
857e1c3
Compare
nordic-krch
approved these changes
Feb 21, 2025
mstasiaknordic
approved these changes
Feb 21, 2025
…g driver Update with the latest nordic hal Signed-off-by: Alberto Escolar Piedras <[email protected]> (cherry picked from commit 2a95e22)
… 3.10.0 New nrfx version contains support for nRF7120 Eng A device. Signed-off-by: Nikodem Kastelik <[email protected]> (cherry picked from commit 3fe559a)
…nction Avoid unhandled event calling assert function Signed-off-by: Matthias Hauser <[email protected]> (cherry picked from commit 5438643)
…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 2692f16)
…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 f551b2d)
…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)
This reverts commit 3467a9b. Signed-off-by: Nikodem Kastelik <[email protected]>
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]>
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 931c671)
nika-nordic
force-pushed
the
integrate_nrfx_3_10_sdkzephyr_postupmerge
branch
from
857e1c3 to
8057f8c
Compare
adamkondraciuk
approved these changes
Feb 21, 2025
anangl
approved these changes
Feb 21, 2025
Comment on lines
+69
to
+78
| /* Define auxiliary symbols needed for SDC device dispatch. */ | ||
| #if defined(CONFIG_SOC_COMPATIBLE_NRF52X) | ||
| #define NRF52_SERIES | ||
| #elif defined(CONFIG_SOC_COMPATIBLE_NRF53X) | ||
| #define NRF53_SERIES | ||
| #elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX) | ||
| #define NRF54L_SERIES | ||
| #elif defined(CONFIG_SOC_SERIES_NRF54HX) | ||
| #define NRF54H_SERIES | ||
| #endif |
There was a problem hiding this comment.
Well, this is quite hacky and I suppose it may be a source of confusion in the future. But let's go with this right now (I don't see an easy applicable alternative) and solve this problem in a better way in follow-up PRs.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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)