bootutil: Add image_index to additional logging messages
image_index should be added to additional prints as noted
during the original PR review.
Signed-off-by: Antonio de Angelis <Antonio.deAngelis@arm.com>
Change-Id: I2e456f05ee4ccb372aeab564f7f388bc2fd564e5
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 2190d26..374d140 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -1175,8 +1175,8 @@
}
#endif
- BOOT_LOG_INF("Copying the secondary slot to the primary slot: 0x%zx bytes",
- size);
+ BOOT_LOG_INF("Image %d copying the secondary slot to the primary slot: 0x%zx bytes",
+ image_index, size);
rc = boot_copy_region(state, fap_secondary_slot, fap_primary_slot, 0, 0, size);
if (rc != 0) {
return rc;
@@ -1981,7 +1981,7 @@
}
if (rc < 0) {
/* Image in slot 0 prevents downgrade, delete image in slot 1 */
- BOOT_LOG_INF("Image in slot 1 erased due to downgrade prevention");
+ BOOT_LOG_INF("Image %d in slot 1 erased due to downgrade prevention", BOOT_CURR_IMG(state));
flash_area_erase(BOOT_IMG(state, 1).area, 0,
flash_area_get_size(BOOT_IMG(state, 1).area));
} else {
@@ -2733,7 +2733,8 @@
/* Direct copy from flash to its new location in SRAM. */
rc = flash_area_read(fap_src, 0, (void *)(IMAGE_RAM_BASE + img_dst), img_sz);
if (rc != 0) {
- BOOT_LOG_INF("Error whilst copying image from Flash to SRAM: %d", rc);
+ BOOT_LOG_INF("Error whilst copying image %d from Flash to SRAM: %d",
+ BOOT_CURR_IMG(state), rc);
}
flash_area_close(fap_src);