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

cbfstool: support compressed files in cbfstool print 

Display compressed and decompressed sizes, as well as the compression
algorithm used, when a compressed file is encountered.

Change-Id: I13c2332702c4a5bec379e1ebda72753e06f8e135
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/11359
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Patrick Georgi 2015-08-26 12:13:03 +02:00 committed by Patrick Georgi
parent 8984a637c1
commit c82725c5b9
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
util/cbfstool/cbfs_image.c
View File

@ -777,11 +777,36 @@ int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
if (!fp) if (!fp)
fp = stdout; fp = stdout;
fprintf(fp, "%-30s 0x%-8x %-12s %d\n", unsigned int compression = CBFS_COMPRESS_NONE;
*name ? name : "(empty)", unsigned int decompressed_size = 0;
cbfs_get_entry_addr(image, entry), for (struct cbfs_file_attribute *attr = cbfs_file_first_attr(entry);
get_cbfs_entry_type_name(ntohl(entry->type)), attr != NULL;
ntohl(entry->len)); attr = cbfs_file_next_attr(entry, attr)) {
if (ntohl(attr->tag) == CBFS_FILE_ATTR_TAG_COMPRESSION) {
struct cbfs_file_attr_compression *ac =
(struct cbfs_file_attr_compression *)attr;
compression = ntohl(ac->compression);
decompressed_size = ntohl(ac->decompressed_size);
}
}
if (compression == CBFS_COMPRESS_NONE) {
fprintf(fp, "%-30s 0x%-8x %-12s %d\n",
*name ? name : "(empty)",
cbfs_get_entry_addr(image, entry),
get_cbfs_entry_type_name(ntohl(entry->type)),
ntohl(entry->len));
} else {
fprintf(fp, "%-30s 0x%-8x %-12s %d (%d after %s decompression)\n",
*name ? name : "(empty)",
cbfs_get_entry_addr(image, entry),
get_cbfs_entry_type_name(ntohl(entry->type)),
ntohl(entry->len),
decompressed_size,
lookup_name_by_type(types_cbfs_compression,
compression, "(unknown)")
);
}
if (!verbose) if (!verbose)
return 0; return 0;