Skip to content

[nrf fromtree] bootutil: Fix minor issues #547

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
merged 2 commits into from
Oct 6, 2025
Merged

[nrf fromtree] bootutil: Fix minor issues #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2904201
[nrf fromtree] bootutil: Fix minor issues
tomchy Oct 3, 2025
791c72b
[nrf noup] mcuboot: Fix warning
tomchy Oct 3, 2025
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
3 changes: 3 additions & 0 deletions boot/bootutil/src/bootutil_public.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,9 @@ static int flash_area_to_image_slot(const struct flash_area *fa, uint32_t *slot)

++i;
}

/* Image not found */
*slot = UINT32_MAX;
#else
(void)fa;
if (slot != NULL) {
Expand Down
2 changes: 1 addition & 1 deletion boot/bootutil/src/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ boot_verify_slot_dependencies(struct boot_loader_state *state, uint32_t slot)

#ifdef MCUBOOT_VERSION_CMP_USE_SLOT_NUMBER
/* Validate against possible dependency slot values. */
switch(dep->slot) {
switch(dep.slot) {
case VERSION_DEP_SLOT_ACTIVE:
case VERSION_DEP_SLOT_PRIMARY:
case VERSION_DEP_SLOT_SECONDARY:
Expand Down