GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfstool: rename checksum to attributes_offset 

So far it's still unused, but its purpose will change:
It will become an offset to another structure that contains additional file
attributes.

This change is compatible because the binary format doesn't change and so far
the field was always set to 0, which can serve nicely as 'unused' field.

Change-Id: I2dafb06866713d43a236556f9492641526270837
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10933
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Patrick Georgi 2015-07-15 18:28:23 +02:00 committed by Patrick Georgi
parent 0d869ede7f
commit 0d618afc84
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/cbfstool/cbfs.h
View File

@ -77,7 +77,7 @@ struct cbfs_file {
/* length of file data */ /* length of file data */
uint32_t len; uint32_t len;
uint32_t type; uint32_t type;
uint32_t checksum; uint32_t attributes_offset;
/* length of header incl. variable data */ /* length of header incl. variable data */
uint32_t offset; uint32_t offset;
char filename[]; char filename[];

2
util/cbfstool/cbfs_image.c
View File

@ -1032,7 +1032,7 @@ int cbfs_create_empty_entry(struct cbfs_file *entry,
memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic)); memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
entry->type = htonl(CBFS_COMPONENT_NULL); entry->type = htonl(CBFS_COMPONENT_NULL);
entry->len = htonl(len); entry->len = htonl(len);
entry->checksum = 0; // TODO Build a checksum algorithm. entry->attributes_offset = 0;
entry->offset = htonl(cbfs_calculate_file_header_size(name)); entry->offset = htonl(cbfs_calculate_file_header_size(name));
memset(entry->filename, 0, ntohl(entry->offset) - sizeof(*entry)); memset(entry->filename, 0, ntohl(entry->offset) - sizeof(*entry));
strcpy(entry->filename, name); strcpy(entry->filename, name);

2
util/cbfstool/common.c
View File

@ -131,7 +131,7 @@ void cbfs_file_get_header(struct buffer *buf, struct cbfs_file *file)
bgets(buf, &file->magic, sizeof(file->magic)); bgets(buf, &file->magic, sizeof(file->magic));
file->len = xdr_be.get32(buf); file->len = xdr_be.get32(buf);
file->type = xdr_be.get32(buf); file->type = xdr_be.get32(buf);
file->checksum = xdr_be.get32(buf); file->attributes_offset = xdr_be.get32(buf);
file->offset = xdr_be.get32(buf); file->offset = xdr_be.get32(buf);
} }