From 0d618afc84db49e2248f9dff6ba21055830bc202 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 15 Jul 2015 18:28:23 +0200 Subject: 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 Reviewed-on: http://review.coreboot.org/10933 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- util/cbfstool/cbfs.h | 2 +- util/cbfstool/cbfs_image.c | 2 +- util/cbfstool/common.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 85d95f6498..f63b88156d 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -77,7 +77,7 @@ struct cbfs_file { /* length of file data */ uint32_t len; uint32_t type; - uint32_t checksum; + uint32_t attributes_offset; /* length of header incl. variable data */ uint32_t offset; char filename[]; diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 793a9aa9ab..6e040bf847 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -1032,7 +1032,7 @@ int cbfs_create_empty_entry(struct cbfs_file *entry, memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic)); entry->type = htonl(CBFS_COMPONENT_NULL); 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)); memset(entry->filename, 0, ntohl(entry->offset) - sizeof(*entry)); strcpy(entry->filename, name); diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index fffd096b76..d72db38ed4 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -131,7 +131,7 @@ void cbfs_file_get_header(struct buffer *buf, struct cbfs_file *file) bgets(buf, &file->magic, sizeof(file->magic)); file->len = 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); } -- cgit v1.2.3