Align FWU metadata v2 with the specification
Align FWU metadata v2 structures, tests and the FWU tool with the
specification.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I2d6a0785cf954b1834c5b75376d73f6999ea55e1
diff --git a/components/app/fwu-tool/cmd_print_metadata_v2.cpp b/components/app/fwu-tool/cmd_print_metadata_v2.cpp
index 69e09d7..666dcb2 100644
--- a/components/app/fwu-tool/cmd_print_metadata_v2.cpp
+++ b/components/app/fwu-tool/cmd_print_metadata_v2.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Arm Limited and Contributors. All rights reserved.
+ * Copyright (c) 2023-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -42,15 +42,15 @@
printf("\tcrc_32 : 0x%x\n", metadata->crc_32);
printf("\tversion : %d\n", metadata->version);
printf("\tmetadata_size : %d\n", metadata->metadata_size);
- printf("\theader_size : %d\n", metadata->header_size);
+ printf("\tdescriptor_offset : %d\n", metadata->descriptor_offset);
printf("\tactive_index : %d\n", metadata->active_index);
printf("\tprevious_active_index : %d\n", metadata->previous_active_index);
printf("\tbank_state : 0x%x 0x%x\n", metadata->bank_state[0], metadata->bank_state[1]);
- if (metadata->metadata_size <= metadata->header_size)
+ if (metadata->metadata_size <= metadata->descriptor_offset)
return;
- size_t fw_store_desc_size = metadata->metadata_size - metadata->header_size;
+ size_t fw_store_desc_size = metadata->metadata_size - metadata->descriptor_offset;
if (fw_store_desc_size < sizeof(fwu_fw_store_desc)) {
printf("\tInsufficient space for fw store descriptor\n");
@@ -59,13 +59,13 @@
/* Print optional fw store descriptor */
struct fwu_fw_store_desc *fw_store_desc =
- (struct fwu_fw_store_desc *)&fetched_object[metadata->header_size];
+ (struct fwu_fw_store_desc *)&fetched_object[metadata->descriptor_offset];
printf("\tfw_store_desc :\n");
printf("\t\tnum_banks : %d\n", fw_store_desc->num_banks);
printf("\t\tnum_images : %d\n", fw_store_desc->num_images);
printf("\t\timg_entry_size : %d\n", fw_store_desc->img_entry_size);
- printf("\t\tbank_entry_size : %d\n", fw_store_desc->bank_entry_size);
+ printf("\t\tbank_info_entry_size : %d\n", fw_store_desc->bank_info_entry_size);
for (unsigned int i = 0; i < fw_store_desc->num_images; i++) {
struct fwu_image_entry *img_entry = &fw_store_desc->img_entry[i];