sysbuild: disable partition manager / child image when sysbuild is used

Sysbuild and parent / child image are mutual exclusive.

Thus it is not possible to use both at the same time.
In parent / child image, the partition manager is invoked in the parent
image, and also in each domain image.

With sysbuild, the partition manager is invoked in sysbuild.
Therefore when building images through sysbuild, then partition manager
must be disabled in the image build.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>

Author: tejlmand

cmake/multi_image.cmake

@@ -4,6 +4,15 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
+if(SYSBUILD)
+  # Sysbuild and child-image are mutual exclusive, so if sysbuild is used disable child-image
+  function(add_child_image)
+    set(CONFIG_USE_PARTITION_MANAGER n CACHE INTERNAL "")
+    # ignore, sysbuild is in use.
+  endfunction()
+  return()
+endif()
+
 if(IMAGE_NAME)
   set_shared(IMAGE ${IMAGE_NAME} PROPERTY KERNEL_HEX_NAME ${KERNEL_HEX_NAME})
   set_shared(IMAGE ${IMAGE_NAME} PROPERTY ZEPHYR_BINARY_DIR ${ZEPHYR_BINARY_DIR})

modules/mcuboot/CMakeLists.txt

@@ -2,6 +2,12 @@ add_subdirectory(${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/bootutil/zephyr
                  ${CMAKE_CURRENT_BINARY_DIR}/boot/bootutil/zephyr
 )
 
+if(SYSBUILD)
+  # Code below is partition manager w/ child image support, thus return when
+  # sysbuild is used.
+  return()
+endif()
+
 if (CONFIG_MCUBOOT)
   if (CONFIG_NRF53_MULTI_IMAGE_UPDATE)
     set_shared(IMAGE ${IMAGE_NAME} PROPERTY NRF53_MULTI_IMAGE_UPDATE

subsys/CMakeLists.txt

@@ -8,7 +8,9 @@ add_subdirectory_ifdef(CONFIG_BT bluetooth)
 
 add_subdirectory_ifdef(CONFIG_BOOTLOADER_MCUBOOT bootloader/bl_override)
 add_subdirectory_ifdef(CONFIG_IS_SECURE_BOOTLOADER bootloader)
-add_subdirectory_ifdef(CONFIG_SECURE_BOOT bootloader/image)
+if(NOT SYSBUILD)
+  add_subdirectory_ifdef(CONFIG_SECURE_BOOT bootloader/image)
+endif()
 add_subdirectory_ifdef(CONFIG_SECURE_BOOT_CRYPTO bootloader/bl_crypto)
 add_subdirectory_ifdef(CONFIG_SECURE_BOOT_VALIDATION bootloader/bl_validation)
 add_subdirectory_ifdef(CONFIG_SECURE_BOOT_STORAGE bootloader/bl_storage)