boot: Add ram-load upgrade mode
This patch introduces the ram-load mode in addition to the other
upgrade modes (swap strategies, overwrite-only, direct-XIP). When
ram-load is enabled with the MCUBOOT_RAM_LOAD option, mcuboot
selects the newest valid image based on the image version numbers from
the image header, thereafter the selected image loaded to the RAM and
executed from there. Load address is extracted from the image header.
Therefore the images must be linked to the RAM memory region.
The ram-load mode is very similar to the direct-XIP mode, main
difference is to load the newest image to the RAM beforehand the
authentication and execution. Similar to direct-XIP mode either
of the primary and the secondary slots can hold the active image.
Ram-load can be useful in case of a bit more powerful SoC, which
is not constrained in terms of internal RAM. It could be that image
is stored in external and therefore untrusted flash. Loading image
to internal (trusted) RAM is essential from the security point
of view the system. Furthermore execution from internal RAM is much
faster than from external flash.
This patch is based on the RAM_LOADING upgrade strategy which was
first introduced in the Trusted Firmware-M project.
Source TF-M version: TF-Mv1.0.
Change-Id: I95f02ff07c1dee51244ac372284f449c2efab362
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
diff --git a/boot/bootutil/src/image_validate.c b/boot/bootutil/src/image_validate.c
index 7071d7d..b5d259a 100644
--- a/boot/bootutil/src/image_validate.c
+++ b/boot/bootutil/src/image_validate.c
@@ -73,12 +73,18 @@
uint32_t blk_off;
uint32_t tlv_off;
-#if (BOOT_IMAGE_NUMBER == 1) || !defined(MCUBOOT_ENC_IMAGES)
+#if (BOOT_IMAGE_NUMBER == 1) || !defined(MCUBOOT_ENC_IMAGES) || \
+ defined(MCUBOOT_RAM_LOAD)
(void)enc_state;
(void)image_index;
(void)hdr_size;
(void)blk_off;
(void)tlv_off;
+#ifdef MCUBOOT_RAM_LOAD
+ (void)blk_sz;
+ (void)off;
+ (void)rc;
+#endif
#endif
#ifdef MCUBOOT_ENC_IMAGES
@@ -105,6 +111,9 @@
/* If protected TLVs are present they are also hashed. */
size += hdr->ih_protect_tlv_size;
+#ifdef MCUBOOT_RAM_LOAD
+ bootutil_sha256_update(&sha256_ctx,(void*)(hdr->ih_load_addr), size);
+#else
for (off = 0; off < size; off += blk_sz) {
blk_sz = size - off;
if (blk_sz > tmp_buf_sz) {
@@ -139,6 +148,7 @@
#endif
bootutil_sha256_update(&sha256_ctx, tmp_buf, blk_sz);
}
+#endif /* MCUBOOT_RAM_LOAD */
bootutil_sha256_finish(&sha256_ctx, hash_result);
return 0;
@@ -291,7 +301,7 @@
return BOOT_EBADIMAGE;
}
- rc = flash_area_read(fap, off, img_security_cnt, len);
+ rc = LOAD_IMAGE_DATA(hdr, fap, off, img_security_cnt, len);
if (rc != 0) {
return BOOT_EFLASH;
}
@@ -367,7 +377,7 @@
if (len != sizeof(hash)) {
return -1;
}
- rc = flash_area_read(fap, off, buf, sizeof hash);
+ rc = LOAD_IMAGE_DATA(hdr, fap, off, buf, sizeof(hash));
if (rc) {
return rc;
}
@@ -385,7 +395,7 @@
if (len > 32) {
return -1;
}
- rc = flash_area_read(fap, off, buf, len);
+ rc = LOAD_IMAGE_DATA(hdr, fap, off, buf, len);
if (rc) {
return rc;
}
@@ -402,7 +412,7 @@
if (len > sizeof(key_buf)) {
return -1;
}
- rc = flash_area_read(fap, off, key_buf, len);
+ rc = LOAD_IMAGE_DATA(hdr, fap, off, key_buf, len);
if (rc) {
return rc;
}
@@ -421,7 +431,7 @@
if (!EXPECTED_SIG_LEN(len) || len > sizeof(buf)) {
return -1;
}
- rc = flash_area_read(fap, off, buf, len);
+ rc = LOAD_IMAGE_DATA(hdr, fap, off, buf, len);
if (rc) {
return -1;
}
@@ -442,7 +452,7 @@
return -1;
}
- rc = flash_area_read(fap, off, &img_security_cnt, len);
+ rc = LOAD_IMAGE_DATA(hdr, fap, off, &img_security_cnt, len);
if (rc) {
return rc;
}