Commit 4d0985c6 authored by Jamie McCrae's avatar Jamie McCrae Committed by Jamie
Browse files

Revert "boot/zephyr: Load image to RAM on single loader"



This reverts commit 48931935.

Signed-off-by: default avatarJamie McCrae <jamie.mccrae@nordicsemi.no>
parent 439930ae
Loading
Loading
Loading
Loading
+0 −15
Original line number Diff line number Diff line
@@ -111,29 +111,14 @@ boot_go(struct boot_rsp *rsp)
    if (rc != 0)
        goto out;

#ifdef MCUBOOT_RAM_LOAD
        static struct boot_loader_state state;
        state.imgs[0][0].hdr = _hdr;

        rc = boot_load_image_to_sram(&state);
        if (rc != 0)
            goto out;
#endif

#ifdef MCUBOOT_VALIDATE_PRIMARY_SLOT
    FIH_CALL(boot_image_validate, fih_rc, _fa_p, &_hdr);
    if (FIH_NOT_EQ(fih_rc, FIH_SUCCESS)) {
#ifdef MCUBOOT_RAM_LOAD
        boot_remove_image_from_sram(&state);
#endif
        goto out;
    }
#elif defined(MCUBOOT_VALIDATE_PRIMARY_SLOT_ONCE)
    FIH_CALL(boot_image_validate_once, fih_rc, _fa_p, &_hdr);
    if (FIH_NOT_EQ(fih_rc, FIH_SUCCESS)) {
#ifdef MCUBOOT_RAM_LOAD
        boot_remove_image_from_sram(&state);
#endif
        goto out;
    }
#else