cbfstool: don't pass header_size as separate argument
It's already present inside struct cbfs_file Change-Id: Ib10663c6601aa02e07b868e440f05da02af9c2d9 Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/11332 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
committed by
Patrick Georgi
parent
a60e7b6da5
commit
d5a4afa63d
@@ -457,8 +457,7 @@ static int cbfs_add_entry_at(struct cbfs_image *image,
|
|||||||
struct cbfs_file *entry,
|
struct cbfs_file *entry,
|
||||||
const void *data,
|
const void *data,
|
||||||
uint32_t content_offset,
|
uint32_t content_offset,
|
||||||
const struct cbfs_file *header,
|
const struct cbfs_file *header)
|
||||||
uint32_t header_size)
|
|
||||||
{
|
{
|
||||||
struct cbfs_file *next = cbfs_find_next_entry(image, entry);
|
struct cbfs_file *next = cbfs_find_next_entry(image, entry);
|
||||||
uint32_t addr = cbfs_get_entry_addr(image, entry),
|
uint32_t addr = cbfs_get_entry_addr(image, entry),
|
||||||
@@ -467,6 +466,7 @@ static int cbfs_add_entry_at(struct cbfs_image *image,
|
|||||||
uint32_t len, header_offset;
|
uint32_t len, header_offset;
|
||||||
uint32_t align = image->has_header ? image->header.align :
|
uint32_t align = image->has_header ? image->header.align :
|
||||||
CBFS_ENTRY_ALIGNMENT;
|
CBFS_ENTRY_ALIGNMENT;
|
||||||
|
uint32_t header_size = ntohl(header->offset);
|
||||||
|
|
||||||
header_offset = content_offset - header_size;
|
header_offset = content_offset - header_size;
|
||||||
if (header_offset % align)
|
if (header_offset % align)
|
||||||
@@ -605,9 +605,8 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer,
|
|||||||
DEBUG("section 0x%x+0x%x for content_offset 0x%x.\n",
|
DEBUG("section 0x%x+0x%x for content_offset 0x%x.\n",
|
||||||
addr, addr_next - addr, content_offset);
|
addr, addr_next - addr, content_offset);
|
||||||
|
|
||||||
if (cbfs_add_entry_at(image, entry,
|
if (cbfs_add_entry_at(image, entry, buffer->data,
|
||||||
buffer->data, content_offset, header,
|
content_offset, header) == 0) {
|
||||||
header_size) == 0) {
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user