Skip to content

[nrf fromtree] sysbuild: Allow to use file suffix DTS overlays #2929

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

Conversation

tomchy
Copy link
Contributor

@tomchy tomchy commented Jun 2, 2025

Fix the incorrect syntax in the cmake foreach directive.

Ref: NCSDK-NONE

Upstream PR #: 90643

@tomchy tomchy force-pushed the bugfix/sysbuild/NCSDK-NONE_Allow_to_add_suffix_overlays branch from b195fc0 to 292af33 Compare June 6, 2025 07:25
This reverts commit ef44738.

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
@tomchy tomchy force-pushed the bugfix/sysbuild/NCSDK-NONE_Allow_to_add_suffix_overlays branch 3 times, most recently from 07aed53 to 1d38281 Compare June 10, 2025 10:41
@tomchy tomchy changed the title [nrf fromlist] sysbuild: Allow to use file suffix DTS overlays [nrf fromtree] sysbuild: Allow to use file suffix DTS overlays Jun 10, 2025
Allow to add an image-specific DTS overlay, that is applied based on the
FILE_SUFFIX.
Up to this point, it was possible to specify such Kconfig files
(sysbuild/<image>_<file_suffix>.conf),
but it did not work with dts overlays
(sysbuild/<image>_<file_suffix>.overlay).
This commit aligns the logic of finding configuration files for both
scenarios mentioned above.

Ref: NCSDK-NONE

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
(cherry picked from commit 13a0f05)
@tomchy tomchy force-pushed the bugfix/sysbuild/NCSDK-NONE_Allow_to_add_suffix_overlays branch from 1d38281 to 8956efd Compare June 10, 2025 10:45
Copy link

@nordicjm nordicjm merged commit 49a8301 into nrfconnect:main Jun 11, 2025
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants