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>
This commit is contained in:
committed by
Patrick Georgi
parent
c13ad6c6df
commit
0e53931fee
@@ -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,
|
||||
|
Reference in New Issue
Block a user