From 3aaafe16a5e55d2623e62dea8f7f174ca1c74ca6 Mon Sep 17 00:00:00 2001 From: "INFINEON\\DovhalA" Date: Tue, 11 Jul 2023 10:27:17 +0300 Subject: [PATCH] revert validate prim slot from ram boot Signed-off-by: INFINEON\DovhalA --- boot/bootutil/src/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c index bf83884b30..81d88d8249 100644 --- a/boot/bootutil/src/loader.c +++ b/boot/bootutil/src/loader.c @@ -723,7 +723,7 @@ boot_rom_address_check(struct boot_loader_state *state) * FIH_NO_BOOTABLE_IMAGE if no bootloable image was found * FIH_FAILURE on any errors */ -fih_ret +static fih_ret boot_validate_slot(struct boot_loader_state *state, int slot, struct boot_status *bs) { @@ -3181,7 +3181,7 @@ boot_load_and_validate_images(struct boot_loader_state *state) continue; } #endif /* MCUBOOT_RAM_LOAD */ -#ifdef MCUBOOT_VALIDATE_PRIMARY_SLOT + fih_ret fih_rc; FIH_CALL(boot_validate_slot, fih_rc, state, active_slot, NULL); if (FIH_NOT_EQ(fih_rc, FIH_SUCCESS)) { @@ -3193,7 +3193,7 @@ boot_load_and_validate_images(struct boot_loader_state *state) state->slot_usage[BOOT_CURR_IMG(state)].active_slot = NO_ACTIVE_SLOT; continue; } -#endif + /* Valid image loaded from a slot, go to next image. */ break; }