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/common.h | |
parent | c13ad6c6df709fda1d70743a860a406643620b9e (diff) | |
download | coreboot-0e53931fee0178c4f4ac4e2e6b355b103b5e8c42.tar.xz |
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/common.h')
-rw-r--r-- | util/cbfstool/common.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 0284742cb4..80d5789f0e 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -26,20 +26,20 @@ /* Endianess */ #include "swab.h" #ifndef __APPLE__ -#define ntohl(x) (is_big_endian() ? (x) : swab32(x)) -#define htonl(x) (is_big_endian() ? (x) : swab32(x)) +#define ntohl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x)) +#define htonl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x)) #endif -#define ntohll(x) (is_big_endian() ? (x) : swab64(x)) -#define htonll(x) (is_big_endian() ? (x) : swab64(x)) +#define ntohll(x) (is_big_endian() ? (uint64_t)(x) : swab64(x)) +#define htonll(x) (is_big_endian() ? (uint64_t)(x) : swab64(x)) int is_big_endian(void); /* Message output */ extern int verbose; -#define ERROR(x...) { fprintf(stderr, "E: " x); } -#define WARN(x...) { fprintf(stderr, "W: " x); } -#define LOG(x...) { fprintf(stderr, x); } -#define INFO(x...) { if (verbose > 0) fprintf(stderr, "INFO: " x); } -#define DEBUG(x...) { if (verbose > 1) fprintf(stderr, "DEBUG: " x); } +#define ERROR(...) { fprintf(stderr, "E: " __VA_ARGS__); } +#define WARN(...) { fprintf(stderr, "W: " __VA_ARGS__); } +#define LOG(...) { fprintf(stderr, __VA_ARGS__); } +#define INFO(...) { if (verbose > 0) fprintf(stderr, "INFO: " __VA_ARGS__); } +#define DEBUG(...) { if (verbose > 1) fprintf(stderr, "DEBUG: " __VA_ARGS__); } /* Helpers */ #define ARRAY_SIZE(a) (int)(sizeof(a) / sizeof((a)[0])) @@ -135,8 +135,8 @@ comp_func_ptr compression_function(comp_algo algo); uint64_t intfiletype(const char *name); /* cbfs-mkpayload.c */ -int parse_elf_to_payload(const struct buffer *input, - struct buffer *output, uint32_t arch, comp_algo algo); +int parse_elf_to_payload(const struct buffer *input, struct buffer *output, + comp_algo algo); int parse_fv_to_payload(const struct buffer *input, struct buffer *output, comp_algo algo); int parse_bzImage_to_payload(const struct buffer *input, @@ -149,7 +149,7 @@ int parse_flat_binary_to_payload(const struct buffer *input, comp_algo algo); /* cbfs-mkstage.c */ int parse_elf_to_stage(const struct buffer *input, struct buffer *output, - uint32_t arch, comp_algo algo, uint32_t *location, + comp_algo algo, uint32_t *location, const char *ignore_section); void print_supported_filetypes(void); |