[RFC] Support for choosing image to boot in runtime

boot/bootutil/CMakeLists.txt

@@ -33,3 +33,9 @@ target_sources(bootutil
  src/swap_scratch.c
  src/tlv.c
 )
+if(CONFIG_BOOT_RAM_LOAD)
+ target_sources(bootutil
+ PRIVATE
+ src/ram_load.c
+ )
+endif()

boot/bootutil/include/bootutil/boot_status.h

@@ -128,7 +128,8 @@ enum mcuboot_mode {
  MCUBOOT_MODE_DIRECT_XIP,
  MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT,
  MCUBOOT_MODE_RAM_LOAD,
- MCUBOOT_MODE_FIRMWARE_LOADER
+ MCUBOOT_MODE_FIRMWARE_LOADER,
+ MCUBOOT_MODE_SINGLE_SLOT_RAM_LOAD,
 };
 
 enum mcuboot_signature_type {

boot/bootutil/pkg.yml

@@ -45,6 +45,9 @@ pkg.ign_files.BOOTUTIL_SINGLE_APPLICATION_SLOT:
  - "loader.c"
  - "swap_scratch.c"
 
+pkg.ign_files:
+ - "ram_load.c"
+
 pkg.deps.BOOTUTIL_USE_MBED_TLS:
  - "@apache-mynewt-core/crypto/mbedtls"
 

boot/bootutil/src/boot_record.c

@@ -249,6 +249,8 @@ int boot_save_shared_data(const struct image_header *hdr, const struct flash_are
 #else
  uint8_t mode = MCUBOOT_MODE_DIRECT_XIP;
 #endif
+#elif defined(MCUBOOT_SINGLE_APPLICATION_SLOT_RAM_LOAD)
+ uint8_t mode = MCUBOOT_MODE_SINGLE_SLOT_RAM_LOAD;
 #elif defined(MCUBOOT_RAM_LOAD)
  uint8_t mode = MCUBOOT_MODE_RAM_LOAD;
 #elif defined(MCUBOOT_FIRMWARE_LOADER)

boot/bootutil/src/bootutil_misc.c

@@ -334,7 +334,7 @@ boot_write_enc_key(const struct flash_area *fap, uint8_t slot,
 uint32_t bootutil_max_image_size(const struct flash_area *fap)
 {
 #if defined(MCUBOOT_SWAP_USING_SCRATCH) || defined(MCUBOOT_SINGLE_APPLICATION_SLOT) || \
- defined(MCUBOOT_FIRMWARE_LOADER)
+ defined(MCUBOOT_FIRMWARE_LOADER) || defined(MCUBOOT_SINGLE_APPLICATION_SLOT_RAM_LOAD)
  return boot_status_off(fap);
 #elif defined(MCUBOOT_SWAP_USING_MOVE)
  struct flash_sector sector;
@@ -355,3 +355,68 @@ uint32_t bootutil_max_image_size(const struct flash_area *fap)
  return boot_swap_info_off(fap);
 #endif
 }
+
+/*
+ * Compute the total size of the given image. Includes the size of
+ * the TLVs.
+ */
+#if !defined(MCUBOOT_DIRECT_XIP) && \
+ (!defined(MCUBOOT_OVERWRITE_ONLY) || \
+ defined(MCUBOOT_OVERWRITE_ONLY_FAST))
+int
+boot_read_image_size(struct boot_loader_state *state, int slot, uint32_t *size)
+{
+ const struct flash_area *fap;
+ struct image_tlv_info info;
+ uint32_t off;
+ uint32_t protect_tlv_size;
+ int area_id;
+ int rc;
+
+#if (BOOT_IMAGE_NUMBER == 1)
+ (void)state;
+#endif
+
+ area_id = flash_area_id_from_multi_image_slot(BOOT_CURR_IMG(state), slot);
+ rc = flash_area_open(area_id, &fap);
+ if (rc != 0) {
+ rc = BOOT_EFLASH;
+ goto done;
+ }
+
+ off = BOOT_TLV_OFF(boot_img_hdr(state, slot));
+
+ if (flash_area_read(fap, off, &info, sizeof(info))) {
+ rc = BOOT_EFLASH;
+ goto done;
+ }
+
+ protect_tlv_size = boot_img_hdr(state, slot)->ih_protect_tlv_size;
+ if (info.it_magic == IMAGE_TLV_PROT_INFO_MAGIC) {
+ if (protect_tlv_size != info.it_tlv_tot) {
+ rc = BOOT_EBADIMAGE;
+ goto done;
+ }
+
+ if (flash_area_read(fap, off + info.it_tlv_tot, &info, sizeof(info))) {
+ rc = BOOT_EFLASH;
+ goto done;
+ }
+ } else if (protect_tlv_size != 0) {
+ rc = BOOT_EBADIMAGE;
+ goto done;
+ }
+
+ if (info.it_magic != IMAGE_TLV_INFO_MAGIC) {
+ rc = BOOT_EBADIMAGE;
+ goto done;
+ }
+
+ *size = off + protect_tlv_size + info.it_tlv_tot;
+ rc = 0;
+
+done:
+ flash_area_close(fap);
+ return rc;
+}
+#endif /* !MCUBOOT_OVERWRITE_ONLY */

boot/bootutil/src/bootutil_priv.h

@@ -51,6 +51,8 @@ struct flash_area;
 
 #define BOOT_TMPBUF_SZ 256
 
+#define NO_ACTIVE_SLOT UINT32_MAX
+
 /** Number of image slots in flash; currently limited to two. */
 #define BOOT_NUM_SLOTS 2
 
@@ -467,15 +469,24 @@ struct bootsim_ram_info *bootsim_get_ram_info(void);
 #define LOAD_IMAGE_DATA(hdr, fap, start, output, size) \
  (memcpy((output),(void*)(IMAGE_RAM_BASE + (hdr)->ih_load_addr + (start)), \
  (size)), 0)
+
+int boot_load_image_to_sram(struct boot_loader_state *state);
+int boot_remove_image_from_sram(struct boot_loader_state *state);
+int boot_remove_image_from_flash(struct boot_loader_state *state,
+ uint32_t slot);
 #else
 #define IMAGE_RAM_BASE ((uintptr_t)0)
 
 #define LOAD_IMAGE_DATA(hdr, fap, start, output, size) \
  (flash_area_read((fap), (start), (output), (size)))
+
 #endif /* MCUBOOT_RAM_LOAD */
 
 uint32_t bootutil_max_image_size(const struct flash_area *fap);
 
+int boot_read_image_size(struct boot_loader_state *state, int slot,
+ uint32_t *size);
+
 #ifdef __cplusplus
 }
 #endif