From d9517319ec4facce8d1dabf0e8deb752cd51813c Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Wed, 21 Jun 2023 12:03:37 +0200 Subject: [PATCH] modules: mcuboot: Disable Zephyr's MCUboot handling for child images Change disables Zephyr's MCUboot handling in child images. The NCS handles needed operations on its own. Change is needed to ensure consistency for main application image and child images. Jira: NCSDK-22347 Signed-off-by: Marek Pieta --- modules/mcuboot/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/mcuboot/CMakeLists.txt b/modules/mcuboot/CMakeLists.txt index eb7f39a3876..c33b5cfa9b7 100644 --- a/modules/mcuboot/CMakeLists.txt +++ b/modules/mcuboot/CMakeLists.txt @@ -28,6 +28,10 @@ endif() if(CONFIG_BOOTLOADER_MCUBOOT) if (CONFIG_NCS_IS_VARIANT_IMAGE) + # NCS Handles everything regarding mcuboot, ensure Zephyr doesn't interfere. + # This is a temporary solution until Zephyr signing has been made more modular. + set(CONFIG_BOOTLOADER_MCUBOOT False PARENT_SCOPE) + # When building the variant of an image, the configuration of the variant image # is identical to the base image, except 'CONFIG_NCS_IS_VARIANT_IMAGE'. The # logic below should only be performed once, for the base image, not for the variant variant.