sysbuild: Use upstream firmware loader configuration system

Switches to using the upstream zephyr sysbuild configuration
system for configuring the firmware loader image

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

cmake/sysbuild/partition_manager.cmake

@@ -234,6 +234,10 @@ function(partition_manager)
       else()
         set(part "app_${part}")
       endif()
+    elseif(${part} STREQUAL "firmware_loader" AND SB_CONFIG_MCUBOOT_MODE_FIRMWARE_UPDATER)
+      if(NOT "${PM_DOMAIN}" STREQUAL "CPUNET")
+        set(part ${SB_CONFIG_FIRMWARE_LOADER_IMAGE_NAME})
+      endif()
     endif()
     string(TOUPPER ${part} PART)
     get_property(${part}_PM_HEX_FILE GLOBAL PROPERTY ${part}_PM_HEX_FILE)
@@ -423,6 +427,12 @@ if(SB_CONFIG_SECURE_BOOT_BUILD_S1_VARIANT_IMAGE)
   list(APPEND header_files ${s1_image_binary_dir}/${generated_path}/pm_config.h)
 endif()
 
+if(SB_CONFIG_MCUBOOT_MODE_FIRMWARE_UPDATER)
+  sysbuild_get(firmware_loader_binary_dir IMAGE ${SB_CONFIG_FIRMWARE_LOADER_IMAGE_NAME} VAR ZEPHYR_BINARY_DIR CACHE)
+  list(APPEND prefixed_images ":firmware_loader")
+  list(APPEND header_files ${firmware_loader_binary_dir}/${generated_path}/pm_config.h)
+endif()
+
 foreach (image ${IMAGES})
   set(domain)
   # Special handling of `app_image` as this must be added as `:app` for historic reasons.
@@ -435,7 +445,7 @@ foreach (image ${IMAGES})
     endif()
   endforeach()
 
-  if(NOT "${DEFAULT_IMAGE}" STREQUAL "${image}" AND NOT "s1_image" STREQUAL "${image}")
+  if(NOT "${DEFAULT_IMAGE}" STREQUAL "${image}" AND NOT "s1_image" STREQUAL "${image}" AND NOT "${SB_CONFIG_FIRMWARE_LOADER_IMAGE_NAME}" STREQUAL "${image}")
     sysbuild_get(${image}_input_files IMAGE ${image} VAR PM_YML_FILES CACHE)
     sysbuild_get(${image}_binary_dir  IMAGE ${image} VAR ZEPHYR_BINARY_DIR CACHE)
 

sysbuild/CMakeLists.txt

@@ -344,9 +344,9 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
         endforeach()
 
         if(SB_CONFIG_MCUBOOT_MODE_FIRMWARE_UPDATER)
-          set(firmware_loader_SIGNING_SCRIPT "${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/image_signing_firmware_loader.cmake" CACHE INTERNAL "MCUboot signing script" FORCE)
+          set(${SB_CONFIG_FIRMWARE_LOADER_IMAGE_NAME}_SIGNING_SCRIPT "${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/image_signing_firmware_loader.cmake" CACHE INTERNAL "MCUboot signing script" FORCE)
 
-          set_target_properties(firmware_loader PROPERTIES
+          set_target_properties(${SB_CONFIG_FIRMWARE_LOADER_IMAGE_NAME} PROPERTIES
             IMAGE_CONF_SCRIPT ${ZEPHYR_NRF_MODULE_DIR}/sysbuild/image_configurations/firmware_loader_image_default.cmake
           )
         endif()