From: Simon Glass <sjg@chromium.org>
Date: Mon, 8 Jul 2019 19:18:22 +0000 (-0600)
Subject: cbfs: Rename checksum to attributes_offset
X-Git-Tag: v2019.10-rc1~14^2~75
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ababe101d3797cdc6c1c8ab703ce4dc8fd9ac326;p=oweals%2Fu-boot.git

cbfs: Rename checksum to attributes_offset

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

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

diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 7b2513cb24..af4d3c5e56 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 f2ede25f51..b8d1dabbf6 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;