sysbuild: Allow to build multicore XIP config

Since multicore application uses multiple secondary apps, they cannot
hold the same name (`mcuboot_secondary_app`) and the build system must
be adjusted to generate secondary application name, based on the primary
application name (i.e. `<application>_secondary_app).
Keep the old name (`mcuboot_secondary_app`) for the main (default) image
to keep the backward compatibility with existing tests and
documentation.

Ref: NCSDK-NONE

Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake

@@ -5,6 +5,85 @@
 
 include_guard(GLOBAL)
 
+# Usage:
+#   UpdateableImage_Add(APPLICATION <name>
+#                       GROUP <name>
+#   )
+#
+# This function includes an image inside a list that will be used to trigger
+# bootloader-dependent build and packaging logic.
+#
+# APPLICATION <name>: Name of the application.
+# GROUP <name>:       Application group (i.e. VARIANT)
+function(UpdateableImage_Add)
+  cmake_parse_arguments(VIMAGE "" "APPLICATION;GROUP" "" ${ARGN})
+
+  if(VIMAGE_GROUP)
+    set(group ${VIMAGE_GROUP})
+  else()
+    set(group "DEFAULT")
+  endif()
+
+  # Update list of avilable groups
+  get_property(
+    groups GLOBAL PROPERTY sysbuild_updateable_groups
+  )
+  list(APPEND groups ${group})
+  list(REMOVE_DUPLICATES groups)
+  set_property(
+    GLOBAL PROPERTY sysbuild_updateable_groups ${groups}
+  )
+
+  # Append the image name
+  set_property(
+    GLOBAL
+    APPEND PROPERTY sysbuild_updateable_${group} ${VIMAGE_APPLICATION}
+  )
+endfunction()
+
+# Usage:
+#   UpdateableImage_Get(<outvar> [ALL|GROUP <group>])
+#
+# This function returns a list of images, assigned to the specified group.
+#
+# <outvar>:       Name of variable to set.
+# ALL:            Get images from all groups.
+# GROUP <group>:  Image update group.
+#                 Use "DEFAULT" to get the default group (including DEFAULT_IMAGE).
+function(UpdateableImage_Get outvar)
+  set(all_images)
+  set(group)
+
+  cmake_parse_arguments(VGRP "ALL" "GROUP" "" ${ARGN})
+  if(VGRP_GROUP)
+    list(APPEND group ${VGRP_GROUP})
+  endif()
+
+  if(VGRP_ALL)
+    get_property(
+      group GLOBAL PROPERTY sysbuild_updateable_groups
+    )
+    list(APPEND group "DEFAULT")
+    list(REMOVE_DUPLICATES group)
+  endif()
+
+  foreach(image_group ${group})
+    get_property(
+      images GLOBAL PROPERTY sysbuild_updateable_${image_group}
+    )
+    if(images)
+      list(APPEND all_images "${images}")
+    endif()
+
+    # Include the DEFAULT_IMAGE if the DEFAULT group is used.
+    if(${image_group} STREQUAL "DEFAULT")
+      list(APPEND all_images ${DEFAULT_IMAGE})
+    endif()
+  endforeach()
+
+  set(${outvar} "${all_images}" PARENT_SCOPE)
+endfunction()
+
 # Usage:
 #   ExternalNcsVariantProject_Add(APPLICATION <name>
 #                                 VARIANT <name>

doc/mcuboot/readme-ncs.rst

@@ -26,6 +26,7 @@ See the `MCUboot output build files`_ page for a list of all these files.
 
 .. note::
    When you use MCUboot in the direct-xip mode, enable the ``SB_CONFIG_MCUBOOT_BUILD_DIRECT_XIP_VARIANT`` sysbuild Kconfig option to let the build system generate an additional set of files for the second application slot.
-   These files are identical to the ones listed on the `MCUboot output build files`_ page, but they are placed in the :file:`mcuboot_secondary_app` folder.
+   These files are identical to the ones listed on the `MCUboot output build files`_ page, but they are placed in the :file:`mcuboot_secondary_app` folder for the main application, while the files for the remaining applications are located in the respective :file:`<application>_secondary_app` folder.
    For example, :file:`mcuboot_secondary_app/zephyr/zephyr.signed.bin` is created and placed in the second slot on the target device when the :file:`zephyr.signed.bin` file is placed in the first slot.
+   Similarly, the :file:`ipc_radio_secondary_app/zephyr/zephyr.signed.bin` file is created and placed in the second slot on the target device when the :file:`ipc_radio/zephyr/zephyr.signed.bin` file is placed in the first slot.
    For more information about the direct-xip mode, see the *Equal slots (direct-xip)* section in the :doc:`Bootloader documentation <design>`.