Skip to content

Commit 560c3c1

Browse files
committed
sysbuild: Allow to use file suffix DTS overlays
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]>
1 parent 5b20260 commit 560c3c1

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

share/sysbuild/cmake/modules/sysbuild_extensions.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,14 @@ function(ExternalZephyrProject_Add)
283283
)
284284
endif()
285285

286+
# Check for overlay named <ZBUILD_APPLICATION>_<FILE_SUFFIX>.overlay.
287+
set(sysbuild_image_dts_overlay ${sysbuild_image_conf_dir}/${ZBUILD_APPLICATION}_${FILE_SUFFIX}.overlay)
288+
if (NOT ${ZBUILD_APPLICATION}_DTC_OVERLAY_FILE AND EXISTS ${sysbuild_image_dts_overlay})
289+
set(${ZBUILD_APPLICATION}_DTC_OVERLAY_FILE ${sysbuild_image_dts_overlay}
290+
CACHE INTERNAL "devicetree overlay file defined by main application"
291+
)
292+
endif()
293+
286294
# Check for overlay named <ZBUILD_APPLICATION>.overlay.
287295
set(sysbuild_image_dts_overlay ${sysbuild_image_conf_dir}/${ZBUILD_APPLICATION}.overlay)
288296
if (NOT ${ZBUILD_APPLICATION}_DTC_OVERLAY_FILE AND EXISTS ${sysbuild_image_dts_overlay})

0 commit comments

Comments
 (0)