michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dfu/boot/mcuboot: treat pristine image as confirmed

Browse source 
In case of initial/pre-programed image.
Such image can neither be reverted nor physically confirmed.

Image like this should be recognized as confirmed by the
boot_is_img_confirmed() for consistency.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Andrzej Puzdrowski 2022-10-28 12:08:16 +02:00 • committed by Carles Cufí
commit 2c52733f8d
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
subsys/dfu/boot/mcuboot.c
View file

@ -185,21 +185,30 @@ int boot_request_upgrade_multi(int image_index, int permanent)
bool boot_is_img_confirmed(void) bool boot_is_img_confirmed(void)
{ {
struct boot_swap_state state;
const struct flash_area *fa; const struct flash_area *fa;
int rc; int rc;
uint8_t flag_val;
rc = flash_area_open(FLASH_AREA_IMAGE_PRIMARY, &fa); rc = flash_area_open(FLASH_AREA_IMAGE_PRIMARY, &fa);
if (rc) { if (rc) {
return false; return false;
} }
rc = boot_read_image_ok(fa, &flag_val); rc = boot_read_swap_state(fa, &state);
if (rc) { if (rc != 0) {
return false; return false;
} }
return flag_val == BOOT_FLAG_SET; if (state.magic == BOOT_MAGIC_UNSET) {
/* This is initial/preprogramed image.
* Such image can neither be reverted nor physically confirmed.
* Treat this image as confirmed which ensures consistency
* with `boot_write_img_confirmed...()` procedures.
*/
return true;
}
return state.image_ok == BOOT_FLAG_SET;
} }
int boot_write_img_confirmed(void) int boot_write_img_confirmed(void)