From fa2d7e6d187800603f987aac80750554a421aafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Duda?= Date: Mon, 25 Aug 2025 12:36:22 +0200 Subject: [PATCH] sysbuild: packaging: Fix selection of application image path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Select the application image path based on encryption support, matching the behavior of zip packaging. Signed-off-by: Łukasz Duda --- subsys/bootloader/cmake/packaging.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/subsys/bootloader/cmake/packaging.cmake b/subsys/bootloader/cmake/packaging.cmake index 9962a3d02c4f..f09834078d83 100644 --- a/subsys/bootloader/cmake/packaging.cmake +++ b/subsys/bootloader/cmake/packaging.cmake @@ -17,7 +17,13 @@ if(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD) sysbuild_get(${DEFAULT_IMAGE}_kernel_name IMAGE ${DEFAULT_IMAGE} VAR CONFIG_KERNEL_BIN_NAME KCONFIG) list(APPEND dfu_multi_image_ids 0) - list(APPEND dfu_multi_image_paths "${${DEFAULT_IMAGE}_image_dir}/zephyr/${${DEFAULT_IMAGE}_kernel_name}.signed.bin") + + if(SB_CONFIG_BOOT_ENCRYPTION) + list(APPEND dfu_multi_image_paths "${${DEFAULT_IMAGE}_image_dir}/zephyr/${${DEFAULT_IMAGE}_kernel_name}.signed.encrypted.bin") + else() + list(APPEND dfu_multi_image_paths "${${DEFAULT_IMAGE}_image_dir}/zephyr/${${DEFAULT_IMAGE}_kernel_name}.signed.bin") + endif() + list(APPEND dfu_multi_image_targets ${DEFAULT_IMAGE}_extra_byproducts ${dfu_multi_image_paths}) endif()