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

modules: hal_nordic: nrfx: cleanup #81661

Merged
merged 3 commits into from
Jan 14, 2025

Conversation

masz-nordic
Copy link
Collaborator

  • Remove copied nrfx_configs, use ones from hal_nordic
  • Other cleanups

@zephyrbot
Copy link
Collaborator

zephyrbot commented Nov 20, 2024

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

Name Old Revision New Revision Diff
hal_nordic zephyrproject-rtos/hal_nordic@c563b0e zephyrproject-rtos/hal_nordic@ecea8cd (master) zephyrproject-rtos/[email protected]

All manifest checks OK

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

@zephyrbot zephyrbot added manifest manifest-hal_nordic DNM This PR should not be merged (Do Not Merge) labels Nov 20, 2024
@masz-nordic masz-nordic force-pushed the nrfx_config_cleanup branch 5 times, most recently from ed02436 to fedac28 Compare November 22, 2024 10:29
@masz-nordic masz-nordic requested a review from e-rk November 22, 2024 10:31
@masz-nordic masz-nordic force-pushed the nrfx_config_cleanup branch 7 times, most recently from 4538da3 to 1453f38 Compare November 25, 2024 08:44
@masz-nordic masz-nordic marked this pull request as ready for review November 25, 2024 11:09
nika-nordic
nika-nordic previously approved these changes Jan 8, 2025
@masz-nordic masz-nordic force-pushed the nrfx_config_cleanup branch 2 times, most recently from 3a3d3ad to 0013ae0 Compare January 9, 2025 11:22
@zephyrbot zephyrbot removed the DNM This PR should not be merged (Do Not Merge) label Jan 9, 2025
gmarull
gmarull previously approved these changes Jan 9, 2025
nika-nordic
nika-nordic previously approved these changes Jan 9, 2025
gmarull
gmarull previously approved these changes Jan 10, 2025
Update with fixes for nrfx_config cleanup.

Signed-off-by: Marcin Szymczyk <[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]>
* 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]>
@kartben kartben merged commit 94589b7 into zephyrproject-rtos:main Jan 14, 2025
27 checks passed
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.

9 participants