Upmerge 08.08.2025

.github/workflows/zephyr_build.yaml

@@ -40,12 +40,12 @@ jobs:
     runs-on: ubuntu-latest
     # Docker image from the zephyr upstream. Includes SDK and other required tools
     container:
-      image: zephyrprojectrtos/ci:v0.27.4
+      image: zephyrprojectrtos/ci:v0.27.6
       options: '--entrypoint /bin/bash'
       volumes:
         - /home/runners/zephyrproject:/github/cache/zephyrproject
     env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.17.0
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.17.1-rc2
 
     steps:
       - name: Set versions when workflow_dispatch

README.md

@@ -18,7 +18,7 @@
 [travis]: https://travis-ci.org/mcu-tools/mcuboot
 [license]: https://github.com/mcu-tools/mcuboot/blob/main/LICENSE
 
-This is MCUboot version 2.2.0-rc2
+This is MCUboot version 2.2.0
 
 MCUboot is a secure bootloader for 32-bits microcontrollers. It defines a
 common infrastructure for the bootloader and the system flash layout on

boot/boot_serial/include/boot_serial/boot_serial_encryption.h

@@ -11,6 +11,7 @@
 /**
  * Validate hash of a primary boot image doing on the fly decryption as well
  *
+ * @param[in]   state     bootloader state
  * @param[in]   fa_p      flash area pointer
  * @param[in]   hdr       boot image header pointer
  * @param[in]   buf       buffer which is used for validating data
@@ -20,12 +21,10 @@
  * @return                FIH_SUCCESS on success, error code otherwise
  */
 fih_ret
-boot_image_validate_encrypted(const struct flash_area *fa_p,
+boot_image_validate_encrypted(struct boot_loader_state *state,
+                              const struct flash_area *fa_p,
                               struct image_header *hdr, uint8_t *buf,
                               uint16_t buf_size
-#ifdef MCUBOOT_SWAP_USING_OFFSET
-                              , uint32_t start_off
-#endif
 );
 
 /**