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

cbfs-compression-tool: Add raw compression support 

This patch adds a new "rawcompress" command to cbfs-compression-tool,
that works exactly the same as "compress" except that it doesn't add the
custom 8-byte header to the file. This can be useful if you need to
compress something into a format that coreboot's decompression routines
can work with, but it's not supposed to go into CBFS.

Change-Id: I18a97a35bb0b0f71f3226f97114936dc81d379eb
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/26337
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Julius Werner 2018-05-15 17:30:20 -07:00
parent 55b3081b89
commit 88f4e08acf
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
util/cbfstool/cbfscomptool.c
View File

@ -20,10 +20,6 @@
#include "common.h" #include "common.h"
void usage(void);
int benchmark(void);
int compress(char *infile, char *outfile, char *algoname);
const char *usage_text = "cbfs-compression-tool benchmark\n" const char *usage_text = "cbfs-compression-tool benchmark\n"
" runs benchmarks for all implemented algorithms\n" " runs benchmarks for all implemented algorithms\n"
"cbfs-compression-tool compress inFile outFile algo\n" "cbfs-compression-tool compress inFile outFile algo\n"
@ -34,12 +30,12 @@ const char *usage_text = "cbfs-compression-tool benchmark\n"
" 4 bytes little endian: uncompressed size\n" " 4 bytes little endian: uncompressed size\n"
" ...: compressed data stream\n"; " ...: compressed data stream\n";
void usage() static void usage(void)
{ {
puts(usage_text); puts(usage_text);
} }
int benchmark() static int benchmark(void)
{ {
const int bufsize = 10*1024*1024; const int bufsize = 10*1024*1024;
char *data = malloc(bufsize); char *data = malloc(bufsize);
@ -88,7 +84,8 @@ int benchmark()
return 0; return 0;
} }
int compress(char *infile, char *outfile, char *algoname) static int compress(char *infile, char *outfile, char *algoname,
int write_header)
{ {
int err = 1; int err = 1;
FILE *fin = NULL; FILE *fin = NULL;
@ -163,18 +160,20 @@ int compress(char *infile, char *outfile, char *algoname)
algo = &types_cbfs_compression[0]; algo = &types_cbfs_compression[0];
} }
char header[8]; if (write_header) {
header[0] = algo->type & 0xff; char header[8];
header[1] = (algo->type >> 8) & 0xff; header[0] = algo->type & 0xff;
header[2] = (algo->type >> 16) & 0xff; header[1] = (algo->type >> 8) & 0xff;
header[3] = (algo->type >> 24) & 0xff; header[2] = (algo->type >> 16) & 0xff;
header[4] = insize & 0xff; header[3] = (algo->type >> 24) & 0xff;
header[5] = (insize >> 8) & 0xff; header[4] = insize & 0xff;
header[6] = (insize >> 16) & 0xff; header[5] = (insize >> 8) & 0xff;
header[7] = (insize >> 24) & 0xff; header[6] = (insize >> 16) & 0xff;
if (fwrite(header, 8, 1, fout) != 1) { header[7] = (insize >> 24) & 0xff;
fprintf(stderr, "failed writing header\n"); if (fwrite(header, 8, 1, fout) != 1) {
goto out; fprintf(stderr, "failed writing header\n");
goto out;
}
} }
if (fwrite(outdata, outsize, 1, fout) != 1) { if (fwrite(outdata, outsize, 1, fout) != 1) {
fprintf(stderr, "failed writing compressed data\n"); fprintf(stderr, "failed writing compressed data\n");
@ -194,7 +193,9 @@ int main(int argc, char **argv)
if ((argc == 2) && (strcmp(argv[1], "benchmark") == 0)) if ((argc == 2) && (strcmp(argv[1], "benchmark") == 0))
return benchmark(); return benchmark();
if ((argc == 5) && (strcmp(argv[1], "compress") == 0)) if ((argc == 5) && (strcmp(argv[1], "compress") == 0))
return compress(argv[2], argv[3], argv[4]); return compress(argv[2], argv[3], argv[4], 1);
if ((argc == 5) && (strcmp(argv[1], "rawcompress") == 0))
return compress(argv[2], argv[3], argv[4], 0);
usage(); usage();
return 1; return 1;
} }