Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11324
-gerrit
commit 8c97dd6b76c2c20da19d2731e11168d48fc1ab00 Author: Patrick Georgi patrick@georgi-clan.de Date: Tue Aug 25 13:16:04 2015 +0200
cbfstool: drop size argument to cbfs_add_entry_at
It's sole use was comparing it to the header's "len" field.
Change-Id: Ic3657a709dee0d2b9288373757345a1a56124f37 Signed-off-by: Patrick Georgi patrick@georgi-clan.de --- util/cbfstool/cbfs_image.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index acf68ce..84f4be6 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -455,7 +455,6 @@ int cbfs_image_delete(struct cbfs_image *image) /* Tries to add an entry with its data (CBFS_SUBHEADER) at given offset. */ static int cbfs_add_entry_at(struct cbfs_image *image, struct cbfs_file *entry, - uint32_t size, const void *data, uint32_t content_offset, const void *header_data, @@ -502,13 +501,12 @@ static int cbfs_add_entry_at(struct cbfs_image *image, }
// Ready to fill data into entry. - assert(ntohl(entry->len) == size); DEBUG("content_offset: 0x%x, entry location: %x\n", content_offset, (int)((char*)CBFS_SUBHEADER(entry) - image->buffer.data)); assert((char*)CBFS_SUBHEADER(entry) - image->buffer.data == (ptrdiff_t)content_offset); - memcpy(CBFS_SUBHEADER(entry), data, size); + memcpy(CBFS_SUBHEADER(entry), data, ntohl(entry->len)); if (verbose > 1) cbfs_print_entry_info(image, entry, stderr);
// Process buffer AFTER entry. @@ -612,7 +610,7 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, struct cbfs_file *header = cbfs_create_file_header(type, buffer->size, name);
- if (cbfs_add_entry_at(image, entry, buffer->size, + if (cbfs_add_entry_at(image, entry, buffer->data, content_offset, header, header_size) == 0) { free(header);