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

cbfstool: rename field 

With introducing hash algorithms, 'algo' is ambiguous, so rename it to
'compression' instead.

Change-Id: Ief3d39067df650d03030b5ca9e8677861ce682ed
Signed-off-by: Sol Boucher <solb@chromium.org>
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Change-Id: I1a117a9473e895feaf455bb30d0f945f57de51eb
Original-Signed-off-by: Sol Boucher <solb@chromium.org>
Reviewed-on: http://review.coreboot.org/10930
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Sol Boucher 2015-05-07 21:00:05 -07:00 committed by Patrick Georgi
parent 158dd5527c
commit 6533671ce0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/cbfstool/cbfstool.c
View File

@ -75,14 +75,14 @@ static struct param {
bool fill_partial_downward; bool fill_partial_downward;
bool show_immutable; bool show_immutable;
int fit_empty_entries; int fit_empty_entries;
enum comp_algo algo; enum comp_algo compression;
/* for linux payloads */ /* for linux payloads */
char *initrd; char *initrd;
char *cmdline; char *cmdline;
} param = { } param = {
/* All variables not listed are initialized as zero. */ /* All variables not listed are initialized as zero. */
.arch = CBFS_ARCHITECTURE_UNKNOWN, .arch = CBFS_ARCHITECTURE_UNKNOWN,
.algo = CBFS_COMPRESS_NONE, .compression = CBFS_COMPRESS_NONE,
.headeroffset = ~0, .headeroffset = ~0,
.region_name = SECTION_NAME_PRIMARY_CBFS, .region_name = SECTION_NAME_PRIMARY_CBFS,
}; };
@ -226,7 +226,7 @@ static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset)
{ {
struct buffer output; struct buffer output;
int ret; int ret;
ret = parse_elf_to_stage(buffer, &output, param.algo, offset, ret = parse_elf_to_stage(buffer, &output, param.compression, offset,
param.ignore_section); param.ignore_section);
if (ret != 0) if (ret != 0)
return -1; return -1;
@ -242,16 +242,16 @@ static int cbfstool_convert_mkpayload(struct buffer *buffer,
struct buffer output; struct buffer output;
int ret; int ret;
/* per default, try and see if payload is an ELF binary */ /* per default, try and see if payload is an ELF binary */
ret = parse_elf_to_payload(buffer, &output, param.algo); ret = parse_elf_to_payload(buffer, &output, param.compression);
/* If it's not an ELF, see if it's a UEFI FV */ /* If it's not an ELF, see if it's a UEFI FV */
if (ret != 0) if (ret != 0)
ret = parse_fv_to_payload(buffer, &output, param.algo); ret = parse_fv_to_payload(buffer, &output, param.compression);
/* If it's neither ELF nor UEFI Fv, try bzImage */ /* If it's neither ELF nor UEFI Fv, try bzImage */
if (ret != 0) if (ret != 0)
ret = parse_bzImage_to_payload(buffer, &output, ret = parse_bzImage_to_payload(buffer, &output,
param.initrd, param.cmdline, param.algo); param.initrd, param.cmdline, param.compression);
/* Not a supported payload type */ /* Not a supported payload type */
if (ret != 0) { if (ret != 0) {
@ -273,7 +273,7 @@ static int cbfstool_convert_mkflatpayload(struct buffer *buffer,
if (parse_flat_binary_to_payload(buffer, &output, if (parse_flat_binary_to_payload(buffer, &output,
param.loadaddress, param.loadaddress,
param.entrypoint, param.entrypoint,
param.algo) != 0) { param.compression) != 0) {
return -1; return -1;
} }
buffer_delete(buffer); buffer_delete(buffer);
@ -975,9 +975,9 @@ int main(int argc, char **argv)
break; break;
case 'c': case 'c':
if (!strncasecmp(optarg, "lzma", 5)) if (!strncasecmp(optarg, "lzma", 5))
param.algo = CBFS_COMPRESS_LZMA; param.compression = CBFS_COMPRESS_LZMA;
else if (!strncasecmp(optarg, "none", 5)) else if (!strncasecmp(optarg, "none", 5))
param.algo = CBFS_COMPRESS_NONE; param.compression = CBFS_COMPRESS_NONE;
else else
WARN("Unknown compression '%s'" WARN("Unknown compression '%s'"
" ignored.\n", optarg); " ignored.\n", optarg);