Skip to content

bootutil: Small logging improvements #2584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nordicjm merged 1 commit into from
Dec 23, 2025
+5 −4
Merged

bootutil: Small logging improvements #2584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions boot/bootutil/src/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,7 @@ boot_validate_slot(struct boot_loader_state *state, int slot,
}
#endif
if (!boot_check_header_valid(state, slot)) {
BOOT_LOG_DBG("boot_validate_slot: header validation failed %d", slot);
fih_rc = FIH_FAILURE;
} else {
BOOT_HOOK_CALL_FIH(boot_image_check_hook, FIH_BOOT_HOOK_REGULAR,
Expand All @@ -644,16 +645,16 @@ boot_validate_slot(struct boot_loader_state *state, int slot,
check_validity:
#endif
if (FIH_NOT_EQ(fih_rc, FIH_SUCCESS)) {
#if !defined(__BOOTSIM__)
BOOT_LOG_ERR("Image in the %s slot is not valid!",
(slot == BOOT_SLOT_PRIMARY) ? "primary" : "secondary");
#endif
if ((slot != BOOT_SLOT_PRIMARY) || ARE_SLOTS_EQUIVALENT()) {
boot_scramble_slot(fap, slot);
/* Image is invalid, erase it to prevent further unnecessary
* attempts to validate and boot it.
*/
}
#if !defined(__BOOTSIM__)
BOOT_LOG_ERR("Image in the %s slot is not valid!",
(slot == BOOT_SLOT_PRIMARY) ? "primary" : "secondary");
#endif
fih_rc = FIH_NO_BOOTABLE_IMAGE;
goto out;
}
Expand Down
Loading