Nrfx 8369 align sdk zephyr to bsp #3265
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
magp-nordic
force-pushed
the
NRFX-8369-align-sdk-zephyr-to-bsp
branch
2 times, most recently
from
15d3d2b to
f08b2ae
Compare
mib1-nordic
approved these changes
Sep 10, 2025
tejlmand
previously requested changes
Sep 12, 2025
Comment on lines
25
to
29
| zephyr_compile_definitions(NRFX_BSP_NRF_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/mdk/nrf.h") | ||
| zephyr_compile_definitions(NRFX_BSP_ERRATAS_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/mdk/nrf_erratas.h") | ||
| zephyr_compile_definitions(NRFX_BSP_SOC_IRQS_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/soc/nrfx_irqs.h") | ||
| zephyr_compile_definitions(NRFX_BSP_NRFX_EXT_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/nrfx_ext.h") | ||
| zephyr_compile_definitions(NRFX_BSP_NRFX_COREDEP_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/soc/nrfx_coredep_defs.h") |
There was a problem hiding this comment.
no, we should not start passing a bunch of compiler definitions to all source files.
This means even main.c is now compiled with:
$ /opt/zephyr-sdk-0.16.9/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc ...
-DNRFX_BSP_ERRATAS_PATH=\"stable/mdk/nrf_erratas.h\"
-DNRFX_BSP_NRFX_COREDEP_PATH=\"stable/soc/nrfx_coredep_defs.h\"
-DNRFX_BSP_NRFX_EXT_PATH=\"stable/nrfx_ext.h\"
-DNRFX_BSP_NRF_PATH=\"stable/mdk/nrf.h\"
-DNRFX_BSP_SOC_IRQS_PATH=\"stable/soc/nrfx_irqs.h\"
... -c .../samples/hello_world/src/main.c
not to mention the fact that if you change the value of a compile definition, then all sources will rebuild on an incremental build because they now all have the compile definition applied.
There was a problem hiding this comment.
This should not be an issue for targets in-tree, those defines have defaults that evaluate to stable path.
@magp-nordic can you add condition that does not set them if CONFIG_SOC_NORDIC_BSP_NAME is stable?
For out of tree targets, those defines will be needed and that is a design decision. Since development on those targets will be limited, it should be acceptable for that audience to live with a few additional defines.
Incremental rebuild should not be an issue since those Kconfigs are set once and never changed.
magp-nordic
force-pushed
the
NRFX-8369-align-sdk-zephyr-to-bsp
branch
from
0f57108 to
73243ab
Compare
magp-nordic
force-pushed
the
NRFX-8369-align-sdk-zephyr-to-bsp
branch
2 times, most recently
from
73243ab to
c2ec77a
Compare
masz-nordic
approved these changes
Sep 18, 2025
mstasiaknordic
approved these changes
Sep 18, 2025
This was referenced Sep 19, 2025
Align paths after introducing BSP. Upstream PR #: 96160 Signed-off-by: Magdalena Pastula <[email protected]>
Align paths after introducing BSP. Upstream PR #: 96160 Signed-off-by: Magdalena Pastula <[email protected]>
Temporarily change path from hal_nordic to nrfx in BICR CMake. This is needed, because BICR is in soc directory which is included before modules, where NRFX_DIR symbol is defined. Upstream PR #: 96160 Signed-off-by: Magdalena Pastula <[email protected]>
nrfx_uarte_rx is deprecated and will be soon removed. Replaced by new API. Upstream PR #: 96153 Signed-off-by: Michał Stasiak <[email protected]>
magp-nordic
force-pushed
the
NRFX-8369-align-sdk-zephyr-to-bsp
branch
from
c2ec77a to
df31c4a
Compare
masz-nordic
merged commit 0c9648f
into
nrfconnect:collab-nrfx-4.0
16 of 17 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
No description provided.