[U-Boot] [PATCH v2 03/37] cbfs: Rename checksum to attributes_offset

Simon Glass sjg at chromium.org
Mon Jul 8 19:18:22 UTC 2019


It seems that this field has been renamed in later version of coreboot.
Update it.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

Changes in v2: None

 fs/cbfs/cbfs.c | 4 ++--
 include/cbfs.h | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 7b2513cb24b..af4d3c5e564 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -55,7 +55,7 @@ static void swap_file_header(struct cbfs_fileheader *dest,
 	memcpy(&dest->magic, &src->magic, sizeof(dest->magic));
 	dest->len = be32_to_cpu(src->len);
 	dest->type = be32_to_cpu(src->type);
-	dest->checksum = be32_to_cpu(src->checksum);
+	dest->attributes_offset = be32_to_cpu(src->attributes_offset);
 	dest->offset = be32_to_cpu(src->offset);
 }
 
@@ -108,7 +108,7 @@ static int file_cbfs_next_file(u8 *start, u32 size, u32 align,
 		newNode->name = (char *)fileHeader +
 				sizeof(struct cbfs_fileheader);
 		newNode->name_length = name_len;
-		newNode->checksum = header.checksum;
+		newNode->attributes_offset = header.attributes_offset;
 
 		step = header.len;
 		if (step % align)
diff --git a/include/cbfs.h b/include/cbfs.h
index f2ede25f517..b8d1dabbf63 100644
--- a/include/cbfs.h
+++ b/include/cbfs.h
@@ -65,7 +65,8 @@ struct cbfs_fileheader {
 	u8 magic[8];
 	u32 len;
 	u32 type;
-	u32 checksum;
+	/* offset to struct cbfs_file_attribute or 0 */
+	u32 attributes_offset;
 	u32 offset;
 } __packed;
 
@@ -76,7 +77,7 @@ struct cbfs_cachenode {
 	u32 data_length;
 	char *name;
 	u32 name_length;
-	u32 checksum;
+	u32 attributes_offset;
 } __packed;
 
 extern enum cbfs_result file_cbfs_result;
-- 
2.22.0.410.gd8fdbe21b5-goog



More information about the U-Boot mailing list