Revert "boot/bootutil: Split RAM load code to its own file"

This reverts commit 9f1e573.

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

Author: nordicjm

boot/bootutil/CMakeLists.txt

@@ -33,9 +33,3 @@ 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/pkg.yml

@@ -45,9 +45,6 @@ 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/bootutil_misc.c

@@ -355,68 +355,3 @@ 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,8 +51,6 @@ 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
 
@@ -469,24 +467,15 @@ 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