diff options
| author | Sol Boucher <solb@chromium.org> | 2015-03-05 15:38:03 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-25 12:14:25 +0200 |
| commit | 0e53931fee0178c4f4ac4e2e6b355b103b5e8c42 (patch) | |
| tree | f38674ea0f24986093c5852115966fa27db2130a /util/cbfstool/cbfs_image.h | |
| parent | c13ad6c6df709fda1d70743a860a406643620b9e (diff) | |
| download | coreboot-0e53931fee0178c4f4ac4e2e6b355b103b5e8c42.tar.gz coreboot-0e53931fee0178c4f4ac4e2e6b355b103b5e8c42.tar.bz2 coreboot-0e53931fee0178c4f4ac4e2e6b355b103b5e8c42.zip | |
cbfstool: Clean up in preparation for adding new files
This enables more warnings on the cbfstool codebase and fixes the
issues that surface as a result. A memory leak that used to occur
when compressing files with lzma is also found and fixed.
Finally, there are several fixes for the Makefile:
- Its autodependencies used to be broken because the target for
the .dependencies file was misnamed; this meant that Make
didn't know how to rebuild the file, and so would silently
skip the step of updating it before including it.
- The ability to build to a custom output directory by defining
the obj variable had bitrotted.
- The default value of the obj variable was causing implicit
rules not to apply when specifying a file as a target without
providing a custom value for obj.
- Add a distclean target for removing the .dependencies file.
BUG=chromium:461875
TEST=Build an image with cbfstool both before and after.
BRANCH=None
Change-Id: I951919d63443f2b053c2e67c1ac9872abc0a43ca
Signed-off-by: Sol Boucher <solb@chromium.org>
Original-Commit-Id: 49293443b4e565ca48d284e9a66f80c9c213975d
Original-Change-Id: Ia7350c2c3306905984cfa711d5fc4631f0b43d5b
Original-Signed-off-by: Sol Boucher <solb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/257340
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-on: http://review.coreboot.org/9937
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'util/cbfstool/cbfs_image.h')
| -rw-r--r-- | util/cbfstool/cbfs_image.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 55ce0289b03d..1c2b6fd56e2b 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -35,7 +35,7 @@ struct cbfs_image { * to cbfs format, i.e. big-endian. */ void cbfs_put_header(void *dest, const struct cbfs_header *header); /* Or deserialize into host-native format */ -void cbfs_get_header(struct cbfs_header *header, const void *src); +void cbfs_get_header(struct cbfs_header *header, void *src); /* Creates an empty CBFS image by given size, and description to its content * (bootblock, align, header location, starting offset of CBFS entries. @@ -47,9 +47,9 @@ int cbfs_image_create(struct cbfs_image *image, size_t size, uint32_t align, struct buffer *bootblock, - int32_t bootblock_offset, - int32_t header_offset, - int32_t entries_offset); + uint32_t bootblock_offset, + uint32_t header_offset, + uint32_t entries_offset); /* Loads a CBFS image from file. Returns 0 on success, otherwise non-zero. */ int cbfs_image_from_file(struct cbfs_image *image, |