bootutil: Add image_index to common prints
Add the image_index to common prints that get repeated in the
print out logging so that it helps differentiate the information
conveyed by the print.
Signed-off-by: Antonio de Angelis <Antonio.deAngelis@arm.com>
Change-Id: I560b0f76d879e4bd5f82ef65e845fe5c80585c97
diff --git a/boot/bootutil/src/bootutil_public.c b/boot/bootutil/src/bootutil_public.c
index 464ebd9..08e5d6f 100644
--- a/boot/bootutil/src/bootutil_public.c
+++ b/boot/bootutil/src/bootutil_public.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2017-2019 Linaro LTD
* Copyright (c) 2016-2019 JUUL Labs
- * Copyright (c) 2019-2021 Arm Limited
+ * Copyright (c) 2019-2023 Arm Limited
* Copyright (c) 2020-2023 Nordic Semiconductor ASA
*
* Original license:
@@ -440,7 +440,7 @@
table->image_ok_secondary_slot == secondary_slot.image_ok) &&
(table->copy_done_primary_slot == BOOT_FLAG_ANY ||
table->copy_done_primary_slot == primary_slot.copy_done)) {
- BOOT_LOG_INF("Swap type: %s",
+ BOOT_LOG_INF("Image index: %d, Swap type: %s", image_index,
table->swap_type == BOOT_SWAP_TYPE_TEST ? "test" :
table->swap_type == BOOT_SWAP_TYPE_PERM ? "perm" :
table->swap_type == BOOT_SWAP_TYPE_REVERT ? "revert" :
@@ -454,7 +454,7 @@
}
}
- BOOT_LOG_INF("Swap type: none");
+ BOOT_LOG_INF("Image index: %d, Swap type: none", image_index);
return BOOT_SWAP_TYPE_NONE;
}
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 7f43f30..2190d26 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2016-2020 Linaro LTD
* Copyright (c) 2016-2019 JUUL Labs
- * Copyright (c) 2019-2021 Arm Limited
+ * Copyright (c) 2019-2023 Arm Limited
*
* Original license:
*
@@ -1116,11 +1116,11 @@
assert(rc == 0);
#endif
- BOOT_LOG_INF("Image upgrade secondary slot -> primary slot");
- BOOT_LOG_INF("Erasing the primary slot");
-
image_index = BOOT_CURR_IMG(state);
+ BOOT_LOG_INF("Image %d upgrade secondary slot -> primary slot", image_index);
+ BOOT_LOG_INF("Erasing the primary slot");
+
rc = flash_area_open(FLASH_AREA_IMAGE_PRIMARY(image_index),
&fap_primary_slot);
assert (rc == 0);
@@ -2845,15 +2845,15 @@
rc = boot_verify_ram_load_address(state);
if (rc != 0) {
- BOOT_LOG_INF("Image RAM load address 0x%x is invalid.", img_dst);
+ BOOT_LOG_INF("Image %d RAM load address 0x%x is invalid.", BOOT_CURR_IMG(state), img_dst);
return rc;
}
#if (BOOT_IMAGE_NUMBER > 1)
rc = boot_check_ram_load_overlapping(state);
if (rc != 0) {
- BOOT_LOG_INF("Image RAM loading to address 0x%x would overlap with\
- another image.", img_dst);
+ BOOT_LOG_INF("Image %d RAM loading to address 0x%x would overlap with\
+ another image.", BOOT_CURR_IMG(state), img_dst);
return rc;
}
#endif
@@ -2871,9 +2871,9 @@
rc = boot_copy_image_to_sram(state, active_slot, img_dst, img_sz);
#endif
if (rc != 0) {
- BOOT_LOG_INF("RAM loading to 0x%x is failed.", img_dst);
+ BOOT_LOG_INF("Image %d RAM loading to 0x%x is failed.", BOOT_CURR_IMG(state), img_dst);
} else {
- BOOT_LOG_INF("RAM loading to 0x%x is succeeded.", img_dst);
+ BOOT_LOG_INF("Image %d RAM loading to 0x%x is succeeded.", BOOT_CURR_IMG(state), img_dst);
}
} else {
/* Only images that support IMAGE_F_RAM_LOAD are allowed if
@@ -2902,7 +2902,8 @@
{
(void)state;
- BOOT_LOG_INF("Removing image from SRAM at address 0x%x",
+ BOOT_LOG_INF("Removing image %d from SRAM at address 0x%x",
+ BOOT_CURR_IMG(state),
state->slot_usage[BOOT_CURR_IMG(state)].img_dst);
memset((void*)(IMAGE_RAM_BASE + state->slot_usage[BOOT_CURR_IMG(state)].img_dst),
@@ -3215,8 +3216,7 @@
state->slot_usage[BOOT_CURR_IMG(state)].active_slot,
boot_img_hdr(state, state->slot_usage[BOOT_CURR_IMG(state)].active_slot));
if (rc != 0) {
- BOOT_LOG_ERR("Security counter update failed after image "
- "validation.");
+ BOOT_LOG_ERR("Security counter update failed after image %d validation.", BOOT_CURR_IMG(state));
return rc;
}
#if defined(MCUBOOT_DIRECT_XIP) && defined(MCUBOOT_DIRECT_XIP_REVERT)