Skip to content

Commit

Permalink
CB24FW-208: Revert [nrf noup] bootutil: Show error if flash area open…
Browse files Browse the repository at this point in the history
… fails

Signed-off-by: Dmitry Starchenko <[email protected]>
This reverts commit 2929a97.
  • Loading branch information
dmitrys-emcraft committed Nov 28, 2024
1 parent 4594a86 commit 0b1d8a8
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions boot/bootutil/src/loader.c
Original file line number Diff line number Diff line change
Expand Up @@ -2687,22 +2687,11 @@ context_boot_go(struct boot_loader_state *state, struct boot_rsp *rsp)
fa_id = flash_area_id_from_multi_image_slot(image_index, slot);
rc = flash_area_open(fa_id, &BOOT_IMG_AREA(state, slot));
assert(rc == 0);

if (rc != 0) {
BOOT_LOG_ERR("Failed to open flash area ID %d (image %d slot %d): %d, "
"cannot continue", fa_id, image_index, (int8_t)slot, rc);
FIH_PANIC;
}
}
#if MCUBOOT_SWAP_USING_SCRATCH
rc = flash_area_open(FLASH_AREA_IMAGE_SCRATCH,
&BOOT_SCRATCH_AREA(state));
assert(rc == 0);

if (rc != 0) {
BOOT_LOG_ERR("Failed to open scratch flash area: %d, cannot continue", rc);
FIH_PANIC;
}
#endif

/* Determine swap type and complete swap if it has been aborted. */
Expand Down

0 comments on commit 0b1d8a8

Please sign in to comment.