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

cbfstool: Move cbfs_file_get_header to fit.c 

Since fit.c is the only caller of this function move it out of common.c
and into fit.c.

Change-Id: I64cc31a6d89ee425c5b07745ea5ca9437e2f3fcf
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/14949
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Furquan Shaikh 2016-05-23 08:44:46 -07:00 committed by Martin Roth
parent c4ea8f7d3f
commit 1ac194e14a
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/cbfstool/cbfs.h
View File

@ -254,9 +254,6 @@ static size_t widths_cbfs_hash[] unused = {
uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value); uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value);
uint32_t get_cbfs_compression(const char *name, uint32_t unknown); uint32_t get_cbfs_compression(const char *name, uint32_t unknown);
/* common.c */
void cbfs_file_get_header(struct buffer *buf, struct cbfs_file *file);
/* cbfs-mkpayload.c */ /* cbfs-mkpayload.c */
void xdr_segs(struct buffer *output, void xdr_segs(struct buffer *output,
struct cbfs_payload_segment *segs, int nseg); struct cbfs_payload_segment *segs, int nseg);

9
util/cbfstool/common.c
View File

@ -122,15 +122,6 @@ void buffer_delete(struct buffer *buffer)
buffer->size = 0; buffer->size = 0;
} }
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->attributes_offset = xdr_be.get32(buf);
file->offset = xdr_be.get32(buf);
}
static struct { static struct {
uint32_t arch; uint32_t arch;
const char *name; const char *name;

9
util/cbfstool/fit.c
View File

@ -186,6 +186,15 @@ static void add_microcodde_entries(struct fit_table *fit,
} }
} }
static 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->attributes_offset = xdr_be.get32(buf);
file->offset = xdr_be.get32(buf);
}
static int fit_header(void *ptr, uint32_t *current_offset, uint32_t *file_length) static int fit_header(void *ptr, uint32_t *current_offset, uint32_t *file_length)
{ {
struct buffer buf; struct buffer buf;