commit a4eda30f5b0cfd0cf15512be9dcd559239dbfc91
author Jamie McCrae <jamie.mccrae@nordicsemi.no> Mon Jan 29 11:00:25 2024 +0000
committer Jamie <40387179+nordicjm@users.noreply.github.com> Tue Jan 30 13:43:58 2024 +0000
tree c94bef8d5921b1e6645a5a78ef90c019d72edf0d
parent 205d7e5b4194fd8c6e3219771e439048973e4984

zephyr: Add estimated size of update trailer to sysbuild

Adds a new field which is set to the estimated size of the
upgrade slot data, this is used to know how much space should
be reserved in an update image to determine if an update will
fit or not

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boot/zephyr/CMakeLists.txt

diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt
index 580954f..9156ad2 100644
--- a/boot/zephyr/CMakeLists.txt
+++ b/boot/zephyr/CMakeLists.txt
@@ -492,15 +492,24 @@
     endif()
 
     math(EXPR required_size "${key_size} + ${boot_magic_size} + ${boot_swap_data_size} + ${boot_status_data_size} + ${boot_tlv_estimate}")
-
     align_up(${required_size} ${erase_size} required_size)
 
+    if(CONFIG_SINGLE_APPLICATION_SLOT OR CONFIG_BOOT_FIRMWARE_LOADER)
+      set(required_upgrade_size "0")
+    else()
+      math(EXPR required_upgrade_size "${boot_magic_size} + ${boot_swap_data_size} + ${boot_status_data_size}")
+      align_up(${required_upgrade_size} ${erase_size} required_upgrade_size)
+    endif()
+
     if(CONFIG_BOOT_SWAP_USING_MOVE)
       math(EXPR required_size "${required_size} + ${erase_size}")
+      math(EXPR required_upgrade_size "${required_upgrade_size} + ${erase_size}")
     endif()
   else()
     set(required_size 0)
+    set(required_upgrade_size 0)
   endif()
 
   set(mcuboot_image_footer_size ${required_size} CACHE INTERNAL "Estimated MCUboot image trailer size" FORCE)
+  set(mcuboot_image_upgrade_footer_size ${required_upgrade_size} CACHE INTERNAL "Estimated MCUboot update image trailer size" FORCE)
 endif()

boot/zephyr/sysbuild/CMakeLists.txt

diff --git a/boot/zephyr/sysbuild/CMakeLists.txt b/boot/zephyr/sysbuild/CMakeLists.txt
index adcd744..a39f4c4 100644
--- a/boot/zephyr/sysbuild/CMakeLists.txt
+++ b/boot/zephyr/sysbuild/CMakeLists.txt
@@ -31,9 +31,12 @@
 
     if("${app_type}" STREQUAL "MAIN")
       sysbuild_get(mcuboot_image_footer_size IMAGE mcuboot CACHE)
+      sysbuild_get(mcuboot_image_upgrade_footer_size IMAGE mcuboot CACHE)
       math(EXPR mcuboot_image_footer_size "${mcuboot_image_footer_size}" OUTPUT_FORMAT HEXADECIMAL)
+      math(EXPR mcuboot_image_upgrade_footer_size "${mcuboot_image_upgrade_footer_size}" OUTPUT_FORMAT HEXADECIMAL)
 
       set_property(TARGET ${image} APPEND_STRING PROPERTY CONFIG "CONFIG_ROM_END_OFFSET=${mcuboot_image_footer_size}\n")
+      set_property(TARGET ${image} APPEND_STRING PROPERTY CONFIG "CONFIG_MCUBOOT_UPDATE_FOOTER_SIZE=${mcuboot_image_upgrade_footer_size}\n")
       return()
     endif()
   endforeach()