Skip to content

[nrf noup] hal_nordic: Fix MPSL include that might cause unwanted dependencies #3092

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 29, 2025
Merged

[nrf noup] hal_nordic: Fix MPSL include that might cause unwanted dependencies #3092

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
#endif /* CONFIG_NRF_802154_RADIO_DRIVER */

#if defined(CONFIG_MPSL)
#include <mpsl.h>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add nrf-squash! with original commit title in commit message

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added nrf-squash! [nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS to commit message

#include <mpsl_hwres.h>
#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_PPI_CHANNELS_USED_MASK
#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
Expand Down