diff options
| author | Furquan Shaikh <furquan@google.com> | 2016-05-23 08:44:46 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-05-26 23:51:08 +0200 |
| commit | 1ac194e14a90563635b0a0a6a82ada87dcb8dbde (patch) | |
| tree | 8954f76e318ecdd56af97d464dc404447288d14f | |
| parent | c4ea8f7d3fb56b43482b8abd8405280f50d98864 (diff) | |
| download | coreboot-1ac194e14a90563635b0a0a6a82ada87dcb8dbde.tar.xz | |
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>
| -rw-r--r-- | util/cbfstool/cbfs.h | 3 | ||||
| -rw-r--r-- | util/cbfstool/common.c | 9 | ||||
| -rw-r--r-- | util/cbfstool/fit.c | 9 |
3 files changed, 9 insertions, 12 deletions
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 641c6a141f..36b9fc0f87 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -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_compression(const char *name, uint32_t unknown); -/* common.c */ -void cbfs_file_get_header(struct buffer *buf, struct cbfs_file *file); - /* cbfs-mkpayload.c */ void xdr_segs(struct buffer *output, struct cbfs_payload_segment *segs, int nseg); diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 4534d8526a..bbb6141fe9 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -122,15 +122,6 @@ void buffer_delete(struct buffer *buffer) 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 { uint32_t arch; const char *name; diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c index 584103b154..6de311c75d 100644 --- a/util/cbfstool/fit.c +++ b/util/cbfstool/fit.c @@ -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) { struct buffer buf; |