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

cbfstool: allow file data converters to modify the header size 

The idea is that they can at some point add extended attributes to the header.
That also needs to be passed, but let's start simple.

Change-Id: I80359843078b149ac433ee3d739ea192592e16e7
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: http://review.coreboot.org/11216
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Patrick Georgi 2015-08-11 15:16:24 +02:00
parent 4110abca72
commit f820497938
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/cbfstool/cbfstool.c
View File

@ -115,7 +115,8 @@ static unsigned convert_to_from_top_aligned(const struct buffer *region,
return image_size - region->offset - offset; return image_size - region->offset - offset;
} }
typedef int (*convert_buffer_t)(struct buffer *buffer, uint32_t *offset); typedef int (*convert_buffer_t)(struct buffer *buffer, uint32_t *offset,
uint32_t *header_size);
static int cbfs_add_integer_component(const char *name, static int cbfs_add_integer_component(const char *name,
uint64_t u64val, uint64_t u64val,
@ -203,7 +204,7 @@ static int cbfs_add_component(const char *filename,
uint32_t header_size = cbfs_calculate_file_header_size(name); uint32_t header_size = cbfs_calculate_file_header_size(name);
if (convert && convert(&buffer, &offset) != 0) { if (convert && convert(&buffer, &offset, &header_size) != 0) {
ERROR("Failed to parse file '%s'.\n", filename); ERROR("Failed to parse file '%s'.\n", filename);
buffer_delete(&buffer); buffer_delete(&buffer);
return 1; return 1;
@ -224,7 +225,8 @@ static int cbfs_add_component(const char *filename,
return 0; return 0;
} }
static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset) static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset,
unused uint32_t *header_size)
{ {
struct buffer output; struct buffer output;
int ret; int ret;
@ -239,7 +241,7 @@ static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset)
} }
static int cbfstool_convert_mkpayload(struct buffer *buffer, static int cbfstool_convert_mkpayload(struct buffer *buffer,
unused uint32_t *offset) unused uint32_t *offset, unused uint32_t *header_size)
{ {
struct buffer output; struct buffer output;
int ret; int ret;
@ -269,7 +271,7 @@ static int cbfstool_convert_mkpayload(struct buffer *buffer,
} }
static int cbfstool_convert_mkflatpayload(struct buffer *buffer, static int cbfstool_convert_mkflatpayload(struct buffer *buffer,
unused uint32_t *offset) unused uint32_t *offset, unused uint32_t *header_size)
{ {
struct buffer output; struct buffer output;
if (parse_flat_binary_to_payload(buffer, &output, if (parse_flat_binary_to_payload(buffer, &output,