]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
cbfs: Rename checksum to attributes_offset
authorSimon Glass <sjg@chromium.org>
Mon, 8 Jul 2019 19:18:22 +0000 (13:18 -0600)
committerSimon Glass <sjg@chromium.org>
Wed, 24 Jul 2019 03:27:57 +0000 (20:27 -0700)
It seems that this field has been renamed in later version of coreboot.
Update it.

Signed-off-by: Simon Glass <sjg@chromium.org>
fs/cbfs/cbfs.c
include/cbfs.h

index 7b2513cb24bf4683e018a9ac24ebd47f3bb71f93..af4d3c5e564c69f3e390be4ded6446971ad030b5 100644 (file)
@@ -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)
index f2ede25f517b8a12f564e3f844af563c1ac01be6..b8d1dabbf63e7d12be4cdbce1c24006a52508ad6 100644 (file)
@@ -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;