From 1e73b581c6f7d481ad604f6c6b8c0273d3206f42 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 13 May 2025 12:00:10 +0100 Subject: [PATCH] sysbuild: Add support for image configuration dtc overlay files Adds support for using image-specific configuration devicetree overlay files Signed-off-by: Jamie McCrae --- .../sysbuild/cmake/modules/sysbuild_extensions.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake index ec45fbdef5d..6ee3a6156b0 100644 --- a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake +++ b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake @@ -388,6 +388,17 @@ function(ExternalZephyrProject_Add) if(DEFINED ZBUILD_APP_TYPE) list(APPEND image_default "${CMAKE_SOURCE_DIR}/image_configurations/${ZBUILD_APP_TYPE}_image_default.cmake") + set(image_default_dtc_overlay "${CMAKE_SOURCE_DIR}/image_configurations/${ZBUILD_APP_TYPE}_image_default.overlay") + + if(EXISTS ${image_default_dtc_overlay}) + if(NOT ${image_default_dtc_overlay} IN_LIST ${ZBUILD_APPLICATION}_EXTRA_DTC_OVERLAY_FILE) + list(APPEND ${ZBUILD_APPLICATION}_EXTRA_DTC_OVERLAY_FILE ${image_default_dtc_overlay}) + set(${ZBUILD_APPLICATION}_EXTRA_DTC_OVERLAY_FILE + ${${ZBUILD_APPLICATION}_EXTRA_DTC_OVERLAY_FILE} + CACHE INTERNAL "Application extra DTC overlay file" FORCE + ) + endif() + endif() endif() set_target_properties(${ZBUILD_APPLICATION} PROPERTIES IMAGE_CONF_SCRIPT "${image_default}")