Skip to content

Commit

Permalink
cbfs: Rename checksum to attributes_offset
Browse files Browse the repository at this point in the history
It seems that this field has been renamed in later version of coreboot.
Update it.

Signed-off-by: Simon Glass <[email protected]>
  • Loading branch information
sjg20 committed Jul 24, 2019
1 parent 08b7bc3 commit ababe10
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions fs/cbfs/cbfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions include/cbfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down

0 comments on commit ababe10

Please sign in to comment.