bootutil: Add image_index to common prints (ba5fb1ce) · Commits · Wenxi XU / Mcuboot

boot/bootutil/src/bootutil_public.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 @@ boot_swap_type_multi(int image_index)
		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_swap_type_multi(int image_index)
		}
		}

		BOOT_LOG_INF("Swap type: none");
		BOOT_LOG_INF("Image index: %d, Swap type: none", image_index);
		return BOOT_SWAP_TYPE_NONE;
		}

boot/bootutil/src/loader.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -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 @@ boot_copy_image(struct boot_loader_state state, struct boot_status bs)
		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 @@ boot_load_image_to_sram(struct boot_loader_state *state)

		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 @@ boot_load_image_to_sram(struct boot_loader_state *state)
		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 @@ boot_remove_image_from_sram(struct boot_loader_state *state)
		{
		(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 @@ boot_update_hw_rollback_protection(struct boot_loader_state *state)
		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)

Admin message