Skip to content

sysbuild: Allow to use file suffix DTS overlays #90643

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 May 27, 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.

@tomchy tomchy force-pushed the bugfix/sysbuild/NCSDK-NONE_Allow_to_add_suffix_overlays_upstream branch 3 times, most recently from 01bc426 to a75ddc6 Compare May 27, 2025 09:45
nordicjm
nordicjm previously approved these changes May 27, 2025
@tomchy tomchy force-pushed the bugfix/sysbuild/NCSDK-NONE_Allow_to_add_suffix_overlays_upstream branch from a75ddc6 to 379ae05 Compare June 2, 2025 12:25
@tomchy tomchy requested a review from nordicjm June 2, 2025 15:38
nvlsianpu
nvlsianpu previously approved these changes Jun 3, 2025
@nvlsianpu nvlsianpu dismissed their stale review June 3, 2025 07:23

accidentally approved

@tomchy tomchy requested a review from nvlsianpu June 3, 2025 08:52
Copy link
Collaborator

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

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

squash changes, no fixup commits allowed

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 <[email protected]>
@tomchy tomchy requested a review from nordicjm June 10, 2025 08:06
@tomchy tomchy force-pushed the bugfix/sysbuild/NCSDK-NONE_Allow_to_add_suffix_overlays_upstream branch from 379ae05 to 3b7867d Compare June 10, 2025 08:06
Copy link

@kartben kartben merged commit 13a0f05 into zephyrproject-rtos:main Jun 10, 2025
26 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.

5 participants