New patch to review for coreboot: 8116feb cbfstool: Clean up static global variables.
by Hung-Te Lin 28 Jan '13
by Hung-Te Lin 28 Jan '13
28 Jan '13
Hung-Te Lin (hungte(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2195
-gerrit
commit 8116febe68d6dbcb1604e432bd51bb8c512ef668
Author: Hung-Te Lin <hungte(a)chromium.org>
Date: Mon Jan 28 14:23:49 2013 +0800
cbfstool: Clean up static global variables.
Pack global variables used by command line tool as argument into "param".
Change-Id: I5a298f4d67e712f90e998bcb70f2a68b8c0db6ac
Signed-off-by: Hung-Te Lin <hungte(a)chromium.org>
---
util/cbfstool/cbfstool.c | 216 ++++++++++++++++++++++++-----------------------
1 file changed, 109 insertions(+), 107 deletions(-)
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 4202801..901396b 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -35,65 +35,67 @@ struct command {
};
int verbose = 0;
-static char *cbfs_name = NULL;
-static char *rom_name = NULL;
-static char *rom_filename = NULL;
-static char *rom_bootblock = NULL;
-static uint32_t rom_type = 0;
-static uint32_t rom_baseaddress = 0;
-static uint32_t rom_loadaddress = 0;
-static uint32_t rom_entrypoint = 0;
-static uint32_t rom_size = 0;
-static uint32_t rom_alignment = 0;
-static uint32_t rom_offset = 0;
-static comp_algo rom_algo = CBFS_COMPRESS_NONE;
+struct param {
+ char *cbfs_name;
+ char *name;
+ char *filename;
+ char *bootblock;
+ uint32_t type;
+ uint32_t baseaddress;
+ uint32_t loadaddress;
+ uint32_t entrypoint;
+ uint32_t size;
+ uint32_t alignment;
+ uint32_t offset;
+ comp_algo algo;
+} param;
static int cbfs_add(void)
{
uint32_t filesize = 0;
void *rom, *filedata, *cbfsfile;
- if (!rom_filename) {
+ if (!param.filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (rom_type == 0) {
+ if (param.type == 0) {
fprintf(stderr, "E: You need to specify a valid -t/--type.\n");
return 1;
}
- rom = loadrom(cbfs_name);
+ rom = loadrom(param.cbfs_name);
if (rom == NULL) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
+ filedata = loadfile(param.filename, &filesize, 0, SEEK_SET);
if (filedata == NULL) {
fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
+ param.filename);
free(rom);
return 1;
}
- cbfsfile = create_cbfs_file(rom_name, filedata, &filesize,
- rom_type, &rom_baseaddress);
+ cbfsfile = create_cbfs_file(param.name, filedata, &filesize,
+ param.type, ¶m.baseaddress);
free(filedata);
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding file '%s' failed.\n", rom_filename);
+ if (add_file_to_cbfs(cbfsfile, filesize, param.baseaddress)) {
+ fprintf(stderr, "E: Adding file '%s' failed.\n", param.filename);
free(cbfsfile);
free(rom);
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
+ if (writerom(param.cbfs_name, rom, romsize)) {
free(cbfsfile);
free(rom);
return 1;
@@ -106,58 +108,58 @@ static int cbfs_add(void)
static int cbfs_add_payload(void)
{
- int32_t filesize = 0;
+ uint32_t filesize = 0;
void *rom, *filedata, *cbfsfile;
unsigned char *payload;
- if (!rom_filename) {
+ if (!param.filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
+ rom = loadrom(param.cbfs_name);
if (rom == NULL) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
+ filedata = loadfile(param.filename, &filesize, 0, SEEK_SET);
if (filedata == NULL) {
fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
+ param.filename);
free(rom);
return 1;
}
- filesize = parse_elf_to_payload(filedata, &payload, rom_algo);
+ filesize = parse_elf_to_payload(filedata, &payload, param.algo);
if (filesize <= 0) {
fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
+ param.filename);
free(rom);
return 1;
}
- cbfsfile = create_cbfs_file(rom_name, payload, &filesize,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
+ cbfsfile = create_cbfs_file(param.name, payload, &filesize,
+ CBFS_COMPONENT_PAYLOAD, ¶m.baseaddress);
free(filedata);
free(payload);
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
+ if (add_file_to_cbfs(cbfsfile, filesize, param.baseaddress)) {
fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
+ param.filename);
free(cbfsfile);
free(rom);
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
+ if (writerom(param.cbfs_name, rom, romsize)) {
free(cbfsfile);
free(rom);
return 1;
@@ -174,48 +176,48 @@ static int cbfs_add_stage(void)
void *rom, *filedata, *cbfsfile;
unsigned char *stage;
- if (!rom_filename) {
+ if (!param.filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
+ rom = loadrom(param.cbfs_name);
if (rom == NULL) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
+ filedata = loadfile(param.filename, &filesize, 0, SEEK_SET);
if (filedata == NULL) {
fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
+ param.filename);
free(rom);
return 1;
}
- filesize = parse_elf_to_stage(filedata, &stage, rom_algo, &rom_baseaddress);
+ filesize = parse_elf_to_stage(filedata, &stage, param.algo, ¶m.baseaddress);
- cbfsfile = create_cbfs_file(rom_name, stage, &filesize,
- CBFS_COMPONENT_STAGE, &rom_baseaddress);
+ cbfsfile = create_cbfs_file(param.name, stage, &filesize,
+ CBFS_COMPONENT_STAGE, ¶m.baseaddress);
free(filedata);
free(stage);
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
+ if (add_file_to_cbfs(cbfsfile, filesize, param.baseaddress)) {
fprintf(stderr, "E: Adding stage '%s' failed.\n",
- rom_filename);
+ param.filename);
free(cbfsfile);
free(rom);
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
+ if (writerom(param.cbfs_name, rom, romsize)) {
free(cbfsfile);
free(rom);
return 1;
@@ -236,43 +238,43 @@ static int cbfs_add_flat_binary(void)
struct cbfs_payload_segment *segs;
int doffset, len = 0;
- if (!rom_filename) {
+ if (!param.filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (rom_loadaddress == 0) {
+ if (param.loadaddress == 0) {
fprintf(stderr, "E: You need to specify a valid "
"-l/--load-address.\n");
return 1;
}
- if (rom_entrypoint == 0) {
+ if (param.entrypoint == 0) {
fprintf(stderr, "E: You need to specify a valid "
"-e/--entry-point.\n");
return 1;
}
- compress = compression_function(rom_algo);
+ compress = compression_function(param.algo);
if (!compress)
return 1;
- rom = loadrom(cbfs_name);
+ rom = loadrom(param.cbfs_name);
if (rom == NULL) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
+ filedata = loadfile(param.filename, &filesize, 0, SEEK_SET);
if (filedata == NULL) {
fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
+ param.filename);
free(rom);
return 1;
}
@@ -291,12 +293,12 @@ static int cbfs_add_flat_binary(void)
/* Prepare code segment */
segs[0].type = PAYLOAD_SEGMENT_CODE;
- segs[0].load_addr = (uint64_t)htonll(rom_loadaddress);
+ segs[0].load_addr = (uint64_t)htonll(param.loadaddress);
segs[0].mem_len = (uint32_t)htonl(filesize);
segs[0].offset = (uint32_t)htonl(doffset);
compress(filedata, filesize, (char *)(payload + doffset), &len);
- segs[0].compression = htonl(rom_algo);
+ segs[0].compression = htonl(param.algo);
segs[0].len = htonl(len);
if ((unsigned int)len >= filesize) {
@@ -307,24 +309,24 @@ static int cbfs_add_flat_binary(void)
/* prepare entry point segment */
segs[1].type = PAYLOAD_SEGMENT_ENTRY;
- segs[1].load_addr = (uint64_t)htonll(rom_entrypoint);
+ segs[1].load_addr = (uint64_t)htonll(param.entrypoint);
final_size = doffset + ntohl(segs[0].len);
cbfsfile =
- create_cbfs_file(rom_name, payload, &final_size,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
+ create_cbfs_file(param.name, payload, &final_size,
+ CBFS_COMPONENT_PAYLOAD, ¶m.baseaddress);
free(filedata);
free(payload);
- if (add_file_to_cbfs(cbfsfile, final_size, rom_baseaddress)) {
+ if (add_file_to_cbfs(cbfsfile, final_size, param.baseaddress)) {
fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
+ param.filename);
free(cbfsfile);
free(rom);
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
+ if (writerom(param.cbfs_name, rom, romsize)) {
free(cbfsfile);
free(rom);
return 1;
@@ -339,26 +341,26 @@ static int cbfs_remove(void)
{
void *rom;
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
+ rom = loadrom(param.cbfs_name);
if (rom == NULL) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- if (remove_file_from_cbfs(rom_name)) {
+ if (remove_file_from_cbfs(param.name)) {
fprintf(stderr, "E: Removing file '%s' failed.\n",
- rom_name);
+ param.name);
free(rom);
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
+ if (writerom(param.cbfs_name, rom, romsize)) {
free(rom);
return 1;
}
@@ -369,12 +371,12 @@ static int cbfs_remove(void)
static int cbfs_create(void)
{
- if (rom_size == 0) {
+ if (param.size == 0) {
fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
return 1;
}
- if (!rom_bootblock) {
+ if (!param.bootblock) {
fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
return 1;
}
@@ -384,28 +386,28 @@ static int cbfs_create(void)
return 1;
}
- return create_cbfs_image(cbfs_name, rom_size, rom_bootblock,
- rom_alignment, rom_offset);
+ return create_cbfs_image(param.cbfs_name, param.size, param.bootblock,
+ param.alignment, param.offset);
}
static int cbfs_locate(void)
{
uint32_t filesize, location;
- if (!rom_filename) {
+ if (!param.filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- filesize = getfilesize(rom_filename);
+ filesize = getfilesize(param.filename);
- location = cbfs_find_location(cbfs_name, filesize,
- rom_name, rom_alignment);
+ location = cbfs_find_location(param.cbfs_name, filesize,
+ param.name, param.alignment);
printf("%x\n", location);
return location == 0 ? 1 : 0;
@@ -415,14 +417,14 @@ static int cbfs_print(void)
{
void *rom;
- rom = loadrom(cbfs_name);
+ rom = loadrom(param.cbfs_name);
if (rom == NULL) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- print_cbfs_directory(cbfs_name);
+ print_cbfs_directory(param.cbfs_name);
free(rom);
return 0;
@@ -433,24 +435,24 @@ static int cbfs_extract(void)
void *rom;
int ret;
- if (!rom_filename) {
+ if (!param.filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
+ rom = loadrom(param.cbfs_name);
if (rom == NULL) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- ret = extract_file_from_cbfs(cbfs_name, rom_name, rom_filename);
+ ret = extract_file_from_cbfs(param.cbfs_name, param.name, param.filename);
free(rom);
return ret;
@@ -545,7 +547,7 @@ int main(int argc, char **argv)
which_endian();
- cbfs_name = argv[1];
+ param.cbfs_name = argv[1];
char *cmd = argv[2];
optind += 2;
@@ -572,55 +574,55 @@ int main(int argc, char **argv)
switch(c) {
case 'n':
- rom_name = optarg;
+ param.name = optarg;
break;
case 't':
if (intfiletype(optarg) != ((uint64_t) - 1))
- rom_type = intfiletype(optarg);
+ param.type = intfiletype(optarg);
else
- rom_type = strtoul(optarg, NULL, 0);
- if (rom_type == 0)
+ param.type = strtoul(optarg, NULL, 0);
+ if (param.type == 0)
printf("W: Unknown type '%s' ignored\n",
optarg);
break;
case 'c':
if (!strncasecmp(optarg, "lzma", 5))
- rom_algo = CBFS_COMPRESS_LZMA;
+ param.algo = CBFS_COMPRESS_LZMA;
else if (!strncasecmp(optarg, "none", 5))
- rom_algo = CBFS_COMPRESS_NONE;
+ param.algo = CBFS_COMPRESS_NONE;
else
printf("W: Unknown compression '%s'"
" ignored.\n", optarg);
break;
case 'b':
- rom_baseaddress = strtoul(optarg, NULL, 0);
+ param.baseaddress = strtoul(optarg, NULL, 0);
break;
case 'l':
- rom_loadaddress = strtoul(optarg, NULL, 0);
+ param.loadaddress = strtoul(optarg, NULL, 0);
break;
case 'e':
- rom_entrypoint = strtoul(optarg, NULL, 0);
+ param.entrypoint = strtoul(optarg, NULL, 0);
break;
case 's':
- rom_size = strtoul(optarg, &suffix, 0);
+ param.size = strtoul(optarg, &suffix, 0);
if (tolower(suffix[0])=='k') {
- rom_size *= 1024;
+ param.size *= 1024;
}
if (tolower(suffix[0])=='m') {
- rom_size *= 1024 * 1024;
+ param.size *= 1024 * 1024;
}
case 'B':
- rom_bootblock = optarg;
+ param.bootblock = optarg;
break;
case 'a':
- rom_alignment = strtoul(optarg, NULL, 0);
+ param.alignment = strtoul(optarg, NULL, 0);
break;
case 'o':
- rom_offset = strtoul(optarg, NULL, 0);
+ param.offset = strtoul(optarg, NULL, 0);
break;
case 'f':
- rom_filename = optarg;
+ param.filename = optarg;
break;
case 'v':
verbose++;
1
0
Patch set updated for coreboot: 9899e3d Improve CBFS tool to support platform without top-aligned mapping.
by Hung-Te Lin 27 Jan '13
by Hung-Te Lin 27 Jan '13
27 Jan '13
Hung-Te Lin (hungte(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2194
-gerrit
commit 9899e3d6a215e0f92150c0760e017db6306e33a5
Author: Hung-Te Lin <hungte(a)chromium.org>
Date: Sat Jan 26 02:03:28 2013 +0800
Improve CBFS tool to support platform without top-aligned mapping.
CBFS tool was written with lots of global variables and designed with assumption
based on x86 architecture. To support other platforms better, we should rewrite
using logical offset instead of top-aligned memory mapped address.
Also fixed a calculation error in size of last entry (which will cause
overwriting header data when you really used every bits in CBFS) in old CBFS
tool.
Usage changes:
- "locate" is changed to "locate-stage" (which is the real behavior in old
cbfstool) and prefix output with "0x". The output is now platform
independent offset. To retrieve x86 top-aligned virtual address, add "-T".
- "create" takes two extra optional params:
"-b": baseeaddress (offset) for bootblock. When omitted, put bootblock in
end of ROM.
"-H": header offset. When omitted, put header right before bootblock,
and put a top-aligned virtual address reference in end of ROM.
- All address (-b, -H, -o) can now be ROM offset or x86 top-aligned address
( > 0x80000000).
- "-m" (architecture) is deprecated because we won't want to list hundreds of
architecture variants (like ARM soc family).
- "-v" (verbose) now really works.
Verified to work on ARM (google/snow) and X86 (qemu/x86).
Change-Id: I28c737c8f290e51332119188248ac9e28042024c
Signed-off-by: Hung-Te Lin <hungte(a)chromium.org>
---
src/arch/armv7/Makefile.inc | 13 +-
src/arch/x86/Makefile.inc | 12 +-
util/cbfstool/cbfs-mkpayload.c | 82 ++-
util/cbfstool/cbfs-mkstage.c | 39 +-
util/cbfstool/cbfs.h | 7 +-
util/cbfstool/cbfstool.c | 678 +++++++++----------
util/cbfstool/common.c | 1401 ++++++++++++++++++++++------------------
util/cbfstool/common.h | 203 ++++--
8 files changed, 1324 insertions(+), 1111 deletions(-)
diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc
index 872365c..55de481 100644
--- a/src/arch/armv7/Makefile.inc
+++ b/src/arch/armv7/Makefile.inc
@@ -46,9 +46,12 @@ prebuild-files = \
$(if $(call extract_nth,4,$(file)),-b $(call extract_nth,4,$(file))) &&)
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
+# TODO(hungte) Change CBFS command to use per-board params. Also we don't need
+# to prefix 0x2000 bytes of zero in boot block anymore!
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
- $(CBFSTOOL) $@.tmp create -m armv7 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
- -B $(objcbfs)/bootblock.bin -a 64
+ $(CBFSTOOL) $@.tmp create -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
+ -B $(objcbfs)/bootblock.bin -a 64 -b 0x0000 -H 0x2040 \
+ -o 0x5000
$(prebuild-files) true
mv $@.tmp $@
else
@@ -314,11 +317,9 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas
$(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin
@printf " generating base_xip.txt\n"
rm -f $@
- $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
+ $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
|| { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; }
- sed -e 's/^/0x/g' $@.tmp > $@.tmp2
- rm $@.tmp
- mv $@.tmp2 $@
+ mv $@.tmp $@
$(objgenerated)/crt0.romstage.S: $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n"
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index ea86f8f..30f9008 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -65,7 +65,7 @@ prebuild-files = \
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
- $(CBFSTOOL) $@.tmp create -m x86 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
+ $(CBFSTOOL) $@.tmp create -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
-B $(objcbfs)/bootblock.bin -a 64 \
-o $$(( $(CONFIG_ROM_SIZE) - $(CONFIG_CBFS_SIZE) ))
$(prebuild-files) true
@@ -274,6 +274,9 @@ endif
$(obj)/coreboot.pre: $(objcbfs)/romstage_xip.elf $(obj)/coreboot.pre1 $(CBFSTOOL)
@printf " CBFS $(subst $(obj)/,,$(@))\n"
cp $(obj)/coreboot.pre1 $@.tmp
+ echo $(CBFSTOOL) $@.tmp add-stage -f $(objcbfs)/romstage_xip.elf \
+ -n $(CONFIG_CBFS_PREFIX)/romstage -c none \
+ -b $(shell cat $(objcbfs)/base_xip.txt) >>cbfs.log
$(CBFSTOOL) $@.tmp add-stage -f $(objcbfs)/romstage_xip.elf \
-n $(CONFIG_CBFS_PREFIX)/romstage -c none \
-b $(shell cat $(objcbfs)/base_xip.txt)
@@ -375,11 +378,10 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas
$(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin
rm -f $@
- $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
+ echo $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -T -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) >> cbfs.log
+ $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -T -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
|| { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; }
- sed -e 's/^/0x/g' $@.tmp > $@.tmp2
- rm $@.tmp
- mv $@.tmp2 $@
+ mv $@.tmp $@
$(objgenerated)/crt0.romstage.S: $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n"
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index 0d3986e..3c19d55 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -22,24 +22,18 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo)
+int parse_elf_to_payload(char *input, char **output, comp_algo algo)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
Elf32_Shdr *shdr;
char *header;
char *strtab;
- unsigned char *sptr;
+ char *sptr;
int headers;
int segments = 1;
int isize = 0, osize = 0;
@@ -47,21 +41,16 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
struct cbfs_payload_segment *segs;
int i;
- if(!iself(input)){
+ if(!is_elf_object(input)){
fprintf(stderr, "E: The payload file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The payload file has the wrong architecture\n");
- return -1;
- }
-
comp_func_ptr compress = compression_function(algo);
if (!compress)
return -1;
+ DEBUG("start: parse_elf_to_payload\n");
headers = ehdr->e_phnum;
header = (char *)ehdr;
@@ -156,9 +145,9 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
if (phdr[i].p_filesz == 0) {
segs[segments].type = PAYLOAD_SEGMENT_BSS;
segs[segments].load_addr =
- (uint64_t)htonll(phdr[i].p_paddr);
+ htonll(phdr[i].p_paddr);
segs[segments].mem_len =
- (uint32_t)htonl(phdr[i].p_memsz);
+ htonl(phdr[i].p_memsz);
segs[segments].offset = htonl(doffset);
segments++;
@@ -169,8 +158,8 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
segs[segments].type = PAYLOAD_SEGMENT_CODE;
else
segs[segments].type = PAYLOAD_SEGMENT_DATA;
- segs[segments].load_addr = (uint64_t)htonll(phdr[i].p_paddr);
- segs[segments].mem_len = (uint32_t)htonl(phdr[i].p_memsz);
+ segs[segments].load_addr = htonll(phdr[i].p_paddr);
+ segs[segments].mem_len = htonl(phdr[i].p_memsz);
segs[segments].compression = htonl(algo);
segs[segments].offset = htonl(doffset);
@@ -197,7 +186,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
}
segs[segments].type = PAYLOAD_SEGMENT_ENTRY;
- segs[segments++].load_addr = (uint64_t)htonll(ehdr->e_entry);
+ segs[segments++].load_addr = htonll(ehdr->e_entry);
*output = sptr;
@@ -206,3 +195,54 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
err:
return -1;
}
+
+int parse_flat_binary_to_payload(char *input,
+ char **output,
+ uint32_t input_size,
+ uint32_t loadaddress,
+ uint32_t entrypoint,
+ comp_algo algo)
+{
+ comp_func_ptr compress;
+ char *payload;
+ struct cbfs_payload_segment *segs;
+ int doffset, len = 0;
+
+ compress = compression_function(algo);
+ if (!compress)
+ return 1;
+
+ DEBUG("start: parse_flat_binary_to_payload\n");
+ /* FIXME compressed file size might be bigger than original file */
+ payload = calloc((2 * sizeof(*segs)) + input_size, 1);
+ if (payload == NULL) {
+ fprintf(stderr, "E: Could not allocate memory.\n");
+ return 1;
+ }
+
+ segs = (struct cbfs_payload_segment *)payload;
+ doffset = (2 * sizeof(*segs));
+
+ /* Prepare code segment */
+ segs[0].type = PAYLOAD_SEGMENT_CODE;
+ segs[0].load_addr = htonll(loadaddress);
+ segs[0].mem_len = htonl(input_size);
+ segs[0].offset = htonl(doffset);
+
+ compress(input, input_size, (char *)(payload + doffset), &len);
+ segs[0].compression = htonl(algo);
+ segs[0].len = htonl(len);
+
+ if ((unsigned int)len >= input_size) {
+ segs[0].compression = 0;
+ segs[0].len = htonl(input_size);
+ memcpy(payload + doffset, input, input_size);
+ }
+
+ /* prepare entry point segment */
+ segs[1].type = PAYLOAD_SEGMENT_ENTRY;
+ segs[1].load_addr = htonll(entrypoint);
+
+ *output = payload;
+ return doffset + ntohl(segs[0].len);
+}
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index 0541d4b..9e47047 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -23,14 +23,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
static unsigned int idemp(unsigned int x)
{
@@ -48,13 +43,13 @@ static unsigned int swap32(unsigned int x)
unsigned int (*elf32_to_native) (unsigned int) = idemp;
/* returns size of result, or -1 if error */
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location)
+int parse_elf_to_stage(char *input, char **output,
+ comp_algo algo, uint32_t location)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
char *header, *buffer;
- unsigned char *out;
+ char *out;
int headers;
int i;
@@ -67,21 +62,16 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
if (!compress)
return -1;
- if (!iself(input)) {
+ DEBUG("start: parse_elf_to_stage(location=0x%x)\n", location);
+ if (!is_elf_object(input)) {
fprintf(stderr, "E: The stage file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The stage file has the wrong architecture\n");
- return -1;
- }
-
if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
elf_bigendian = 1;
}
- if (elf_bigendian != host_bigendian) {
+ if (elf_bigendian != is_big_endian()) {
elf32_to_native = swap32;
}
@@ -125,8 +115,8 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
mem_end = mend;
}
- if (data_start < *location) {
- data_start = *location;
+ if (data_start < location) {
+ data_start = location;
}
if (data_end <= data_start) {
@@ -155,9 +145,9 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
continue;
l_start = elf32_to_native(phdr[i].p_paddr);
- if (l_start < *location) {
- l_offset = *location - l_start;
- l_start = *location;
+ if (l_start < location) {
+ l_offset = location - l_start;
+ l_start = location;
}
memcpy(buffer + (l_start - data_start),
@@ -184,10 +174,7 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
(char *)(out + sizeof(struct cbfs_stage)), (int *)&stage->len);
free(buffer);
-
*output = out;
- if (*location)
- *location -= sizeof(struct cbfs_stage);
- return sizeof(struct cbfs_stage) + stage->len;
+ return sizeof(*stage) + stage->len;
}
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 3dbeefd..26ab62f 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -25,7 +25,9 @@
#define CBFS_HEADPTR_ADDR_X86 0xFFFFFFFC
#define CBFS_HEADER_VERSION1 0x31313131
#define CBFS_HEADER_VERSION2 0x31313132
-#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION2
+// TODO(hungte) We probably don't need "architecture" anymore - remove in future
+// Right now, to make old cbfstool happy, declare version as 1.
+#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION1
struct cbfs_header {
uint32_t magic;
@@ -42,6 +44,8 @@ struct cbfs_header {
#define CBFS_ARCHITECTURE_X86 0x00000001
#define CBFS_ARCHITECTURE_ARMV7 0x00000010
+#define CBFS_FILE_MAGIC "LARCHIVE"
+
struct cbfs_file {
uint8_t magic[8];
uint32_t len;
@@ -106,6 +110,7 @@ struct cbfs_payload {
#define CBFS_COMPONENT_NULL 0xFFFFFFFF
int cbfs_file_header(unsigned long physaddr);
+#define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file))
#define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) )
struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size);
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 4202801..d734cd4 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,6 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -26,7 +28,8 @@
#include <unistd.h>
#include <getopt.h>
#include "common.h"
-#include "cbfs.h"
+
+int verbose = 0;
struct command {
const char *name;
@@ -34,438 +37,385 @@ struct command {
int (*function) (void);
};
-int verbose = 0;
-static char *cbfs_name = NULL;
-static char *rom_name = NULL;
-static char *rom_filename = NULL;
-static char *rom_bootblock = NULL;
-static uint32_t rom_type = 0;
-static uint32_t rom_baseaddress = 0;
-static uint32_t rom_loadaddress = 0;
-static uint32_t rom_entrypoint = 0;
-static uint32_t rom_size = 0;
-static uint32_t rom_alignment = 0;
-static uint32_t rom_offset = 0;
-static comp_algo rom_algo = CBFS_COMPRESS_NONE;
-
-static int cbfs_add(void)
-{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
-
- if (!rom_filename) {
+struct param {
+ char *cbfs_name;
+ char *name;
+ char *filename;
+ char *bootblock_file;
+ uint32_t type;
+ uint32_t base_address;
+ uint32_t base_address_assigned;
+ uint32_t load_address;
+ uint32_t header_offset;
+ uint32_t header_offset_assigned;
+ uint32_t entrypoint;
+ uint32_t size;
+ uint32_t alignment;
+ uint32_t offset;
+ uint32_t top_aligned;
+ comp_algo algo;
+} param;
+
+typedef int (*convert_buffer_t)(struct buffer *buffer);
+
+static int cbfstool_add_file(const char *cbfs_name,
+ const char *filename,
+ const char *name,
+ uint32_t type,
+ uint32_t offset,
+ convert_buffer_t convert) {
+ struct cbfs_image image;
+ struct buffer buffer;
+ int result = 1;
+
+ if (!filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (rom_type == 0) {
+ if (type == 0) {
fprintf(stderr, "E: You need to specify a valid -t/--type.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (cbfs_get_entry(&image, name)) {
+ fprintf(stderr, "E: '%s' already in ROM image.\n", name);
return 1;
}
- cbfsfile = create_cbfs_file(rom_name, filedata, &filesize,
- rom_type, &rom_baseaddress);
- free(filedata);
-
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding file '%s' failed.\n", rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (buffer_from_file(&buffer, filename) != 0) {
+ fprintf(stderr, "E: Could not load file '%s'.\n", filename);
+ cbfs_image_delete(&image);
return 1;
}
- free(cbfsfile);
- free(rom);
- return 0;
-}
+ do {
+ if (convert && convert(&buffer) != 0) {
+ fprintf(stderr, "E: Failed to parse file '%s'.\n",
+ filename);
+ break;
+ }
+ if (cbfs_add_entry(&image, &buffer, name, type, offset) != 0)
+ break;
+ if (cbfs_image_write_file(&image, cbfs_name) != 0)
+ break;
-static int cbfs_add_payload(void)
-{
- int32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
+ result = 0;
+ } while (0);
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ return result;
+}
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
+static int cbfs_convert_mkstage(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_stage(buffer->data, &output, param.algo,
+ param.base_address);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
- }
+static int cbfs_convert_elf_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_payload(buffer->data, &output,
+ param.algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
- return 1;
- }
+static int cbfs_convert_flat_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result;
+ result = parse_flat_binary_to_payload(buffer->data, &output,
+ buffer->size,
+ param.load_address,
+ param.entrypoint,
+ param.algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- filesize = parse_elf_to_payload(filedata, &payload, rom_algo);
- if (filesize <= 0) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(rom);
- return 1;
- }
+static int cbfstool_add(void)
+{
+ return cbfstool_add_file(param.cbfs_name,
+ param.filename,
+ param.name,
+ param.type,
+ param.base_address,
+ NULL);
+}
- cbfsfile = create_cbfs_file(rom_name, payload, &filesize,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
- free(filedata);
- free(payload);
+static int cbfstool_add_payload(void)
+{
+ return cbfstool_add_file(param.cbfs_name,
+ param.filename,
+ param.name,
+ CBFS_COMPONENT_PAYLOAD,
+ param.base_address,
+ cbfs_convert_elf_mkpayload);
+}
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+static int cbfstool_add_stage(void)
+{
+ return cbfstool_add_file(param.cbfs_name,
+ param.filename,
+ param.name,
+ CBFS_COMPONENT_STAGE,
+ param.base_address,
+ cbfs_convert_mkstage);
+}
+
+static int cbfstool_add_flat_binary(void)
+{
+ if (param.load_address == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-l/--load-address.\n");
return 1;
}
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (param.entrypoint == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-e/--entry-point.\n");
return 1;
}
-
- free(cbfsfile);
- free(rom);
- return 0;
+ return cbfstool_add_file(param.cbfs_name,
+ param.filename,
+ param.name,
+ CBFS_COMPONENT_PAYLOAD,
+ param.base_address,
+ cbfs_convert_flat_mkpayload);
}
-static int cbfs_add_stage(void)
+static int cbfstool_remove(void)
{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *stage;
+ int result = 1;
+ struct cbfs_image image;
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
-
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
- return 1;
- }
-
- filesize = parse_elf_to_stage(filedata, &stage, rom_algo, &rom_baseaddress);
-
- cbfsfile = create_cbfs_file(rom_name, stage, &filesize,
- CBFS_COMPONENT_STAGE, &rom_baseaddress);
-
- free(filedata);
- free(stage);
-
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding stage '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
- return 1;
- }
+ do {
+ if (cbfs_remove_entry(&image, param.name) != 0) {
+ fprintf(stderr, "E: Removing file '%s' failed.\n",
+ param.name);
+ break;
+ }
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0)
+ break;
+ result = 0;
+ } while (0);
- free(cbfsfile);
- free(rom);
- return 0;
+ cbfs_image_delete(&image);
+ return result;
}
-static int cbfs_add_flat_binary(void)
+static int cbfstool_create(void)
{
- uint32_t filesize = 0;
- uint32_t final_size;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
- comp_func_ptr compress;
- struct cbfs_payload_segment *segs;
- int doffset, len = 0;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+ struct cbfs_image image;
+ struct buffer bootblock;
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
-
- if (rom_loadaddress == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-l/--load-address.\n");
- return 1;
- }
-
- if (rom_entrypoint == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-e/--entry-point.\n");
+ if (param.size == 0) {
+ fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
return 1;
}
- compress = compression_function(rom_algo);
- if (!compress)
- return 1;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ if (!param.bootblock_file) {
+ fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (buffer_from_file(&bootblock, param.bootblock_file) != 0) {
return 1;
}
- /* FIXME compressed file size might be bigger than original file */
- payload = calloc((2 * sizeof(struct cbfs_payload_segment)) + filesize, 1);
- if (payload == NULL) {
- fprintf(stderr, "E: Could not allocate memory.\n");
- free(filedata);
- free(rom);
- return 1;
+ // Setup default boot offset and header offset.
+ if (!param.base_address_assigned) {
+ // put boot block before end of ROM.
+ param.base_address = param.size - bootblock.size;
+ DEBUG("bootblock in end of ROM.\n");
}
-
- segs = (struct cbfs_payload_segment *)payload;
- doffset = (2 * sizeof(struct cbfs_payload_segment));
-
- /* Prepare code segment */
- segs[0].type = PAYLOAD_SEGMENT_CODE;
- segs[0].load_addr = (uint64_t)htonll(rom_loadaddress);
- segs[0].mem_len = (uint32_t)htonl(filesize);
- segs[0].offset = (uint32_t)htonl(doffset);
-
- compress(filedata, filesize, (char *)(payload + doffset), &len);
- segs[0].compression = htonl(rom_algo);
- segs[0].len = htonl(len);
-
- if ((unsigned int)len >= filesize) {
- segs[0].compression = 0;
- segs[0].len = htonl(filesize);
- memcpy((char *)(payload + doffset), filedata, filesize);
+ if (!param.header_offset_assigned) {
+ // Put header before bootblock, and make a reference in end of
+ // bootblock.
+ param.header_offset = (
+ param.base_address -
+ sizeof(struct cbfs_header));
+ if (bootblock.size >= sizeof(uint32_t)) {
+ // TODO this only works for 32b top-aligned system now...
+ uint32_t ptr = param.header_offset - param.size;
+ uint32_t *sig = (uint32_t*)(bootblock.data +
+ bootblock.size -
+ sizeof(ptr));
+ *sig = ptr;
+ DEBUG("CBFS header reference in end of bootblock.\n");
+ }
}
- /* prepare entry point segment */
- segs[1].type = PAYLOAD_SEGMENT_ENTRY;
- segs[1].load_addr = (uint64_t)htonll(rom_entrypoint);
-
- final_size = doffset + ntohl(segs[0].len);
- cbfsfile =
- create_cbfs_file(rom_name, payload, &final_size,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
-
- free(filedata);
- free(payload);
-
- if (add_file_to_cbfs(cbfsfile, final_size, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_create(&image,
+ param.size,
+ param.alignment,
+ &bootblock,
+ param.base_address,
+ param.header_offset,
+ param.offset) != 0) {
+ fprintf(stderr, "E: Failed to create %s.\n", param.cbfs_name);
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to write %s.\n", param.cbfs_name);
return 1;
}
-
- free(cbfsfile);
- free(rom);
+ cbfs_image_delete(&image);
return 0;
+
}
-static int cbfs_remove(void)
+static int cbfstool_locate_stage(void)
{
- void *rom;
-
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
- }
+ struct cbfs_image image;
+ struct buffer buffer;
+ int32_t address;
- if (remove_file_from_cbfs(rom_name)) {
- fprintf(stderr, "E: Removing file '%s' failed.\n",
- rom_name);
- free(rom);
+ if (!param.filename) {
+ fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
- free(rom);
+ if (!param.name) {
+ fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- free(rom);
- return 0;
-}
-
-static int cbfs_create(void)
-{
- if (rom_size == 0) {
- fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to load %s.\n", param.cbfs_name);
return 1;
}
- if (!rom_bootblock) {
- fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
+ if (buffer_from_file(&buffer, param.filename) != 0) {
+ fprintf(stderr, "E: Cannot load %s.\n", param.filename);
+ cbfs_image_delete(&image);
return 1;
}
- if (arch == CBFS_ARCHITECTURE_UNKNOWN) {
- fprintf(stderr, "E: You need to specify -m/--machine arch\n");
+ if (cbfs_get_entry(&image, param.name)) {
+ fprintf(stderr, "E: '%s' already in CBFS.\n", param.name);
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
- return create_cbfs_image(cbfs_name, rom_size, rom_bootblock,
- rom_alignment, rom_offset);
-}
-
-static int cbfs_locate(void)
-{
- uint32_t filesize, location;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
+ address = cbfs_locate_stage(&image, param.name, buffer.size,
+ param.alignment);
+ if (address == -1) {
+ fprintf(stderr, "E: '%s' can't fit in CBFS for align 0x%x.\n",
+ param.name, param.alignment);
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
+ if (param.top_aligned) {
+ address = address - ntohl(image.header->romsize);
}
- filesize = getfilesize(rom_filename);
-
- location = cbfs_find_location(cbfs_name, filesize,
- rom_name, rom_alignment);
-
- printf("%x\n", location);
- return location == 0 ? 1 : 0;
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ printf("0x%x\n", address);
+ return 0;
}
-static int cbfs_print(void)
+static int cbfstool_print(void)
{
- void *rom;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ struct cbfs_image image;
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
-
- print_cbfs_directory(cbfs_name);
-
- free(rom);
+ cbfs_print_directory(&image);
+ cbfs_image_delete(&image);
return 0;
}
-static int cbfs_extract(void)
+static int cbfstool_extract(void)
{
- void *rom;
- int ret;
+ int result = 0;
+ struct cbfs_image image;
- if (!rom_filename) {
+ if (!param.filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
+ param.cbfs_name);
+ result = 1;
+ } else if (cbfs_export_entry(&image, param.name,
+ param.filename) != 0) {
+ result = 1;
}
- ret = extract_file_from_cbfs(cbfs_name, rom_name, rom_filename);
-
- free(rom);
- return ret;
+ cbfs_image_delete(&image);
+ return result;
}
static const struct command commands[] = {
- {"add", "f:n:t:b:h?", cbfs_add},
- {"add-payload", "f:n:t:c:b:h?", cbfs_add_payload},
- {"add-stage", "f:n:t:c:b:h?", cbfs_add_stage},
- {"add-flat-binary", "f:n:l:e:c:b:h?", cbfs_add_flat_binary},
- {"remove", "n:h?", cbfs_remove},
- {"create", "s:B:a:o:m:h?", cbfs_create},
- {"locate", "f:n:a:h?", cbfs_locate},
- {"print", "h?", cbfs_print},
- {"extract", "n:f:h?", cbfs_extract},
+ {"add", "vf:n:t:b:h?", cbfstool_add},
+ {"add-payload", "vf:n:t:c:b:h?", cbfstool_add_payload},
+ {"add-stage", "vf:n:t:c:b:h?", cbfstool_add_stage},
+ {"add-flat-binary", "vf:n:l:e:c:b:h?", cbfstool_add_flat_binary},
+ {"remove", "vn:h?", cbfstool_remove},
+ {"create", "vs:B:b:H:a:o:m:h?", cbfstool_create},
+ {"locate-stage", "vTf:n:a:h?", cbfstool_locate_stage},
+ {"print", "vh?", cbfstool_print},
+ {"extract", "vn:f:h?", cbfstool_extract},
};
static struct option long_options[] = {
@@ -477,10 +427,12 @@ static struct option long_options[] = {
{"entry-point", required_argument, 0, 'e' },
{"size", required_argument, 0, 's' },
{"bootblock", required_argument, 0, 'B' },
+ {"header-offset",required_argument, 0, 'H' },
{"alignment", required_argument, 0, 'a' },
{"offset", required_argument, 0, 'o' },
{"file", required_argument, 0, 'f' },
{"arch", required_argument, 0, 'm' },
+ {"top-aligned", no_argument, 0, 'T' },
{"verbose", no_argument, 0, 'v' },
{"help", no_argument, 0, 'h' },
{NULL, 0, 0, 0 }
@@ -491,10 +443,12 @@ static void usage(char *name)
printf
("cbfstool: Management utility for CBFS formatted ROM images\n\n"
"USAGE:\n" " %s [-h]\n"
- " %s FILE COMMAND [PARAMETERS]...\n\n" "OPTIONs:\n"
- " -h Display this help message\n\n"
+ " %s FILE COMMAND [-v] [PARAMETERS]...\n\n" "OPTIONs:\n"
+ " -h Display this help message\n\n"
+ " -T Display top-aligned address instead of offset\n"
+ " -v Verbose output\n"
"COMMANDs:\n"
- " add -f FILE -n NAME -t TYPE [-b base-address] "
+ " add -f FILE -n NAME -t TYPE [-b base] "
"Add a component\n"
" add-payload -f FILE -n NAME [-c compression] [-b base] "
"Add a payload to the ROM\n"
@@ -505,10 +459,11 @@ static void usage(char *name)
"Add a 32bit flat mode binary\n"
" remove -n NAME "
"Remove a component\n"
- " create -s size -B bootblock -m ARCH [-a align] [-o offset] "
+ " create -s size -B bootblock [-b base] [-a align] \\\n"
+ " [-o offset] [-H header-offset] "
"Create a ROM file\n"
- " locate -f FILE -n NAME -a align "
- "Find a place for a file of that size\n"
+ " locate-stage -f FILE -n NAME [-T] "
+ "Find the entry if the stage component is added\n"
" print "
"Show the contents of the ROM\n"
" extract -n NAME -f FILE "
@@ -518,34 +473,26 @@ static void usage(char *name)
" armv7, x86\n"
"TYPEs:\n", name, name
);
- print_supported_filetypes();
-}
-
-/* Small, OS/libc independent runtime check for endianess */
-int host_bigendian = 0;
-
-static void which_endian(void)
-{
- static const uint32_t inttest = 0x12345678;
- uint8_t inttest_lsb = *(uint8_t *)&inttest;
- if (inttest_lsb == 0x12) {
- host_bigendian = 1;
- }
+ print_all_cbfs_entry_types();
}
int main(int argc, char **argv)
{
size_t i;
int c;
+ if (verbose > 1) {
+ LOG("[CBFS] ");
+ for (i = 0; i < argc; i++)
+ LOG("%s ", argv[i]);
+ LOG("\n");
+ }
if (argc < 3) {
usage(argv[0]);
return 1;
}
- which_endian();
-
- cbfs_name = argv[1];
+ param.cbfs_name = argv[1];
char *cmd = argv[2];
optind += 2;
@@ -572,61 +519,72 @@ int main(int argc, char **argv)
switch(c) {
case 'n':
- rom_name = optarg;
+ param.name = optarg;
break;
case 't':
- if (intfiletype(optarg) != ((uint64_t) - 1))
- rom_type = intfiletype(optarg);
- else
- rom_type = strtoul(optarg, NULL, 0);
- if (rom_type == 0)
+ // zero should be reserved for types.
+ param.type = get_cbfs_entry_type(
+ optarg,
+ strtoul(optarg, NULL, 0));
+ if (param.type == 0)
printf("W: Unknown type '%s' ignored\n",
- optarg);
+ optarg);
break;
case 'c':
- if (!strncasecmp(optarg, "lzma", 5))
- rom_algo = CBFS_COMPRESS_LZMA;
- else if (!strncasecmp(optarg, "none", 5))
- rom_algo = CBFS_COMPRESS_NONE;
- else
+ param.algo = get_cbfs_compression(
+ optarg, -1);
+ if (param.algo == -1) {
printf("W: Unknown compression '%s'"
- " ignored.\n", optarg);
+ " ignored.\n", optarg);
+ param.algo = 0;
+ }
break;
case 'b':
- rom_baseaddress = strtoul(optarg, NULL, 0);
+ // base_address may be zero on non-x86, so we
+ // need an explicit "base_address_assigned".
+ param.base_address = strtoul(optarg, NULL, 0);
+ param.base_address_assigned = 1;
break;
case 'l':
- rom_loadaddress = strtoul(optarg, NULL, 0);
+ param.load_address = strtoul(optarg, NULL, 0);
break;
case 'e':
- rom_entrypoint = strtoul(optarg, NULL, 0);
+ param.entrypoint = strtoul(optarg, NULL, 0);
break;
case 's':
- rom_size = strtoul(optarg, &suffix, 0);
+ param.size = strtoul(optarg, &suffix, 0);
if (tolower(suffix[0])=='k') {
- rom_size *= 1024;
+ param.size *= 1024;
}
if (tolower(suffix[0])=='m') {
- rom_size *= 1024 * 1024;
+ param.size *= 1024 * 1024;
}
case 'B':
- rom_bootblock = optarg;
+ param.bootblock_file = optarg;
+ break;
+ case 'H':
+ param.header_offset = strtoul(
+ optarg, NULL, 0);
+ param.header_offset_assigned = 1;
break;
case 'a':
- rom_alignment = strtoul(optarg, NULL, 0);
+ param.alignment = strtoul(optarg, NULL, 0);
break;
case 'o':
- rom_offset = strtoul(optarg, NULL, 0);
+ param.offset = strtoul(optarg, NULL, 0);
break;
case 'f':
- rom_filename = optarg;
+ param.filename = optarg;
+ break;
+ case 'T':
+ param.top_aligned = 1;
break;
case 'v':
verbose++;
break;
case 'm':
- arch = string_to_arch(optarg);
+ INFO("Architecture (-m) is deprecated.\n");
break;
case 'h':
case '?':
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 97bf168..57f22d3 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,767 +20,879 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <assert.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <libgen.h>
+
#include "common.h"
-#include "cbfs.h"
#include "elf.h"
-#define dprintf(x...)
+/* Utilities */
-size_t getfilesize(const char *filename)
+/* Small, OS/libc independent runtime check for endianess */
+int is_big_endian(void)
{
- size_t size;
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return -1;
+ static const uint32_t inttest = 0x12345678;
+ uint8_t inttest_lsb = *(uint8_t *)&inttest;
+ if (inttest_lsb == 0x12) {
+ return 1;
+ }
+ return 0;
+}
- fseek(file, 0, SEEK_END);
- size = ftell(file);
- fclose(file);
- return size;
+uint32_t align_up(uint32_t value, uint32_t align) {
+ if (value % align)
+ value += align - (value % align);
+ return value;
}
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place)
-{
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return NULL;
-
- fseek(file, 0, SEEK_END);
- *romsize_p = ftell(file);
- fseek(file, 0, SEEK_SET);
- if (!content) {
- content = malloc(*romsize_p);
- if (!content) {
- fprintf(stderr, "E: Could not get %d bytes for file %s\n",
- *romsize_p, filename);
- exit(1);
- }
- } else if (place == SEEK_END)
- content -= *romsize_p;
+/* Buffer and file I/O */
+
+int buffer_create(struct buffer *buffer, size_t size, const char *name) {
+ buffer->name = strdup(name);
+ buffer->size = size;
+ buffer->data = (char*)malloc(buffer->size);
+ return (buffer->data == NULL);
+}
+
+int buffer_from_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "rb");
+ if (!fp) {
+ perror(filename);
+ return -1;
+ }
+ fseek(fp, 0, SEEK_END);
+ buffer->size = ftell(fp);
+ buffer->name = strdup(filename);
+ rewind(fp);
+ buffer->data = (char*)malloc(buffer->size);
+ assert(buffer->data);
+ if (fread(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete read: %s\n", filename);
+ fclose(fp);
+ return -1;
+ }
+ fclose(fp);
+ return 0;
+}
+
+int buffer_write_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "wb");
+ if (!fp) {
+ perror(filename);
+ return -1;
+ }
+ assert(buffer && buffer->data);
+ if (fwrite(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete write: %s\n", filename);
+ fclose(fp);
+ return -1;
+ }
+ fclose(fp);
+ return 0;
+}
- if (!fread(content, *romsize_p, 1, file)) {
- fprintf(stderr, "E: Failed to read %s\n", filename);
- return NULL;
+int buffer_delete(struct buffer *buffer) {
+ assert(buffer);
+ if (buffer->name) {
+ free(buffer->name);
+ buffer->name = NULL;
}
- fclose(file);
- return content;
+ if (buffer->data) {
+ free(buffer->data);
+ buffer->data = NULL;
+ }
+ buffer->size = 0;
+ return 0;
}
-static struct cbfs_header *master_header;
-static uint32_t phys_start, phys_end, align;
-uint32_t romsize;
-void *offset;
-uint32_t arch = CBFS_ARCHITECTURE_UNKNOWN;
+/* Type and format */
+
+int is_elf_object(const void *input) {
+ Elf32_Ehdr *ehdr = (Elf32_Ehdr *)input;
+ return !memcmp(ehdr->e_ident, ELFMAG, 4);
+}
-static struct {
- uint32_t arch;
+struct typedesc_t {
+ uint32_t type;
const char *name;
-} arch_names[] = {
- { CBFS_ARCHITECTURE_ARMV7, "armv7" },
- { CBFS_ARCHITECTURE_X86, "x86" },
- { CBFS_ARCHITECTURE_UNKNOWN, "unknown" }
};
-uint32_t string_to_arch(const char *arch_string)
-{
- int i;
- uint32_t ret = CBFS_ARCHITECTURE_UNKNOWN;
+static struct typedesc_t types_cbfs_entry[] = {
+ {CBFS_COMPONENT_STAGE, "stage"},
+ {CBFS_COMPONENT_PAYLOAD, "payload"},
+ {CBFS_COMPONENT_OPTIONROM, "optionrom"},
+ {CBFS_COMPONENT_BOOTSPLASH, "bootsplash"},
+ {CBFS_COMPONENT_RAW, "raw"},
+ {CBFS_COMPONENT_VSA, "vsa"},
+ {CBFS_COMPONENT_MBI, "mbi"},
+ {CBFS_COMPONENT_MICROCODE, "microcode"},
+ {CBFS_COMPONENT_CMOS_DEFAULT, "cmos_default"},
+ {CBFS_COMPONENT_CMOS_LAYOUT, "cmos_layout"},
+ {CBFS_COMPONENT_DELETED, "deleted"},
+ {CBFS_COMPONENT_NULL, "null"},
+ {0, NULL},
+};
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (!strcasecmp(arch_string, arch_names[i].name)) {
- ret = arch_names[i].arch;
- break;
- }
- }
+static struct typedesc_t types_cbfs_compression[] = {
+ {CBFS_COMPRESS_NONE, "none"},
+ {CBFS_COMPRESS_LZMA, "LZMA"},
+ {0, NULL},
+};
- return ret;
+uint32_t lookup_type_by_name(struct typedesc_t *desc, const char *name,
+ uint32_t default_value) {
+ int i;
+ for (i = 0; desc[i].name; i++)
+ if (strcmp(desc[i].name, name) == 0)
+ return desc[i].type;
+ return default_value;
}
-const char *arch_to_string(uint32_t a)
-{
+const char *lookup_name_by_type(struct typedesc_t *desc, uint32_t type,
+ const char *default_value) {
int i;
- const char *ret = NULL;
+ for (i = 0; desc[i].name; i++)
+ if (desc[i].type == type)
+ return desc[i].name;
+ return default_value;
+}
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (a == arch_names[i].arch) {
- ret = arch_names[i].name;
- break;
- }
- }
+uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value) {
+ return lookup_type_by_name(types_cbfs_entry, name, default_value);
+}
- return ret;
+const char *get_cbfs_entry_type_name(uint32_t type) {
+ return lookup_name_by_type(types_cbfs_entry, type, "(unknown)");
+}
+uint32_t get_cbfs_compression(const char *name, uint32_t unknown) {
+ return lookup_type_by_name(types_cbfs_compression, name, unknown);
}
-int find_master_header(void *romarea, size_t size)
-{
- size_t offset;
+void print_all_cbfs_entry_types(void) {
+ size_t i, total = ARRAY_SIZE(types_cbfs_entry);
- if (master_header)
- return 0;
+ for (i = 0; i < total; i++) {
+ printf(" %s%c", types_cbfs_entry[i].name,
+ (i + 1 == total) ? '\n' : ',');
+ if ((i + 1) % 8 == 0)
+ printf("\n");
+ }
+}
- for (offset = 0; offset < size - sizeof(struct cbfs_header); offset++) {
- struct cbfs_header *tmp = romarea + offset;
+/* CBFS image processing */
- if (tmp->magic == ntohl(CBFS_HEADER_MAGIC)) {
- master_header = tmp;
- break;
- }
- }
+/* The file name align is not defined in CBFS spec -- only a preference by
+ * (old) cbfstool. */
+#define CBFS_FILENAME_ALIGN (16)
- return master_header ? 0 : 1;
-}
+/* To make CBFS more friendly to ROM, fill -1 (0xFF) instead of zero. */
+#define CBFS_CONTENT_DEFAULT_VALUE (-1)
-void recalculate_rom_geometry(void *romarea)
+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)
{
- if (find_master_header(romarea, romsize)) {
- fprintf(stderr, "E: Cannot find master header\n");
- exit(1);
- }
+ struct cbfs_header *header;
+ struct cbfs_file *entry;
+ uint32_t cbfs_len;
- /* Update old headers */
- if (master_header->version == CBFS_HEADER_VERSION1 &&
- ntohl(master_header->architecture) == CBFS_ARCHITECTURE_UNKNOWN) {
- dprintf("Updating CBFS master header to version 2\n");
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
+ DEBUG("cbfs_create_image: bootblock=0x%x+0x%zx, "
+ "header=0x%x+0x%zx, entries_offset=0x%x\n",
+ bootblock_offset, bootblock->size,
+ header_offset, sizeof(*header), entries_offset);
+
+ if (buffer_create(&image->buffer, size, "(new)") != 0) {
+ ERROR("Cannot allocate memory for %zd bytes.\n", size);
+ return -1;
}
+ image->header = NULL;
+ memset(image->buffer.data, CBFS_CONTENT_DEFAULT_VALUE, size);
- arch = ntohl(master_header->architecture);
+ // Adjust legcay top-aligned address to ROM offset.
+ if (IS_TOP_ALIGNED_ADDRESS(entries_offset))
+ entries_offset += (int32_t)size;
+ if (IS_TOP_ALIGNED_ADDRESS(bootblock_offset))
+ bootblock_offset += (int32_t)size;
+ if (IS_TOP_ALIGNED_ADDRESS(header_offset))
+ header_offset += (int32_t) size;
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- offset = romarea;
- phys_start = (0 + ntohl(master_header->offset)) & 0xffffffff;
- phys_end = romsize & 0xffffffff;
- break;
- case CBFS_ARCHITECTURE_X86:
- offset = romarea + romsize - 0x100000000ULL;
- phys_start = (0 - romsize + ntohl(master_header->offset)) &
- 0xffffffff;
- phys_end = (0 - ntohl(master_header->bootblocksize) -
- sizeof(struct cbfs_header)) & 0xffffffff;
- break;
- default:
- fprintf(stderr, "E: Unknown architecture\n");
- exit(1);
+ DEBUG("cbfs_create_image: (real offset) bootblock=0x%x, "
+ "header=0x%x, entries_offset=0x%x\n",
+ bootblock_offset, header_offset, entries_offset);
+
+ if (align == 0)
+ align = 64; // default align size.
+
+ // Prepare bootblock
+ if (bootblock_offset + bootblock->size > size) {
+ ERROR("Bootblock (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ bootblock_offset, bootblock->size, size);
+ return -1;
}
+ memcpy(image->buffer.data + bootblock_offset, bootblock->data,
+ bootblock->size);
- align = ntohl(master_header->align);
+ // Prepare header
+ if (header_offset + sizeof(*header) > size) {
+ ERROR("Header (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ header_offset, sizeof(*header), size);
+ return -1;
+ }
+ header = (struct cbfs_header*)(image->buffer.data + header_offset);
+ image->header = header;
+ header->magic = htonl(CBFS_HEADER_MAGIC);
+ header->version = htonl(CBFS_HEADER_VERSION);
+ header->romsize = htonl(size);
+ header->bootblocksize = htonl(bootblock->size);
+ header->align = htonl(align);
+ header->offset = htonl(entries_offset);
+
+ // Prepare entries
+ if (align_up(entries_offset, align) != entries_offset) {
+ ERROR("Offset (0x%x) must be aligned to 0x%x.\n",
+ entries_offset, align);
+ return -1;
+ }
+ if (entries_offset + sizeof(*entry) > size) {
+ ERROR("Offset (0x%x+0x%zx) exceed ROM size(0x%zx)\n",
+ entries_offset, sizeof(*entry), size);
+ return -1;
+ }
+ entry = (struct cbfs_file*)(image->buffer.data + entries_offset);
+ // To calculate available length, find
+ // e = min(bootblock, header, size) where e > entries_offset.
+ cbfs_len = size;
+ if (bootblock_offset > entries_offset && bootblock_offset < cbfs_len)
+ cbfs_len = bootblock_offset;
+ if (header_offset > entries_offset && header_offset < cbfs_len)
+ cbfs_len = header_offset;
+ cbfs_len -= entries_offset + align;
+ cbfs_create_entry(image, entry, cbfs_len, "");
+ LOG("Created CBFS image (capacity = %d bytes)\n", cbfs_len);
+ return 0;
}
-void *loadrom(const char *filename)
-{
- void *romarea = loadfile(filename, &romsize, 0, SEEK_SET);
- if (romarea == NULL)
- return NULL;
- recalculate_rom_geometry(romarea);
- return romarea;
-}
+static int cbfs_fix_legacy_size(struct cbfs_image *image) {
+ // A bug in old CBFStool may produce extra few bytes (by alignment) and
+ // cause cbfstool to overwrite things after free space -- which is
+ // usually CBFS header on x86. We need to workaround that.
-int writerom(const char *filename, void *start, uint32_t size)
-{
- FILE *file = fopen(filename, "wb");
- if (!file) {
- fprintf(stderr, "Could not open '%s' for writing: ", filename);
- perror("");
- return 1;
+ struct cbfs_file *entry, *first = NULL, *last = NULL;
+ for (first = entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ last = entry;
+ }
+ if ((char*)first < (char*)image->header &&
+ (char*)entry > (char*)image->header) {
+ WARN("CBFS image was created with old cbfstool with size bug. "
+ "Fixing size in last entry...\n");
+ last->len = htonl(ntohl(last->len) -
+ ntohl(image->header->align));
+ DEBUG("Last entry has been changed from 0x%x to 0x%x.\n",
+ cbfs_get_entry_addr(image, entry),
+ cbfs_get_entry_addr(image,
+ cbfs_find_next_entry(image, last)));
}
+ return 0;
+}
- if (fwrite(start, size, 1, file) != 1) {
- fprintf(stderr, "Could not write to '%s': ", filename);
- perror("");
- return 1;
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename) {
+ if (buffer_from_file(&image->buffer, filename) != 0)
+ return -1;
+ DEBUG("read_cbfs_image: %s (%zd bytes)\n", image->buffer.name,
+ image->buffer.size);
+ image->header = cbfs_find_header(image->buffer.data,
+ image->buffer.size);
+ if (!image->header) {
+ ERROR("%s does not have CBFS master header.\n", filename);
+ cbfs_image_delete(image);
+ return -1;
}
- fclose(file);
+ cbfs_fix_legacy_size(image);
return 0;
}
-int cbfs_file_header(unsigned long physaddr)
-{
- /* maybe improve this test */
- return (strncmp(phys_to_virt(physaddr), "LARCHIVE", 8) == 0);
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename) {
+ assert(image && image->buffer.data);
+ return buffer_write_file(&image->buffer, filename);
}
-struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size)
-{
- struct cbfs_file *nextfile = (struct cbfs_file *)phys_to_virt(physaddr);
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(size);
- nextfile->type = htonl(0xffffffff);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(sizeof(struct cbfs_file) + 16);
- memset(((void *)nextfile) + sizeof(struct cbfs_file), 0, 16);
- return nextfile;
+int cbfs_image_delete(struct cbfs_image *image) {
+ buffer_delete(&image->buffer);
+ image->header = NULL;
+ return 0;
}
-int iself(unsigned char *input)
-{
- Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
- return !memcmp(ehdr->e_ident, ELFMAG, 4);
+/* Splits an empty entry at given offset. */
+int cbfs_split_empty_entry(struct cbfs_image *image,
+ struct cbfs_file *entry,
+ uint32_t offset) {
+ struct cbfs_file *next = cbfs_find_next_entry(image, entry);
+ uint32_t addr = cbfs_get_entry_addr(image, entry),
+ addr_next = cbfs_get_entry_addr(image, next);
+ size_t min_entry_size = sizeof(*entry) + CBFS_FILENAME_ALIGN;
+ size_t len;
+
+ assert(addr < offset && addr_next <= offset);
+ if (offset - addr < min_entry_size) {
+ ERROR("No space between previous entry 0x%x and offset 0x%x.\n",
+ addr, offset);
+ return -1;
+ }
+ if (addr_next - offset < min_entry_size) {
+ ERROR("No space between offset 0x%x and entry 0x%x\n",
+ offset, addr_next);
+ return -1;
+ }
+ cbfs_create_entry(image, entry, 0, "");
+ len = offset - addr - ntohl(entry->offset);
+ entry->len = htonl(len);
+ if (verbose > 1)
+ cbfs_print_entry_info(image, entry, stderr);
+
+ entry = cbfs_find_next_entry(image, entry);
+ addr = cbfs_get_entry_addr(image, entry);
+ cbfs_create_entry(image, entry, 0, "");
+ len = addr_next - offset - ntohl(entry->offset);
+ entry->len = htonl(len);
+ if (verbose > 1)
+ cbfs_print_entry_info(image, entry, stderr);
+ assert(cbfs_get_entry_addr(image, cbfs_find_next_entry(image, entry)) ==
+ addr_next);
+ return 0;
}
-static struct filetypes_t {
- uint32_t type;
- const char *name;
-} filetypes[] = {
- {CBFS_COMPONENT_STAGE, "stage"},
- {CBFS_COMPONENT_PAYLOAD, "payload"},
- {CBFS_COMPONENT_OPTIONROM, "optionrom"},
- {CBFS_COMPONENT_BOOTSPLASH, "bootsplash"},
- {CBFS_COMPONENT_RAW, "raw"},
- {CBFS_COMPONENT_VSA, "vsa"},
- {CBFS_COMPONENT_MBI, "mbi"},
- {CBFS_COMPONENT_MICROCODE, "microcode"},
- {CBFS_COMPONENT_CMOS_DEFAULT, "cmos default"},
- {CBFS_COMPONENT_CMOS_LAYOUT, "cmos layout"},
- {CBFS_COMPONENT_DELETED, "deleted"},
- {CBFS_COMPONENT_NULL, "null"}
-};
-
-void print_supported_filetypes(void)
-{
- int i, number = ARRAY_SIZE(filetypes);
-
- for (i=0; i<number; i++) {
- printf(" %s%c", filetypes[i].name, (i==(number-1))?'\n':',');
- if ((i%8) == 7)
- printf("\n");
+int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer,
+ const char *name, uint32_t type, uint32_t offset) {
+ uint32_t entry_type, entry_capacity;
+ uint32_t addr;
+ struct cbfs_file *entry, *next;
+ uint32_t need_size, new_size;
+
+ need_size = (sizeof(*entry) + buffer->size +
+ align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN));
+ DEBUG("cbfs_add_entry('%s', %zd) => need_size = %u\n",
+ name, buffer->size, need_size);
+
+ // Check if offset is valid.
+ if (offset) {
+ uint32_t align = ntohl(image->header->align),
+ romsize = ntohl(image->header->romsize);
+ // legacy cbfstool takes top-aligned address.
+ if (IS_TOP_ALIGNED_ADDRESS(offset)) {
+ INFO("Converting top-aligned address 0x%x to offset: "
+ " 0x%x\n", offset, offset - romsize);
+ offset += romsize;
+ }
+ if (type == CBFS_COMPONENT_STAGE && offset % align) {
+ INFO("Got address from locate-stage.\n");
+ offset -= sizeof(*entry) + sizeof(struct cbfs_stage) +
+ align_up(strlen(name) + 1,
+ CBFS_FILENAME_ALIGN);
+ }
+ if (offset % align != 0) {
+ ERROR("Target address (0x%x) is not aligned to CBFS "
+ "image align (0x%x). It's impossible to add entry "
+ "in that location.\n", offset, align);
+ return -1;
+ }
}
-}
-const char *strfiletype(uint32_t number)
-{
- size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (filetypes[i].type == number)
- return filetypes[i].name;
- return "unknown";
-}
+ // Merge empty entries.
+ DEBUG("(trying to merge empty entries...)\n");
+ cbfs_walk(image, cbfs_merge_empty_entry, NULL);
-uint64_t intfiletype(const char *name)
-{
- size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (strcmp(filetypes[i].name, name) == 0)
- return filetypes[i].type;
- return -1;
-}
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
-void print_cbfs_directory(const char *filename)
-{
- printf
- ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n"
- "alignment: %d bytes, architecture: %s\n\n",
- basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize),
- romsize, ntohl(master_header->offset), align, arch_to_string(arch));
- printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
+ entry_type = ntohl(entry->type);
+ if (entry_type != CBFS_COMPONENT_NULL)
continue;
- }
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
- if (strlen(fname) == 0)
- fname = "(empty)";
-
- printf("%-30s 0x%-8x %-12s %d\n", fname,
- current - phys_start + ntohl(master_header->offset),
- strfiletype(ntohl(thisfile->type)), length);
-
- /* note the components of the subheader are in host order ... */
- switch (ntohl(thisfile->type)) {
- case CBFS_COMPONENT_STAGE:
- {
- struct cbfs_stage *stage = CBFS_SUBHEADER(thisfile);
- dprintf(" %s compression, entry: 0x%llx, load: 0x%llx, length: %d/%d\n",
- stage->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- (unsigned long long)stage->entry,
- (unsigned long long)stage->load,
- stage->len,
- stage->memlen);
- break;
- }
- case CBFS_COMPONENT_PAYLOAD:
- {
- struct cbfs_payload_segment *payload = CBFS_SUBHEADER(thisfile);
- while(payload) {
- switch(payload->type) {
- case PAYLOAD_SEGMENT_CODE:
- case PAYLOAD_SEGMENT_DATA:
- dprintf(" %s (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d)\n",
- payload->type == PAYLOAD_SEGMENT_CODE ? "code " : "data" ,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len), ntohl(payload->mem_len));
- break;
- case PAYLOAD_SEGMENT_ENTRY:
- dprintf(" entry (0x%llx)\n", (unsigned long long)ntohll(payload->load_addr));
- break;
- case PAYLOAD_SEGMENT_BSS:
- dprintf(" BSS (address 0x%016llx, length 0x%x)\n", (unsigned long long)ntohll(payload->load_addr), ntohl(payload->len));
- break;
- case PAYLOAD_SEGMENT_PARAMS:
- dprintf(" parameters\n");
- break;
- default:
- dprintf(" %x (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d\n",
- payload->type,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len),
- ntohl(payload->mem_len));
- break;
- }
- if(payload->type == PAYLOAD_SEGMENT_ENTRY)
- payload=NULL;
- else
- payload++;
- }
- break;
- }
- default:
- break;
+ addr = cbfs_get_entry_addr(image, entry);
+ if (offset && addr > offset) {
+ ERROR("Not available to add component in 0x%x.\n",
+ offset);
+ return -1;
}
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
- }
-}
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath)
-{
- FILE *outfile = NULL;
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
+ next = cbfs_find_next_entry(image, entry);
+ entry_capacity = cbfs_get_entry_addr(image, next) - addr;
+ if (offset && (addr + entry_capacity) <= offset) {
+ DEBUG("Skip entry 0x%x before specified offset 0x%x.\n",
+ addr, offset);
continue;
}
- // Locate the file start struct
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- // And its length
- uint32_t length = ntohl(thisfile->len);
- // Locate the file name
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
-
- // It's not the file we are looking for..
- if (strcmp(fname, payloadname) != 0)
- {
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
+ DEBUG("cbfs_add_entry: space %s at 0x%x, %d bytes\n",
+ get_cbfs_entry_type_name(entry_type), addr,
+ entry_capacity);
+ if (entry_capacity < need_size)
continue;
- }
- // Else, it's our file.
- printf("Found file %.30s at 0x%x, type %.12s, size %d\n", fname,
- current - phys_start, strfiletype(ntohl(thisfile->type)),
- length);
-
- // If we are not dumping to stdout, open the out file.
- outfile = fopen(outpath, "wb");
- if (!outfile)
- {
- fprintf(stderr, "E: Could not open the file %s for writing.\n", outpath);
- return 1;
+ // Should we create an empty partition before target offset?
+ if (offset && addr != offset) {
+ DEBUG("Split empty entry at 0x%x\n", addr);
+ if (cbfs_split_empty_entry(image, entry, offset) != 0) {
+ ERROR("Can't split empty entry for 0x%x\n",
+ offset);
+ return -1;
+ }
+ assert(cbfs_get_entry_addr(
+ image,
+ cbfs_find_next_entry(image, entry)) ==
+ addr);
+ continue;
}
- if (ntohl(thisfile->type) != CBFS_COMPONENT_RAW)
- {
- fprintf(stderr, "W: Only 'raw' files are safe to extract.\n");
- }
+ DEBUG("Filling new entry data (%zd bytes).\n", buffer->size);
+ cbfs_create_entry(image, entry, buffer->size, name);
+ entry->type = htonl(type);
+ memcpy(CBFS_SUBHEADER(entry), buffer->data, buffer->size);
+ if (verbose)
+ cbfs_print_entry_info(image, entry, stderr);
+
+ // setup new entry
+ DEBUG("Seting new empty entry.\n");
+ entry = cbfs_find_next_entry(image, entry);
+ new_size = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ new_size -= sizeof(*entry) + CBFS_FILENAME_ALIGN;
+ DEBUG("new size: %d\n", new_size);
+ cbfs_create_entry(image, entry, new_size, "");
+ if (verbose)
+ cbfs_print_entry_info(image, entry, stderr);
+ return 0;
+ }
- fwrite(((char *)thisfile)
- + ntohl(thisfile->offset), length, 1, outfile);
+ ERROR("Could not add [%s, %zd bytes (%zd KB)]; probably too big?\n",
+ buffer->name, buffer->size, buffer->size / 1024);
+ return 0;
+}
- fclose(outfile);
- printf("Successfully dumped the file.\n");
+int cbfs_remove_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry, *next;
+ size_t len;
+ entry = cbfs_get_entry(image, name);
+ if (!entry) {
+ ERROR("CBFS file %s not found.\n", name);
+ return -1;
+ }
+ next = cbfs_find_next_entry(image, entry);
+ assert(next);
+ DEBUG("cbfs_remove_entry: Removed %s @ 0x%x\n",
+ CBFS_NAME(entry), cbfs_get_entry_addr(image, entry));
+ entry->type = htonl(CBFS_COMPONENT_DELETED);
+ len = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ entry->offset = htonl(sizeof(*entry) + CBFS_FILENAME_ALIGN);
+ entry->len = htonl(len - ntohl(entry->offset));
+ memset(CBFS_NAME(entry), 0, CBFS_FILENAME_ALIGN);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE,
+ ntohl(entry->len));
+ return 0;
+}
- // We'll only dump one file.
- return 0;
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ if (strcasecmp(CBFS_NAME(entry), name) == 0) {
+ DEBUG("cbfs_get_entry: found %s\n", name);
+ return entry;
+ }
}
- fprintf(stderr, "E: File %s not found.\n", payloadname);
- return 1;
+ return NULL;
}
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename) {
+ struct cbfs_file *entry = cbfs_get_entry(image, entry_name);
+ struct buffer buffer;
+ if (!entry) {
+ ERROR("File not found: %s\n", entry_name);
+ return -1;
+ }
+ LOG("Found file %.30s at 0x%x, type %.12s, size %d\n",
+ entry_name, cbfs_get_entry_addr(image, entry),
+ get_cbfs_entry_type_name(ntohl(entry->type)), ntohl(entry->len));
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location)
-{
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
-
- dprintf("at %x, %x bytes\n", current, length);
- /* Is this a free chunk? */
- if ((thisfile->type == CBFS_COMPONENT_DELETED)
- || (thisfile->type == CBFS_COMPONENT_NULL)) {
- dprintf("null||deleted at %x, %x bytes\n", current,
- length);
- /* if this is the right size, and if specified, the right location, use it */
- if ((contentsize <= length)
- && ((location == 0) || (current == location))) {
- if (contentsize < length) {
- dprintf
- ("this chunk is %x bytes, we need %x. create a new chunk at %x with %x bytes\n",
- length, contentsize,
- ALIGN(current + contentsize,
- align),
- length - contentsize);
- uint32_t start =
- ALIGN(current + contentsize, align);
- uint32_t size =
- current + ntohl(thisfile->offset)
- + length - start - 16 -
- sizeof(struct cbfs_file);
- cbfs_create_empty_file(start, size);
- }
- dprintf("copying data\n");
- memcpy(phys_to_virt(current), content,
- contentsize);
- return 0;
- }
- if (location != 0) {
- /* CBFS has the constraint that the chain always moves up in memory. so once
- we're past the place we seek, we don't need to look any further */
- if (current > location) {
- fprintf
- (stderr, "E: The requested space is not available\n");
- return 1;
- }
-
- /* Is the requested location inside the current chunk? */
- if ((current < location)
- && ((location + contentsize) <=
- (current + length))) {
- /* Split it up. In the next iteration the code will be at the right place. */
- dprintf("split up. new length: %x\n",
- location - current -
- ntohl(thisfile->offset));
- thisfile->len =
- htonl(location - current -
- ntohl(thisfile->offset));
- cbfs_create_empty_file(location,
- length -
- (location -
- current));
- }
- }
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
+ if (ntohl(entry->type) != CBFS_COMPONENT_RAW) {
+ WARN("Only 'raw' files are safe to extract.\n");
}
- fprintf(stderr, "E: Could not add the file to CBFS, it's probably too big.\n");
- fprintf(stderr, "E: File size: %d bytes (%d KB).\n", contentsize, contentsize/1024);
- return 1;
+
+ buffer.data = CBFS_SUBHEADER(entry);
+ buffer.size = ntohl(entry->len);
+ buffer.name = "(cbfs_export_entry)";
+ if (buffer_write_file(&buffer, filename) != 0) {
+ ERROR("Failed to write %s into %s.\n",
+ entry_name, filename);
+ return -1;
+ }
+ INFO("Successfully dumped the file to: %s\n", filename);
+ return 0;
}
+/* basename(3) may modify buffer, so we want a tiny alternative. */
+static const char *simple_basename(const char *name) {
+ const char *slash = strrchr(name, '/');
+ if (slash)
+ return slash + 1;
+ else
+ return name;
+}
-static struct cbfs_file *merge_adjacent_files(struct cbfs_file *first,
- struct cbfs_file *second)
-{
- uint32_t new_length =
- ntohl(first->len) + ntohl(second->len) + ntohl(second->offset);
- first->len = htonl(new_length);
- first->checksum = 0; // FIXME?
- return first;
+int cbfs_print_header_info(struct cbfs_image *image) {
+ assert(image && image->header);
+ printf("%s: %zd kB, bootblocksize %d, romsize %d, offset 0x%x\n"
+ "alignment: %d bytes\n\n",
+ simple_basename(image->buffer.name),
+ image->buffer.size / 1024,
+ ntohl(image->header->bootblocksize),
+ ntohl(image->header->romsize),
+ ntohl(image->header->offset),
+ ntohl(image->header->align));
+ return 0;
}
-static struct cbfs_file *next_file(struct cbfs_file *prev)
+static int cbfs_print_stage_info(struct cbfs_stage *stage, FILE* fp) {
+ fprintf(fp,
+ " %s compression, entry: 0x%" PRIx64 ", load: 0x%" PRIx64 ", "
+ "length: %d/%d\n",
+ lookup_name_by_type(types_cbfs_compression,
+ stage->compression, "(unknown)"),
+ stage->entry,
+ stage->load,
+ stage->len,
+ stage->memlen);
+ return 0;
+}
+
+static int cbfs_print_payload_segment_info(struct cbfs_payload_segment *payload,
+ FILE *fp)
{
- uint32_t pos = (prev == NULL) ? phys_start :
- ALIGN(virt_to_phys(prev) + ntohl(prev->len) + ntohl(prev->offset),
- align);
+ switch(payload->type) {
+ case PAYLOAD_SEGMENT_CODE:
+ case PAYLOAD_SEGMENT_DATA:
+ fprintf(fp, " %s (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d)\n",
+ (payload->type == PAYLOAD_SEGMENT_CODE ?
+ "code " : "data"),
+ lookup_name_by_type(types_cbfs_compression,
+ payload->compression,
+ "(unknown)"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len), ntohl(payload->mem_len));
+ break;
+
+ case PAYLOAD_SEGMENT_ENTRY:
+ fprintf(fp, " entry (0x%" PRIx64 ")\n",
+ ntohll(payload->load_addr));
+ break;
+
+ case PAYLOAD_SEGMENT_BSS:
+ fprintf(fp, " BSS (address 0x%016" PRIx64 ", "
+ "length 0x%x)\n",
+ ntohll(payload->load_addr),
+ ntohl(payload->len));
+ break;
- for (; pos < phys_end; pos += align) {
- if (cbfs_file_header(pos))
- return (struct cbfs_file *)phys_to_virt(pos);
+ case PAYLOAD_SEGMENT_PARAMS:
+ fprintf(fp, " parameters\n");
+ break;
+
+ default:
+ fprintf(fp, " 0x%x (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d\n",
+ payload->type,
+ lookup_name_by_type(types_cbfs_compression,
+ payload->compression,
+ "(unknown)"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len),
+ ntohl(payload->mem_len));
+ break;
}
- return NULL;
+ return 0;
}
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ const char *name = CBFS_NAME(entry);
+ struct cbfs_payload_segment *payload;
+ FILE *fp = (FILE*)arg;
-int remove_file_from_cbfs(const char *filename)
-{
- struct cbfs_file *prev = NULL;
- struct cbfs_file *cur = next_file(prev);
- struct cbfs_file *next = next_file(cur);
- for (; cur; prev = cur, cur = next, next = next_file(next)) {
-
- /* Check if this is the file to remove. */
- char *name = (char *)cur + sizeof(*cur);
- if (strcmp(name, filename))
- continue;
+ if (!cbfs_is_valid_entry(entry)) {
+ ERROR("cbfs_print_entry_info: Invalid entry at 0x%x\n",
+ cbfs_get_entry_addr(image, entry));
+ return -1;
+ }
+ if (!fp)
+ fp = stdout;
- /* Mark the file as free space and erase its name. */
- cur->type = CBFS_COMPONENT_NULL;
- name[0] = '\0';
+ 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));
- /* Merge it with the previous file if possible. */
- if (prev && prev->type == CBFS_COMPONENT_NULL)
- cur = merge_adjacent_files(prev, cur);
+ if (!verbose)
+ return 0;
- /* Merge it with the next file if possible. */
- if (next && next->type == CBFS_COMPONENT_NULL)
- merge_adjacent_files(cur, next);
+ /* note the components of the subheader may be in host order ... */
+ switch (ntohl(entry->type)) {
+ case CBFS_COMPONENT_STAGE:
+ cbfs_print_stage_info((struct cbfs_stage*)
+ CBFS_SUBHEADER(entry), fp);
+ break;
- return 0;
+ case CBFS_COMPONENT_PAYLOAD:
+ payload = (struct cbfs_payload_segment*)
+ CBFS_SUBHEADER(entry);
+ while (payload) {
+ cbfs_print_payload_segment_info(payload, fp);
+ if (payload->type == PAYLOAD_SEGMENT_ENTRY)
+ break;
+ else
+ payload ++;
+ }
+ break;
+ default:
+ break;
}
- fprintf(stderr, "E: CBFS file %s not found.\n", filename);
- return 1;
+ return 0;
}
+int cbfs_print_directory(struct cbfs_image *image) {
+ cbfs_print_header_info(image);
+ printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
+ cbfs_walk(image, cbfs_print_entry_info, NULL);
+ return 0;
+}
-/* returns new data block with cbfs_file header, suitable to dump into the ROM. location returns
- the new location that points to the cbfs_file header */
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location)
-{
- uint32_t filename_len = ALIGN(strlen(filename) + 1, 16);
- uint32_t headersize = sizeof(struct cbfs_file) + filename_len;
- if ((location != 0) && (*location != 0)) {
- uint32_t offset = *location % align;
- /* If offset >= (headersize % align), we can stuff the header into the offset.
- Otherwise the header has to be aligned itself, and put before the offset data */
- if (offset >= (headersize % align)) {
- offset -= (headersize % align);
- } else {
- offset += align - (headersize % align);
- }
- headersize += offset;
- *location -= headersize;
- }
- void *newdata = malloc(*datasize + headersize);
- if (!newdata) {
- fprintf(stderr, "E: Could not get %d bytes for CBFS file.\n", *datasize +
- headersize);
- exit(1);
- }
- memset(newdata, 0xff, *datasize + headersize);
- struct cbfs_file *nextfile = (struct cbfs_file *)newdata;
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(*datasize);
- nextfile->type = htonl(type);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(headersize);
- strcpy(newdata + sizeof(struct cbfs_file), filename);
- memcpy(newdata + headersize, data, *datasize);
- *datasize += headersize;
- return newdata;
-}
-
-int create_cbfs_image(const char *romfile, uint32_t _romsize,
- const char *bootblock, uint32_t align, uint32_t offs)
-{
- uint32_t bootblocksize = 0;
- struct cbfs_header *master_header;
- unsigned char *romarea, *bootblk;
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ struct cbfs_file *next, *last;
+ uint32_t type;
+ size_t newlen;
- romsize = _romsize;
- romarea = malloc(romsize);
- if (!romarea) {
- fprintf(stderr, "E: Could not get %d bytes of memory"
- " for CBFS image.\n", romsize);
- exit(1);
+ type = ntohl(entry->type);
+ if (type == CBFS_COMPONENT_DELETED) {
+ // Ready to be recycled.
+ type = CBFS_COMPONENT_NULL;
+ entry->type = htonl(type);
}
- memset(romarea, 0xff, romsize);
+ if (type != CBFS_COMPONENT_NULL)
+ return 0;
- if (align == 0)
- align = 64;
-
- bootblk = loadfile(bootblock, &bootblocksize,
- romarea + romsize, SEEK_END);
- if (!bootblk) {
- fprintf(stderr, "E: Could not load bootblock %s.\n",
- bootblock);
- free(romarea);
- return 1;
+ next = cbfs_find_next_entry(image, entry);
+ if (!next || !cbfs_is_valid_entry(next))
+ return -1;
+ type = ntohl(next->type);
+ if (type == CBFS_COMPONENT_DELETED) {
+ type = CBFS_COMPONENT_NULL;
+ next->type = htonl(type);
}
+ if (type != CBFS_COMPONENT_NULL)
+ return 0;
- // TODO(hungte) Replace magic numbers by named constants.
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- /* Set up physical/virtual mapping */
- offset = romarea;
-
- /*
- * The initial jump instruction and bootblock will be placed
- * before and after the master header, respectively. The
- * bootblock image must contain a blank, aligned region large
- * enough for the master header to fit.
- *
- * An anchor string must be left such that when cbfstool is run
- * we can find it and insert the master header at the next
- * aligned boundary.
- */
- loadfile(bootblock, &bootblocksize, romarea + offs, SEEK_SET);
-
- unsigned char *p = romarea + offs;
- while (1) {
- /* FIXME: assumes little endian... */
- if (*(uint32_t *)p == 0xdeadbeef)
- break;
- if (p >= (romarea + _romsize)) {
- fprintf(stderr, "E: Could not determine CBFS "
- "header location.\n", bootblock);
- return 1;
- }
- p += (sizeof(unsigned int));
- }
- unsigned int u = ALIGN((unsigned int)(p - romarea), align);
- master_header = (struct cbfs_header *)(romarea + u);
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(
- ALIGN((0x40 + bootblocksize), align));
- master_header->architecture = htonl(CBFS_ARCHITECTURE_ARMV7);
-
- ((uint32_t *) phys_to_virt(0x4 + offs))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file(
- offs + ALIGN((0x40 + bootblocksize), align),
- romsize - offs - sizeof(struct cbfs_file) -
- ALIGN((bootblocksize + 0x40), align));
- break;
-
- case CBFS_ARCHITECTURE_X86:
- // Set up physical/virtual mapping
- offset = romarea + romsize - 0x100000000ULL;
-
- loadfile(bootblock, &bootblocksize, romarea + romsize,
- SEEK_END);
- master_header = (struct cbfs_header *)(romarea + romsize -
- bootblocksize - sizeof(struct cbfs_header));
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(offs);
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
-
- ((uint32_t *) phys_to_virt(CBFS_HEADPTR_ADDR_X86))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff,
- romsize - offs - bootblocksize -
- sizeof(struct cbfs_header) -
- sizeof(struct cbfs_file) - 16);
- break;
-
- default:
- // Should not happen.
- fprintf(stderr, "E: You found a bug in cbfstool.\n");
- exit(1);
- }
-
- writerom(romfile, romarea, romsize);
- free(romarea);
+ last = cbfs_find_next_entry(image, next);
+ assert(last);
+
+ // Now, we find two deleted/empty entries; try to merge now.
+ DEBUG("cbfs_join_empty_entry: combine 0x%x+0x%x and 0x%x+0x%x.\n",
+ cbfs_get_entry_addr(image, entry), ntohl(entry->len),
+ cbfs_get_entry_addr(image, next), ntohl(next->len));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ newlen = (cbfs_get_entry_addr(image, last) -
+ cbfs_get_entry_addr(image, entry) - ntohl(entry->offset));
+ entry->len = htonl(newlen);
+ DEBUG("new empty entry: length=0x%zx\n", newlen);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, newlen);
+ // TODO we should try again until no more entries are found...
+ // cbfs_merge_empty_entry(image, entry, arg);
return 0;
}
-static int in_segment(int addr, int size, int gran)
-{
- return ((addr & ~(gran - 1)) == ((addr + size) & ~(gran - 1)));
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback,
+ void *arg) {
+ int count = 0;
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ count ++;
+ if (callback(image, entry, arg) != 0)
+ break;
+ }
+ return count;
}
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t alignment)
-{
- void *rom;
- size_t filename_size, headersize, totalsize;
- int ret = 0;
- uint32_t current;
-
- rom = loadrom(romfile);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- romfile);
- return 0;
+struct cbfs_header *cbfs_find_header(char *data, size_t size) {
+ size_t offset;
+ int found = 0;
+ uint32_t x86sig;
+ struct cbfs_header *header, *result = NULL;
+
+ // Try x86 style (check signature in bottom) header first.
+ x86sig = *(uint32_t*)(data + size - sizeof(uint32_t));
+ offset = (x86sig + (uint32_t)size);
+ DEBUG("x86sig: 0x%x, offset: 0x%zx\n", x86sig, offset);
+ if (offset >= size - sizeof(*header) ||
+ ntohl(((struct cbfs_header*)(data + offset))->magic) !=
+ CBFS_HEADER_MAGIC)
+ offset = 0;
+
+ for (; offset + sizeof(*header) < size; offset++) {
+ header = (struct cbfs_header*)(data + offset);
+ if (ntohl(header->magic) !=(CBFS_HEADER_MAGIC))
+ continue;
+ if (ntohl(header->version) != CBFS_HEADER_VERSION1 &&
+ ntohl(header->version) != CBFS_HEADER_VERSION2) {
+ // Probably not a real CBFS header?
+ continue;
+ }
+ found++;
+ result = header;
}
+ if (found > 1) {
+ ERROR("multiple (%d) CBFS headers found!\n",
+ found);
+ result = NULL;
+ }
+ return result;
+}
+
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image) {
+ assert(image && image->header);
+ return (struct cbfs_file*)(image->buffer.data +
+ ntohl(image->header->offset));
+}
- filename_size = strlen(filename);
- headersize = sizeof(struct cbfs_file) + ALIGN(filename_size + 1, 16) +
- sizeof(struct cbfs_stage);
- totalsize = headersize + filesize;
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry) {
+ uint32_t addr = cbfs_get_entry_addr(image, entry);
+ int align = ntohl(image->header->align);
+ assert(entry && cbfs_is_valid_entry(entry));
+ addr += ntohl(entry->offset) + ntohl(entry->len);
+ addr = align_up(addr, align);
+ return (struct cbfs_file*)(image->buffer.data + addr);
+}
+
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry) {
+ assert(image && image->buffer.data && entry);
+ return (int32_t)((char*)entry - image->buffer.data);
+}
+
+int cbfs_is_valid_entry(struct cbfs_file *entry) {
+ return (entry &&memcmp(entry->magic, CBFS_FILE_MAGIC,
+ sizeof(entry->magic)) == 0);
+}
- current = phys_start;
- while (current < phys_end) {
- uint32_t top;
- struct cbfs_file *thisfile;
+int cbfs_init_entry(struct cbfs_file *entry,
+ struct buffer *buffer) {
+ memset(entry, 0, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->len = htonl(buffer->size);
+ entry->offset = htonl(sizeof(*entry) + strlen(buffer->name) + 1);
+ return 0;
+}
- if (!cbfs_file_header(current)) {
- current += align;
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name) {
+ memset(entry, CBFS_CONTENT_DEFAULT_VALUE, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ entry->len = htonl(len);
+ entry->checksum = 0; // TODO Build a checksum algorithm.
+ entry->offset = htonl(sizeof(*entry) + align_up(strlen(name) + 1,
+ CBFS_FILENAME_ALIGN));
+ memset(CBFS_NAME(entry), 0, ntohl(entry->offset) - sizeof(*entry));
+ strcpy(CBFS_NAME(entry), name);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, len);
+ return 0;
+}
+
+/* Finds a place to hold whole stage data in same memory page.
+ */
+static int is_in_same_page(uint32_t start, uint32_t size, uint32_t page) {
+ if (!page)
+ return 1;
+ return (start / page) == (start + size - 1) / page;
+}
+
+int32_t cbfs_locate_stage(struct cbfs_image *image, const char *name,
+ uint32_t size, uint32_t page_size) {
+ struct cbfs_file *entry;
+ size_t need_len;
+ uint32_t addr, addr_next, addr2, addr3, header_len;
+ assert(size < page_size);
+
+ header_len = sizeof(*entry) + sizeof(struct cbfs_stage) +
+ align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN);
+ need_len = header_len + size;
+
+ // Merge empty entries to build get max available pages.
+ cbfs_walk(image, cbfs_merge_empty_entry, NULL);
+
+ /* Three cases (content fit, content before, or content after page):
+ * case 1.
+ * | PAGE 1 | PAGE 2 |
+ * | <header><content> | Fit. Return start of content.
+ * case 2.
+ * | PAGE 1 | PAGE 2 |
+ * | <header><content> | Can't fit. If we can fit in PAGE2,
+ * | | | return PAGE2 (not start of content)
+ * case 3.
+ * When we move (align) to PAGE 2 and content fills entire
+ * page, the distance is less than header (so we still can't
+ * fit). Try PAGE 3.
+ */
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+
+ uint32_t type = ntohl(entry->type);
+ if (type != CBFS_COMPONENT_NULL)
continue;
- }
- thisfile = (struct cbfs_file *)phys_to_virt(current);
+ addr = cbfs_get_entry_addr(image, entry);
+ addr_next = cbfs_get_entry_addr(image, cbfs_find_next_entry(
+ image, entry));
+ if (addr_next - addr < need_len)
+ continue;
+ if (is_in_same_page(addr + header_len, size, page_size)) {
+ DEBUG("cbfs_locate_stage: FIT (PAGE1).");
+ return addr + header_len;
+ }
- top = current + ntohl(thisfile->len) + ntohl(thisfile->offset);
+ addr2 = align_up(addr, page_size);
+ if (addr2 < addr_next && addr_next - addr2 >= size &&
+ addr2 - addr >= header_len) {
+ DEBUG("cbfs_locate_stage: OVERLAP (PAGE2).");
+ return addr2;
+ }
- if (((ntohl(thisfile->type) == 0x0)
- || (ntohl(thisfile->type) == 0xffffffff))
- && (ntohl(thisfile->len) + ntohl(thisfile->offset) >=
- totalsize)) {
- if (in_segment
- (current + headersize, filesize, alignment)) {
- ret = current + headersize;
- break;
- }
- if ((ALIGN(current, alignment) + filesize < top)
- && (ALIGN(current, alignment) - headersize >
- current)
- && in_segment(ALIGN(current, alignment), filesize,
- alignment)) {
- ret = ALIGN(current, alignment);
- break;
- }
- if ((ALIGN(current, alignment) + alignment + filesize <
- top)
- && (ALIGN(current, alignment) + alignment -
- headersize > current)
- && in_segment(ALIGN(current, alignment) + alignment,
- filesize, alignment)) {
- ret = ALIGN(current, alignment) + alignment;
- break;
- }
+ addr3 = addr2 + page_size;
+ if (addr3 < addr_next && addr_next - addr3 >= size &&
+ addr3 - addr >= header_len) {
+ DEBUG("cbfs_locate_stage: OVERLAP+ (PAGE3).");
+ return addr3;
}
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
}
-
- free(rom);
- return ret;
+ return 0;
}
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index 853e529..d4863bb 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -2,6 +2,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,71 +22,177 @@
#define __CBFSTOOL_COMMON_H
#include <stdint.h>
+#include "cbfs.h"
+
+/* Message output */
+extern int verbose;
+#define ERROR(x...) { fprintf(stderr, "ERROR: " x); }
+#define WARN(x...) { fprintf(stderr, "WARN: " 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 ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#define IS_TOP_ALIGNED_ADDRESS(x) ((uint32_t)(x) > 0x80000000)
+
+/* Endianess */
+#include <arpa/inet.h> // for ntohl, htonl
#include "swab.h"
-#ifndef __APPLE__
-#define ntohl(x) (host_bigendian?(x):swab32(x))
-#define htonl(x) (host_bigendian?(x):swab32(x))
-#endif
-#define ntohll(x) (host_bigendian?(x):swab64(x))
-#define htonll(x) (host_bigendian?(x):swab64(x))
+int is_big_endian(void);
+#define ntohll(x) (is_big_endian() ? (x) : swab64(x))
+#define htonll(x) (is_big_endian() ? (x) : swab64(x))
-extern void *offset;
-extern uint32_t romsize;
-extern int host_bigendian;
-extern uint32_t arch;
+/* Buffer and file I/O */
+struct buffer {
+ char *name;
+ char *data;
+ size_t size;
+};
-const char *arch_to_string(uint32_t a);
-uint32_t string_to_arch(const char *arch_string);
+/* Creates an empty memory buffer with given size.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_create(struct buffer *buffer, size_t size, const char *name);
-static inline void *phys_to_virt(uint32_t addr)
-{
- return offset + addr;
-}
+/* Loads a file into memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_from_file(struct buffer *buffer, const char *filename);
-static inline uint32_t virt_to_phys(void *addr)
-{
- return (unsigned long)(addr - offset) & 0xffffffff;
-}
+/* Writes memory buffer content into file.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_write_file(struct buffer *buffer, const char *filename);
+
+/* Destroys a memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_delete(struct buffer *buffer);
-#define ALIGN(val, by) (((val) + (by)-1)&~((by)-1))
-size_t getfilesize(const char *filename);
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place);
-void *loadrom(const char *filename);
-int writerom(const char *filename, void *start, uint32_t size);
+/* Type and format */
+
+/* Returns 1 if input points to an ELF object, otherwise 0. */
+int is_elf_object(const void *input);
-int iself(unsigned char *input);
+/* Returns the value from CBFS entry type name, or default_value if
+ * the name is not found. */
+uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value);
+/* Returns the compression name, or default_value if not found. */
+uint32_t get_cbfs_compression(const char *name, uint32_t default_value);
+
+/* Prints all known CBFS entry types. */
+void print_all_cbfs_entry_types();
+
+
+/* CBFS image processing */
-typedef void (*comp_func_ptr) (char *, int, char *, int *);
-typedef enum { CBFS_COMPRESS_NONE = 0, CBFS_COMPRESS_LZMA = 1 } comp_algo;
+struct cbfs_image {
+ struct buffer buffer;
+ struct cbfs_header *header;
+};
-comp_func_ptr compression_function(comp_algo algo);
+/* Creates an empty CBFS image by given size, and description to its content
+ * (bootblock, align, header location, starting offset of CBFS entries.
+ * The output image will contain a valid cbfs_header, with one cbfs_file
+ * entry with type CBFS_COMPONENT_NULL, with max available size.
+ * Returns 0 on success, otherwise none-zero. */
+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);
+
+
+/* Loads a CBFS image from file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename);
+
+/* Writes a CBFS image into file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename);
+
+/* Releases the CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_delete(struct cbfs_image *image);
+
+/* Adds an entry to CBFS image by given name and type. If offset is non-zero,
+ * try to add at assigned location.
+ * Returns 0 on success, otherwise non-zero. */
+int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer,
+ const char *name, uint32_t type, uint32_t offset);
-uint64_t intfiletype(const char *name);
+/* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_remove_entry(struct cbfs_image *image, const char *name);
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo);
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location);
+/* Returns a pointer to entry by name, or NULL if name is not found. */
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name);
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location);
+/* Exports an entry to external file.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename);
-int create_cbfs_image(const char *romfile, uint32_t romsize,
- const char *bootblock, uint32_t align, uint32_t offs);
+/* Initializes a new entry with size and name in CBFS image.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name);
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location);
-int remove_file_from_cbfs(const char *filename);
-void print_cbfs_directory(const char *filename);
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath);
-int remove_file_from_cbfs(const char *filename);
+/* Finds a location to put whole cbfs_stage content in same memory page.
+ * Returns a valid offset, or -1 on failure. */
+int32_t cbfs_locate_stage(struct cbfs_image *image, const char *name,
+ uint32_t size, uint32_t page_size);
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t align);
+/* Callback function used by cbfs_walk.
+ * Returns 0 on success, or non-zero to stop further iteration. */
+typedef int (*cbfs_entry_callback)(struct cbfs_image *image,
+ struct cbfs_file *file,
+ void *arg);
-void print_supported_filetypes(void);
+/* Iterates through all entries in CBFS image, and invoke with callback.
+ * Stops if callback returns non-zero values.
+ * Returns number of entries invoked. */
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback, void *arg);
-#define ARRAY_SIZE(a) (int)(sizeof(a) / sizeof((a)[0]))
+/* Primitive CBFS utilities */
+
+/* Returns a pointer to the only valid CBFS header in give buffer, otherwise
+ * NULL (including when multiple headers were found). If there is a X86 ROM
+ * style signature (pointer at 0xfffffffc) found in ROM, it will be selected as
+ * the only header.*/
+struct cbfs_header *cbfs_find_header(char *data, size_t size);
+
+/* Returns the first cbfs_file entry in CBFS image by CBFS header (no matter if
+ * the entry has valid content or not), otherwise NULL. */
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image);
+
+/* Returns next cbfs_file entry (no matter if its content is valid or not), or
+ * NULL on failure. */
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry);
+
+/* Returns ROM address (offset) of entry.
+ * This is different from entry->offset (pointer to content). */
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry);
+
+int cbfs_print_directory(struct cbfs_image *image);
+int cbfs_print_header_info(struct cbfs_image *image);
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+
+/* Returns 1 if entry has valid data (by checking magic number), otherwise 0. */
+int cbfs_is_valid_entry(struct cbfs_file *entry);
+
+/* Utilities */
+
+/* compress.c */
+typedef void (*comp_func_ptr) (char *, int, char *, int *);
+typedef enum {
+ CBFS_COMPRESS_NONE = 0,
+ CBFS_COMPRESS_LZMA
+} comp_algo;
+comp_func_ptr compression_function(comp_algo algo);
+/* cbfs-mkpayload.c */
+int parse_elf_to_payload(char *input, char **output, comp_algo algo);
+int parse_flat_binary_to_payload(char *input, char **output,
+ uint32_t input_size, uint32_t loadaddress,
+ uint32_t entrypoint, comp_algo algo);
+/* cbfs-mkstage.c */
+int parse_elf_to_stage(char *input, char **output, comp_algo algo,
+ uint32_t location);
#endif
1
0
Patch merged into coreboot/master: d1de45e ioapic: Factor out counting code to `ioapic_interrupt_count`
by gerritï¼ coreboot.org 27 Jan '13
by gerritï¼ coreboot.org 27 Jan '13
27 Jan '13
the following patch was just integrated into master:
commit d1de45e095c53887fa30ebaf6807846d0ef470cd
Author: Patrick Georgi <patrick(a)georgi-clan.de>
Date: Wed Jan 23 13:45:23 2013 +0100
ioapic: Factor out counting code to `ioapic_interrupt_count`
No need to keep duplicate variants of counting ioapic interrupts.
Change-Id: I512860297309c46e05cc5379bf61479878817b1e
Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de>
Reviewed-on: http://review.coreboot.org/2185
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
See http://review.coreboot.org/2185 for details.
-gerrit
1
0
Patch set updated for coreboot: 8b36963 Improve CBFS tool to support platform without top-aligned mapping.
by Hung-Te Lin 27 Jan '13
by Hung-Te Lin 27 Jan '13
27 Jan '13
Hung-Te Lin (hungte(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2194
-gerrit
commit 8b369635ce3b23edf32db9751793ffab2900e5f0
Author: Hung-Te Lin <hungte(a)chromium.org>
Date: Sat Jan 26 02:03:28 2013 +0800
Improve CBFS tool to support platform without top-aligned mapping.
CBFS tool was written with lots of global variables and designed with assumption
based on x86 architecture. To support other platforms better, we should rewrite
using logical offset instead of top-aligned memory mapped address.
Also fixed a calculation error in size of last entry (which will cause
overwriting header data when you really used every bits in CBFS) in old CBFS
tool.
Usage changes:
- "locate" is changed to "locate-stage" (which is the real behavior in old
cbfstool) and prefix output with "0x". The output is now platform
independent offset. To retrieve x86 top-aligned virtual address, add "-T".
"-a" for locate-stage is ignored because it can't be assigned when you really
do add-stage.
- "create" takes two extra optional params:
"-b": baseeaddress (offset) for bootblock. When omitted, put bootblock in
end of ROM.
"-H": header offset. When omitted, put header right before bootblock,
and put a top-aligned virtual address reference in end of ROM.
- All address (-b, -H, -o) can now be ROM offset or x86 top-aligned address
( > 0x80000000).
- "-m" (architecture) is deprecated because we won't want to list hundreds of
architecture variants (like ARM soc family).
- "-v" (verbose) now really works.
Verified to work on ARM (google/snow) and X86 (qemu/x86).
Change-Id: I28c737c8f290e51332119188248ac9e28042024c
Signed-off-by: Hung-Te Lin <hungte(a)chromium.org>
---
src/arch/armv7/Makefile.inc | 13 +-
src/arch/x86/Makefile.inc | 12 +-
util/cbfstool/cbfs-mkpayload.c | 82 ++-
util/cbfstool/cbfs-mkstage.c | 39 +-
util/cbfstool/cbfs.h | 7 +-
util/cbfstool/cbfstool.c | 681 ++++++++++-----------
util/cbfstool/common.c | 1315 ++++++++++++++++++++--------------------
util/cbfstool/common.h | 198 ++++--
8 files changed, 1233 insertions(+), 1114 deletions(-)
diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc
index 872365c..55de481 100644
--- a/src/arch/armv7/Makefile.inc
+++ b/src/arch/armv7/Makefile.inc
@@ -46,9 +46,12 @@ prebuild-files = \
$(if $(call extract_nth,4,$(file)),-b $(call extract_nth,4,$(file))) &&)
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
+# TODO(hungte) Change CBFS command to use per-board params. Also we don't need
+# to prefix 0x2000 bytes of zero in boot block anymore!
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
- $(CBFSTOOL) $@.tmp create -m armv7 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
- -B $(objcbfs)/bootblock.bin -a 64
+ $(CBFSTOOL) $@.tmp create -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
+ -B $(objcbfs)/bootblock.bin -a 64 -b 0x0000 -H 0x2040 \
+ -o 0x5000
$(prebuild-files) true
mv $@.tmp $@
else
@@ -314,11 +317,9 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas
$(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin
@printf " generating base_xip.txt\n"
rm -f $@
- $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
+ $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
|| { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; }
- sed -e 's/^/0x/g' $@.tmp > $@.tmp2
- rm $@.tmp
- mv $@.tmp2 $@
+ mv $@.tmp $@
$(objgenerated)/crt0.romstage.S: $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n"
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index ea86f8f..30f9008 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -65,7 +65,7 @@ prebuild-files = \
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
- $(CBFSTOOL) $@.tmp create -m x86 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
+ $(CBFSTOOL) $@.tmp create -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
-B $(objcbfs)/bootblock.bin -a 64 \
-o $$(( $(CONFIG_ROM_SIZE) - $(CONFIG_CBFS_SIZE) ))
$(prebuild-files) true
@@ -274,6 +274,9 @@ endif
$(obj)/coreboot.pre: $(objcbfs)/romstage_xip.elf $(obj)/coreboot.pre1 $(CBFSTOOL)
@printf " CBFS $(subst $(obj)/,,$(@))\n"
cp $(obj)/coreboot.pre1 $@.tmp
+ echo $(CBFSTOOL) $@.tmp add-stage -f $(objcbfs)/romstage_xip.elf \
+ -n $(CONFIG_CBFS_PREFIX)/romstage -c none \
+ -b $(shell cat $(objcbfs)/base_xip.txt) >>cbfs.log
$(CBFSTOOL) $@.tmp add-stage -f $(objcbfs)/romstage_xip.elf \
-n $(CONFIG_CBFS_PREFIX)/romstage -c none \
-b $(shell cat $(objcbfs)/base_xip.txt)
@@ -375,11 +378,10 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas
$(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin
rm -f $@
- $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
+ echo $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -T -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) >> cbfs.log
+ $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -T -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
|| { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; }
- sed -e 's/^/0x/g' $@.tmp > $@.tmp2
- rm $@.tmp
- mv $@.tmp2 $@
+ mv $@.tmp $@
$(objgenerated)/crt0.romstage.S: $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n"
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index 0d3986e..3c19d55 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -22,24 +22,18 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo)
+int parse_elf_to_payload(char *input, char **output, comp_algo algo)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
Elf32_Shdr *shdr;
char *header;
char *strtab;
- unsigned char *sptr;
+ char *sptr;
int headers;
int segments = 1;
int isize = 0, osize = 0;
@@ -47,21 +41,16 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
struct cbfs_payload_segment *segs;
int i;
- if(!iself(input)){
+ if(!is_elf_object(input)){
fprintf(stderr, "E: The payload file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The payload file has the wrong architecture\n");
- return -1;
- }
-
comp_func_ptr compress = compression_function(algo);
if (!compress)
return -1;
+ DEBUG("start: parse_elf_to_payload\n");
headers = ehdr->e_phnum;
header = (char *)ehdr;
@@ -156,9 +145,9 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
if (phdr[i].p_filesz == 0) {
segs[segments].type = PAYLOAD_SEGMENT_BSS;
segs[segments].load_addr =
- (uint64_t)htonll(phdr[i].p_paddr);
+ htonll(phdr[i].p_paddr);
segs[segments].mem_len =
- (uint32_t)htonl(phdr[i].p_memsz);
+ htonl(phdr[i].p_memsz);
segs[segments].offset = htonl(doffset);
segments++;
@@ -169,8 +158,8 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
segs[segments].type = PAYLOAD_SEGMENT_CODE;
else
segs[segments].type = PAYLOAD_SEGMENT_DATA;
- segs[segments].load_addr = (uint64_t)htonll(phdr[i].p_paddr);
- segs[segments].mem_len = (uint32_t)htonl(phdr[i].p_memsz);
+ segs[segments].load_addr = htonll(phdr[i].p_paddr);
+ segs[segments].mem_len = htonl(phdr[i].p_memsz);
segs[segments].compression = htonl(algo);
segs[segments].offset = htonl(doffset);
@@ -197,7 +186,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
}
segs[segments].type = PAYLOAD_SEGMENT_ENTRY;
- segs[segments++].load_addr = (uint64_t)htonll(ehdr->e_entry);
+ segs[segments++].load_addr = htonll(ehdr->e_entry);
*output = sptr;
@@ -206,3 +195,54 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
err:
return -1;
}
+
+int parse_flat_binary_to_payload(char *input,
+ char **output,
+ uint32_t input_size,
+ uint32_t loadaddress,
+ uint32_t entrypoint,
+ comp_algo algo)
+{
+ comp_func_ptr compress;
+ char *payload;
+ struct cbfs_payload_segment *segs;
+ int doffset, len = 0;
+
+ compress = compression_function(algo);
+ if (!compress)
+ return 1;
+
+ DEBUG("start: parse_flat_binary_to_payload\n");
+ /* FIXME compressed file size might be bigger than original file */
+ payload = calloc((2 * sizeof(*segs)) + input_size, 1);
+ if (payload == NULL) {
+ fprintf(stderr, "E: Could not allocate memory.\n");
+ return 1;
+ }
+
+ segs = (struct cbfs_payload_segment *)payload;
+ doffset = (2 * sizeof(*segs));
+
+ /* Prepare code segment */
+ segs[0].type = PAYLOAD_SEGMENT_CODE;
+ segs[0].load_addr = htonll(loadaddress);
+ segs[0].mem_len = htonl(input_size);
+ segs[0].offset = htonl(doffset);
+
+ compress(input, input_size, (char *)(payload + doffset), &len);
+ segs[0].compression = htonl(algo);
+ segs[0].len = htonl(len);
+
+ if ((unsigned int)len >= input_size) {
+ segs[0].compression = 0;
+ segs[0].len = htonl(input_size);
+ memcpy(payload + doffset, input, input_size);
+ }
+
+ /* prepare entry point segment */
+ segs[1].type = PAYLOAD_SEGMENT_ENTRY;
+ segs[1].load_addr = htonll(entrypoint);
+
+ *output = payload;
+ return doffset + ntohl(segs[0].len);
+}
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index 0541d4b..9e47047 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -23,14 +23,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
static unsigned int idemp(unsigned int x)
{
@@ -48,13 +43,13 @@ static unsigned int swap32(unsigned int x)
unsigned int (*elf32_to_native) (unsigned int) = idemp;
/* returns size of result, or -1 if error */
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location)
+int parse_elf_to_stage(char *input, char **output,
+ comp_algo algo, uint32_t location)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
char *header, *buffer;
- unsigned char *out;
+ char *out;
int headers;
int i;
@@ -67,21 +62,16 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
if (!compress)
return -1;
- if (!iself(input)) {
+ DEBUG("start: parse_elf_to_stage(location=0x%x)\n", location);
+ if (!is_elf_object(input)) {
fprintf(stderr, "E: The stage file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The stage file has the wrong architecture\n");
- return -1;
- }
-
if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
elf_bigendian = 1;
}
- if (elf_bigendian != host_bigendian) {
+ if (elf_bigendian != is_big_endian()) {
elf32_to_native = swap32;
}
@@ -125,8 +115,8 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
mem_end = mend;
}
- if (data_start < *location) {
- data_start = *location;
+ if (data_start < location) {
+ data_start = location;
}
if (data_end <= data_start) {
@@ -155,9 +145,9 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
continue;
l_start = elf32_to_native(phdr[i].p_paddr);
- if (l_start < *location) {
- l_offset = *location - l_start;
- l_start = *location;
+ if (l_start < location) {
+ l_offset = location - l_start;
+ l_start = location;
}
memcpy(buffer + (l_start - data_start),
@@ -184,10 +174,7 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
(char *)(out + sizeof(struct cbfs_stage)), (int *)&stage->len);
free(buffer);
-
*output = out;
- if (*location)
- *location -= sizeof(struct cbfs_stage);
- return sizeof(struct cbfs_stage) + stage->len;
+ return sizeof(*stage) + stage->len;
}
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 3dbeefd..26ab62f 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -25,7 +25,9 @@
#define CBFS_HEADPTR_ADDR_X86 0xFFFFFFFC
#define CBFS_HEADER_VERSION1 0x31313131
#define CBFS_HEADER_VERSION2 0x31313132
-#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION2
+// TODO(hungte) We probably don't need "architecture" anymore - remove in future
+// Right now, to make old cbfstool happy, declare version as 1.
+#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION1
struct cbfs_header {
uint32_t magic;
@@ -42,6 +44,8 @@ struct cbfs_header {
#define CBFS_ARCHITECTURE_X86 0x00000001
#define CBFS_ARCHITECTURE_ARMV7 0x00000010
+#define CBFS_FILE_MAGIC "LARCHIVE"
+
struct cbfs_file {
uint8_t magic[8];
uint32_t len;
@@ -106,6 +110,7 @@ struct cbfs_payload {
#define CBFS_COMPONENT_NULL 0xFFFFFFFF
int cbfs_file_header(unsigned long physaddr);
+#define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file))
#define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) )
struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size);
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 4202801..d3853ef 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,6 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -26,7 +28,8 @@
#include <unistd.h>
#include <getopt.h>
#include "common.h"
-#include "cbfs.h"
+
+int verbose = 0;
struct command {
const char *name;
@@ -34,438 +37,396 @@ struct command {
int (*function) (void);
};
-int verbose = 0;
-static char *cbfs_name = NULL;
-static char *rom_name = NULL;
-static char *rom_filename = NULL;
-static char *rom_bootblock = NULL;
-static uint32_t rom_type = 0;
-static uint32_t rom_baseaddress = 0;
-static uint32_t rom_loadaddress = 0;
-static uint32_t rom_entrypoint = 0;
-static uint32_t rom_size = 0;
-static uint32_t rom_alignment = 0;
-static uint32_t rom_offset = 0;
-static comp_algo rom_algo = CBFS_COMPRESS_NONE;
-
-static int cbfs_add(void)
-{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
-
- if (!rom_filename) {
+struct param {
+ char *cbfs_name;
+ char *name;
+ char *filename;
+ char *bootblock_file;
+ uint32_t type;
+ uint32_t base_address;
+ uint32_t base_address_assigned;
+ uint32_t load_address;
+ uint32_t header_offset;
+ uint32_t header_offset_assigned;
+ uint32_t entrypoint;
+ uint32_t size;
+ uint32_t alignment;
+ uint32_t offset;
+ uint32_t top_aligned;
+ comp_algo algo;
+} param;
+
+typedef int (*convert_buffer_t)(struct buffer *buffer);
+
+static int cbfstool_add_file(const char *cbfs_name,
+ const char *filename,
+ const char *name,
+ uint32_t type,
+ uint32_t offset,
+ convert_buffer_t convert) {
+ struct cbfs_image image;
+ struct buffer buffer;
+ int result = 1;
+
+ if (!filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (rom_type == 0) {
+ if (type == 0) {
fprintf(stderr, "E: You need to specify a valid -t/--type.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (cbfs_get_entry(&image, name)) {
+ fprintf(stderr, "E: '%s' already in ROM image.\n", name);
return 1;
}
- cbfsfile = create_cbfs_file(rom_name, filedata, &filesize,
- rom_type, &rom_baseaddress);
- free(filedata);
-
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding file '%s' failed.\n", rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (buffer_from_file(&buffer, filename) != 0) {
+ fprintf(stderr, "E: Could not load file '%s'.\n", filename);
+ cbfs_image_delete(&image);
return 1;
}
- free(cbfsfile);
- free(rom);
- return 0;
-}
+ do {
+ if (convert && convert(&buffer) != 0) {
+ fprintf(stderr, "E: Failed to parse file '%s'.\n",
+ filename);
+ break;
+ }
+ if (cbfs_add_entry(&image, &buffer, name, type, offset) != 0)
+ break;
+ if (cbfs_image_write_file(&image, cbfs_name) != 0)
+ break;
-static int cbfs_add_payload(void)
-{
- int32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
+ result = 0;
+ } while (0);
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ return result;
+}
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
+static int cbfs_convert_mkstage(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_stage(buffer->data, &output, param.algo,
+ param.base_address);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
- }
+static int cbfs_convert_elf_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_payload(buffer->data, &output,
+ param.algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
- return 1;
- }
+static int cbfs_convert_flat_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result;
+ result = parse_flat_binary_to_payload(buffer->data, &output,
+ buffer->size,
+ param.load_address,
+ param.entrypoint,
+ param.algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- filesize = parse_elf_to_payload(filedata, &payload, rom_algo);
- if (filesize <= 0) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(rom);
- return 1;
- }
+static int cbfstool_add(void)
+{
+ return cbfstool_add_file(param.cbfs_name,
+ param.filename,
+ param.name,
+ param.type,
+ param.base_address,
+ NULL);
+}
- cbfsfile = create_cbfs_file(rom_name, payload, &filesize,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
- free(filedata);
- free(payload);
+static int cbfstool_add_payload(void)
+{
+ return cbfstool_add_file(param.cbfs_name,
+ param.filename,
+ param.name,
+ CBFS_COMPONENT_PAYLOAD,
+ param.base_address,
+ cbfs_convert_elf_mkpayload);
+}
+
+static int cbfstool_add_stage(void)
+{
+ return cbfstool_add_file(param.cbfs_name,
+ param.filename,
+ param.name,
+ CBFS_COMPONENT_STAGE,
+ param.base_address,
+ cbfs_convert_mkstage);
+}
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+static int cbfstool_add_flat_binary(void)
+{
+ if (param.load_address == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-l/--load-address.\n");
return 1;
}
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (param.entrypoint == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-e/--entry-point.\n");
return 1;
}
-
- free(cbfsfile);
- free(rom);
- return 0;
+ return cbfstool_add_file(param.cbfs_name,
+ param.filename,
+ param.name,
+ CBFS_COMPONENT_PAYLOAD,
+ param.base_address,
+ cbfs_convert_flat_mkpayload);
}
-static int cbfs_add_stage(void)
+static int cbfstool_remove(void)
{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *stage;
+ int result = 1;
+ struct cbfs_image image;
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
-
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
- return 1;
- }
-
- filesize = parse_elf_to_stage(filedata, &stage, rom_algo, &rom_baseaddress);
-
- cbfsfile = create_cbfs_file(rom_name, stage, &filesize,
- CBFS_COMPONENT_STAGE, &rom_baseaddress);
-
- free(filedata);
- free(stage);
-
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding stage '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
- return 1;
- }
+ do {
+ if (cbfs_remove_entry(&image, param.name) != 0) {
+ fprintf(stderr, "E: Removing file '%s' failed.\n",
+ param.name);
+ break;
+ }
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0)
+ break;
+ result = 0;
+ } while (0);
- free(cbfsfile);
- free(rom);
- return 0;
+ cbfs_image_delete(&image);
+ return result;
}
-static int cbfs_add_flat_binary(void)
+static int cbfstool_create(void)
{
- uint32_t filesize = 0;
- uint32_t final_size;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
- comp_func_ptr compress;
- struct cbfs_payload_segment *segs;
- int doffset, len = 0;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+ struct cbfs_image image;
+ struct buffer bootblock;
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
-
- if (rom_loadaddress == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-l/--load-address.\n");
- return 1;
- }
-
- if (rom_entrypoint == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-e/--entry-point.\n");
+ if (param.size == 0) {
+ fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
return 1;
}
- compress = compression_function(rom_algo);
- if (!compress)
- return 1;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ if (!param.bootblock_file) {
+ fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (buffer_from_file(&bootblock, param.bootblock_file) != 0) {
return 1;
}
- /* FIXME compressed file size might be bigger than original file */
- payload = calloc((2 * sizeof(struct cbfs_payload_segment)) + filesize, 1);
- if (payload == NULL) {
- fprintf(stderr, "E: Could not allocate memory.\n");
- free(filedata);
- free(rom);
- return 1;
+ // Setup default boot offset and header offset.
+ if (!param.base_address_assigned) {
+ // put boot block before end of ROM.
+ param.base_address = param.size - bootblock.size;
+ DEBUG("bootblock in end of ROM.\n");
}
-
- segs = (struct cbfs_payload_segment *)payload;
- doffset = (2 * sizeof(struct cbfs_payload_segment));
-
- /* Prepare code segment */
- segs[0].type = PAYLOAD_SEGMENT_CODE;
- segs[0].load_addr = (uint64_t)htonll(rom_loadaddress);
- segs[0].mem_len = (uint32_t)htonl(filesize);
- segs[0].offset = (uint32_t)htonl(doffset);
-
- compress(filedata, filesize, (char *)(payload + doffset), &len);
- segs[0].compression = htonl(rom_algo);
- segs[0].len = htonl(len);
-
- if ((unsigned int)len >= filesize) {
- segs[0].compression = 0;
- segs[0].len = htonl(filesize);
- memcpy((char *)(payload + doffset), filedata, filesize);
+ if (!param.header_offset_assigned) {
+ // Put header before bootblock, and make a reference in end of
+ // bootblock.
+ param.header_offset = (
+ param.base_address -
+ sizeof(struct cbfs_header));
+ if (bootblock.size >= sizeof(uint32_t)) {
+ // TODO this only works for 32b top-aligned system now...
+ uint32_t ptr = param.header_offset - param.size;
+ uint32_t *sig = (uint32_t*)(bootblock.data +
+ bootblock.size -
+ sizeof(ptr));
+ *sig = ptr;
+ DEBUG("CBFS header reference in end of bootblock.\n");
+ }
}
- /* prepare entry point segment */
- segs[1].type = PAYLOAD_SEGMENT_ENTRY;
- segs[1].load_addr = (uint64_t)htonll(rom_entrypoint);
-
- final_size = doffset + ntohl(segs[0].len);
- cbfsfile =
- create_cbfs_file(rom_name, payload, &final_size,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
-
- free(filedata);
- free(payload);
-
- if (add_file_to_cbfs(cbfsfile, final_size, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_create(&image,
+ param.size,
+ param.alignment,
+ &bootblock,
+ param.base_address,
+ param.header_offset,
+ param.offset) != 0) {
+ fprintf(stderr, "E: Failed to create %s.\n", param.cbfs_name);
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to write %s.\n", param.cbfs_name);
return 1;
}
-
- free(cbfsfile);
- free(rom);
+ cbfs_image_delete(&image);
return 0;
+
}
-static int cbfs_remove(void)
+static int cbfstool_locate_stage(void)
{
- void *rom;
+ struct cbfs_image image;
+ struct cbfs_file *entry;
+ struct buffer buffer;
+ size_t stage_size;
+ uint32_t address;
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
+ if (!param.filename) {
+ fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ if (!param.name) {
+ fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (remove_file_from_cbfs(rom_name)) {
- fprintf(stderr, "E: Removing file '%s' failed.\n",
- rom_name);
- free(rom);
- return 1;
- }
+ if (param.alignment)
+ WARN("-a is deprecated because you can't align in add-stage.\n");
- if (writerom(cbfs_name, rom, romsize)) {
- free(rom);
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to load %s.\n", param.cbfs_name);
return 1;
}
- free(rom);
- return 0;
-}
-
-static int cbfs_create(void)
-{
- if (rom_size == 0) {
- fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
+ if (buffer_from_file(&buffer, param.filename) != 0) {
+ fprintf(stderr, "E: Cannot load %s.\n", param.filename);
+ cbfs_image_delete(&image);
return 1;
}
- if (!rom_bootblock) {
- fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
- return 1;
- }
+ // Increase buffer for cbfs_stage header.
+ stage_size = buffer.size + sizeof(struct cbfs_stage);
+ buffer_delete(&buffer);
+ buffer_create(&buffer, stage_size, param.name);
- if (arch == CBFS_ARCHITECTURE_UNKNOWN) {
- fprintf(stderr, "E: You need to specify -m/--machine arch\n");
+ if (cbfs_get_entry(&image, param.name)) {
+ fprintf(stderr, "E: '%s' already in CBFS.\n", param.name);
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
- return create_cbfs_image(cbfs_name, rom_size, rom_bootblock,
- rom_alignment, rom_offset);
-}
-
-static int cbfs_locate(void)
-{
- uint32_t filesize, location;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
+ if (cbfs_add_entry(&image, &buffer, param.name,
+ CBFS_COMPONENT_STAGE, 0) != 0) {
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
+ entry = cbfs_get_entry(&image, param.name);
+ assert(entry);
+ assert(cbfs_is_valid_entry(entry));
+ address = (cbfs_get_entry_addr(&image, entry) + ntohl(entry->offset) +
+ sizeof(struct cbfs_stage));
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
+ if (param.top_aligned) {
+ address = address - ntohl(image.header->romsize);
}
-
- filesize = getfilesize(rom_filename);
-
- location = cbfs_find_location(cbfs_name, filesize,
- rom_name, rom_alignment);
-
- printf("%x\n", location);
- return location == 0 ? 1 : 0;
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ printf("0x%x\n", address);
+ return 0;
}
-static int cbfs_print(void)
+static int cbfstool_print(void)
{
- void *rom;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ struct cbfs_image image;
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
-
- print_cbfs_directory(cbfs_name);
-
- free(rom);
+ cbfs_print_directory(&image);
+ cbfs_image_delete(&image);
return 0;
}
-static int cbfs_extract(void)
+static int cbfstool_extract(void)
{
- void *rom;
- int ret;
+ int result = 0;
+ struct cbfs_image image;
- if (!rom_filename) {
+ if (!param.filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
+ param.cbfs_name);
+ result = 1;
+ } else if (cbfs_export_entry(&image, param.name,
+ param.filename) != 0) {
+ result = 1;
}
- ret = extract_file_from_cbfs(cbfs_name, rom_name, rom_filename);
-
- free(rom);
- return ret;
+ cbfs_image_delete(&image);
+ return result;
}
static const struct command commands[] = {
- {"add", "f:n:t:b:h?", cbfs_add},
- {"add-payload", "f:n:t:c:b:h?", cbfs_add_payload},
- {"add-stage", "f:n:t:c:b:h?", cbfs_add_stage},
- {"add-flat-binary", "f:n:l:e:c:b:h?", cbfs_add_flat_binary},
- {"remove", "n:h?", cbfs_remove},
- {"create", "s:B:a:o:m:h?", cbfs_create},
- {"locate", "f:n:a:h?", cbfs_locate},
- {"print", "h?", cbfs_print},
- {"extract", "n:f:h?", cbfs_extract},
+ {"add", "vf:n:t:b:h?", cbfstool_add},
+ {"add-payload", "vf:n:t:c:b:h?", cbfstool_add_payload},
+ {"add-stage", "vf:n:t:c:b:h?", cbfstool_add_stage},
+ {"add-flat-binary", "vf:n:l:e:c:b:h?", cbfstool_add_flat_binary},
+ {"remove", "vn:h?", cbfstool_remove},
+ {"create", "vs:B:b:H:a:o:m:h?", cbfstool_create},
+ {"locate-stage", "vTf:n:a:h?", cbfstool_locate_stage},
+ {"print", "vh?", cbfstool_print},
+ {"extract", "vn:f:h?", cbfstool_extract},
};
static struct option long_options[] = {
@@ -477,10 +438,12 @@ static struct option long_options[] = {
{"entry-point", required_argument, 0, 'e' },
{"size", required_argument, 0, 's' },
{"bootblock", required_argument, 0, 'B' },
+ {"header-offset",required_argument, 0, 'H' },
{"alignment", required_argument, 0, 'a' },
{"offset", required_argument, 0, 'o' },
{"file", required_argument, 0, 'f' },
{"arch", required_argument, 0, 'm' },
+ {"top-aligned", no_argument, 0, 'T' },
{"verbose", no_argument, 0, 'v' },
{"help", no_argument, 0, 'h' },
{NULL, 0, 0, 0 }
@@ -491,10 +454,12 @@ static void usage(char *name)
printf
("cbfstool: Management utility for CBFS formatted ROM images\n\n"
"USAGE:\n" " %s [-h]\n"
- " %s FILE COMMAND [PARAMETERS]...\n\n" "OPTIONs:\n"
- " -h Display this help message\n\n"
+ " %s FILE COMMAND [-v] [PARAMETERS]...\n\n" "OPTIONs:\n"
+ " -h Display this help message\n\n"
+ " -T Display top-aligned address instead of offset\n"
+ " -v Verbose output\n"
"COMMANDs:\n"
- " add -f FILE -n NAME -t TYPE [-b base-address] "
+ " add -f FILE -n NAME -t TYPE [-b base] "
"Add a component\n"
" add-payload -f FILE -n NAME [-c compression] [-b base] "
"Add a payload to the ROM\n"
@@ -505,10 +470,11 @@ static void usage(char *name)
"Add a 32bit flat mode binary\n"
" remove -n NAME "
"Remove a component\n"
- " create -s size -B bootblock -m ARCH [-a align] [-o offset] "
+ " create -s size -B bootblock [-b base] [-a align] \\\n"
+ " [-o offset] [-H header-offset] "
"Create a ROM file\n"
- " locate -f FILE -n NAME -a align "
- "Find a place for a file of that size\n"
+ " locate-stage -f FILE -n NAME [-T] "
+ "Find the entry if the stage component is added\n"
" print "
"Show the contents of the ROM\n"
" extract -n NAME -f FILE "
@@ -518,19 +484,7 @@ static void usage(char *name)
" armv7, x86\n"
"TYPEs:\n", name, name
);
- print_supported_filetypes();
-}
-
-/* Small, OS/libc independent runtime check for endianess */
-int host_bigendian = 0;
-
-static void which_endian(void)
-{
- static const uint32_t inttest = 0x12345678;
- uint8_t inttest_lsb = *(uint8_t *)&inttest;
- if (inttest_lsb == 0x12) {
- host_bigendian = 1;
- }
+ print_all_cbfs_entry_types();
}
int main(int argc, char **argv)
@@ -543,9 +497,7 @@ int main(int argc, char **argv)
return 1;
}
- which_endian();
-
- cbfs_name = argv[1];
+ param.cbfs_name = argv[1];
char *cmd = argv[2];
optind += 2;
@@ -572,61 +524,72 @@ int main(int argc, char **argv)
switch(c) {
case 'n':
- rom_name = optarg;
+ param.name = optarg;
break;
case 't':
- if (intfiletype(optarg) != ((uint64_t) - 1))
- rom_type = intfiletype(optarg);
- else
- rom_type = strtoul(optarg, NULL, 0);
- if (rom_type == 0)
+ // zero should be reserved for types.
+ param.type = get_cbfs_entry_type(
+ optarg,
+ strtoul(optarg, NULL, 0));
+ if (param.type == 0)
printf("W: Unknown type '%s' ignored\n",
- optarg);
+ optarg);
break;
case 'c':
- if (!strncasecmp(optarg, "lzma", 5))
- rom_algo = CBFS_COMPRESS_LZMA;
- else if (!strncasecmp(optarg, "none", 5))
- rom_algo = CBFS_COMPRESS_NONE;
- else
+ param.algo = get_cbfs_compression(
+ optarg, -1);
+ if (param.algo == -1) {
printf("W: Unknown compression '%s'"
- " ignored.\n", optarg);
+ " ignored.\n", optarg);
+ param.algo = 0;
+ }
break;
case 'b':
- rom_baseaddress = strtoul(optarg, NULL, 0);
+ // base_address may be zero on non-x86, so we
+ // need an explicit "base_address_assigned".
+ param.base_address = strtoul(optarg, NULL, 0);
+ param.base_address_assigned = 1;
break;
case 'l':
- rom_loadaddress = strtoul(optarg, NULL, 0);
+ param.load_address = strtoul(optarg, NULL, 0);
break;
case 'e':
- rom_entrypoint = strtoul(optarg, NULL, 0);
+ param.entrypoint = strtoul(optarg, NULL, 0);
break;
case 's':
- rom_size = strtoul(optarg, &suffix, 0);
+ param.size = strtoul(optarg, &suffix, 0);
if (tolower(suffix[0])=='k') {
- rom_size *= 1024;
+ param.size *= 1024;
}
if (tolower(suffix[0])=='m') {
- rom_size *= 1024 * 1024;
+ param.size *= 1024 * 1024;
}
case 'B':
- rom_bootblock = optarg;
+ param.bootblock_file = optarg;
+ break;
+ case 'H':
+ param.header_offset = strtoul(
+ optarg, NULL, 0);
+ param.header_offset_assigned = 1;
break;
case 'a':
- rom_alignment = strtoul(optarg, NULL, 0);
+ param.alignment = strtoul(optarg, NULL, 0);
break;
case 'o':
- rom_offset = strtoul(optarg, NULL, 0);
+ param.offset = strtoul(optarg, NULL, 0);
break;
case 'f':
- rom_filename = optarg;
+ param.filename = optarg;
+ break;
+ case 'T':
+ param.top_aligned = 1;
break;
case 'v':
verbose++;
break;
case 'm':
- arch = string_to_arch(optarg);
+ INFO("Architecture (-m) is deprecated.\n");
break;
case 'h':
case '?':
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 97bf168..dd53d33 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,767 +20,785 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <assert.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <libgen.h>
+
#include "common.h"
-#include "cbfs.h"
#include "elf.h"
-#define dprintf(x...)
+/* Utilities */
-size_t getfilesize(const char *filename)
+/* Small, OS/libc independent runtime check for endianess */
+int is_big_endian(void)
{
- size_t size;
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return -1;
+ static const uint32_t inttest = 0x12345678;
+ uint8_t inttest_lsb = *(uint8_t *)&inttest;
+ if (inttest_lsb == 0x12) {
+ return 1;
+ }
+ return 0;
+}
- fseek(file, 0, SEEK_END);
- size = ftell(file);
- fclose(file);
- return size;
+uint32_t align_up(uint32_t value, uint32_t align) {
+ if (value % align)
+ value += align - (value % align);
+ return value;
}
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place)
-{
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return NULL;
-
- fseek(file, 0, SEEK_END);
- *romsize_p = ftell(file);
- fseek(file, 0, SEEK_SET);
- if (!content) {
- content = malloc(*romsize_p);
- if (!content) {
- fprintf(stderr, "E: Could not get %d bytes for file %s\n",
- *romsize_p, filename);
- exit(1);
- }
- } else if (place == SEEK_END)
- content -= *romsize_p;
+/* Buffer and file I/O */
+
+int buffer_create(struct buffer *buffer, size_t size, const char *name) {
+ buffer->name = strdup(name);
+ buffer->size = size;
+ buffer->data = (char*)malloc(buffer->size);
+ return (buffer->data == NULL);
+}
+
+int buffer_from_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "rb");
+ if (!fp) {
+ perror(filename);
+ return -1;
+ }
+ fseek(fp, 0, SEEK_END);
+ buffer->size = ftell(fp);
+ buffer->name = strdup(filename);
+ rewind(fp);
+ buffer->data = (char*)malloc(buffer->size);
+ assert(buffer->data);
+ if (fread(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete read: %s\n", filename);
+ fclose(fp);
+ return -1;
+ }
+ fclose(fp);
+ return 0;
+}
- if (!fread(content, *romsize_p, 1, file)) {
- fprintf(stderr, "E: Failed to read %s\n", filename);
- return NULL;
+int buffer_write_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "wb");
+ if (!fp) {
+ perror(filename);
+ return -1;
+ }
+ assert(buffer && buffer->data);
+ if (fwrite(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete write: %s\n", filename);
+ fclose(fp);
+ return -1;
}
- fclose(file);
- return content;
+ fclose(fp);
+ return 0;
}
-static struct cbfs_header *master_header;
-static uint32_t phys_start, phys_end, align;
-uint32_t romsize;
-void *offset;
-uint32_t arch = CBFS_ARCHITECTURE_UNKNOWN;
+int buffer_delete(struct buffer *buffer) {
+ assert(buffer);
+ if (buffer->name) {
+ free(buffer->name);
+ buffer->name = NULL;
+ }
+ if (buffer->data) {
+ free(buffer->data);
+ buffer->data = NULL;
+ }
+ buffer->size = 0;
+ return 0;
+}
-static struct {
- uint32_t arch;
+/* Type and format */
+
+int is_elf_object(const void *input) {
+ Elf32_Ehdr *ehdr = (Elf32_Ehdr *)input;
+ return !memcmp(ehdr->e_ident, ELFMAG, 4);
+}
+
+struct typedesc_t {
+ uint32_t type;
const char *name;
-} arch_names[] = {
- { CBFS_ARCHITECTURE_ARMV7, "armv7" },
- { CBFS_ARCHITECTURE_X86, "x86" },
- { CBFS_ARCHITECTURE_UNKNOWN, "unknown" }
};
-uint32_t string_to_arch(const char *arch_string)
-{
- int i;
- uint32_t ret = CBFS_ARCHITECTURE_UNKNOWN;
+static struct typedesc_t types_cbfs_entry[] = {
+ {CBFS_COMPONENT_STAGE, "stage"},
+ {CBFS_COMPONENT_PAYLOAD, "payload"},
+ {CBFS_COMPONENT_OPTIONROM, "optionrom"},
+ {CBFS_COMPONENT_BOOTSPLASH, "bootsplash"},
+ {CBFS_COMPONENT_RAW, "raw"},
+ {CBFS_COMPONENT_VSA, "vsa"},
+ {CBFS_COMPONENT_MBI, "mbi"},
+ {CBFS_COMPONENT_MICROCODE, "microcode"},
+ {CBFS_COMPONENT_CMOS_DEFAULT, "cmos_default"},
+ {CBFS_COMPONENT_CMOS_LAYOUT, "cmos_layout"},
+ {CBFS_COMPONENT_DELETED, "deleted"},
+ {CBFS_COMPONENT_NULL, "null"},
+ {0, NULL},
+};
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (!strcasecmp(arch_string, arch_names[i].name)) {
- ret = arch_names[i].arch;
- break;
- }
- }
+static struct typedesc_t types_cbfs_compression[] = {
+ {CBFS_COMPRESS_NONE, "none"},
+ {CBFS_COMPRESS_LZMA, "LZMA"},
+ {0, NULL},
+};
- return ret;
+uint32_t lookup_type_by_name(struct typedesc_t *desc, const char *name,
+ uint32_t default_value) {
+ int i;
+ for (i = 0; desc[i].name; i++)
+ if (strcmp(desc[i].name, name) == 0)
+ return desc[i].type;
+ return default_value;
}
-const char *arch_to_string(uint32_t a)
-{
+const char *lookup_name_by_type(struct typedesc_t *desc, uint32_t type,
+ const char *default_value) {
int i;
- const char *ret = NULL;
+ for (i = 0; desc[i].name; i++)
+ if (desc[i].type == type)
+ return desc[i].name;
+ return default_value;
+}
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (a == arch_names[i].arch) {
- ret = arch_names[i].name;
- break;
- }
- }
+uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value) {
+ return lookup_type_by_name(types_cbfs_entry, name, default_value);
+}
- return ret;
+const char *get_cbfs_entry_type_name(uint32_t type) {
+ return lookup_name_by_type(types_cbfs_entry, type, "(unknown)");
+}
+uint32_t get_cbfs_compression(const char *name, uint32_t unknown) {
+ return lookup_type_by_name(types_cbfs_compression, name, unknown);
}
-int find_master_header(void *romarea, size_t size)
-{
- size_t offset;
+void print_all_cbfs_entry_types(void) {
+ size_t i, total = ARRAY_SIZE(types_cbfs_entry);
- if (master_header)
- return 0;
+ for (i = 0; i < total; i++) {
+ printf(" %s%c", types_cbfs_entry[i].name,
+ (i + 1 == total) ? '\n' : ',');
+ if ((i + 1) % 8 == 0)
+ printf("\n");
+ }
+}
- for (offset = 0; offset < size - sizeof(struct cbfs_header); offset++) {
- struct cbfs_header *tmp = romarea + offset;
+/* CBFS image processing */
- if (tmp->magic == ntohl(CBFS_HEADER_MAGIC)) {
- master_header = tmp;
- break;
- }
- }
+/* The file name align is not defined in CBFS spec -- only a preference by
+ * (old) cbfstool. */
+#define CBFS_FILENAME_ALIGN (16)
- return master_header ? 0 : 1;
-}
+/* To make CBFS more friendly to ROM, fill -1 (0xFF) instead of zero. */
+#define CBFS_CONTENT_DEFAULT_VALUE (-1)
-void recalculate_rom_geometry(void *romarea)
+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)
{
- if (find_master_header(romarea, romsize)) {
- fprintf(stderr, "E: Cannot find master header\n");
- exit(1);
- }
+ struct cbfs_header *header;
+ struct cbfs_file *entry;
+ uint32_t cbfs_len;
- /* Update old headers */
- if (master_header->version == CBFS_HEADER_VERSION1 &&
- ntohl(master_header->architecture) == CBFS_ARCHITECTURE_UNKNOWN) {
- dprintf("Updating CBFS master header to version 2\n");
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
- }
+ DEBUG("cbfs_create_image: bootblock=0x%x+0x%zx, "
+ "header=0x%x+0x%zx, entries_offset=0x%x\n",
+ bootblock_offset, bootblock->size,
+ header_offset, sizeof(*header), entries_offset);
- arch = ntohl(master_header->architecture);
-
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- offset = romarea;
- phys_start = (0 + ntohl(master_header->offset)) & 0xffffffff;
- phys_end = romsize & 0xffffffff;
- break;
- case CBFS_ARCHITECTURE_X86:
- offset = romarea + romsize - 0x100000000ULL;
- phys_start = (0 - romsize + ntohl(master_header->offset)) &
- 0xffffffff;
- phys_end = (0 - ntohl(master_header->bootblocksize) -
- sizeof(struct cbfs_header)) & 0xffffffff;
- break;
- default:
- fprintf(stderr, "E: Unknown architecture\n");
- exit(1);
+ if (buffer_create(&image->buffer, size, "(new)") != 0) {
+ ERROR("Cannot allocate memory for %zd bytes.\n", size);
+ return -1;
}
+ image->header = NULL;
+ memset(image->buffer.data, CBFS_CONTENT_DEFAULT_VALUE, size);
- align = ntohl(master_header->align);
-}
+ // Adjust legcay top-aligned address to ROM offset.
+ if (IS_TOP_ALIGNED_ADDRESS(entries_offset))
+ entries_offset += (int32_t)size;
+ if (IS_TOP_ALIGNED_ADDRESS(bootblock_offset))
+ bootblock_offset += (int32_t)size;
+ if (IS_TOP_ALIGNED_ADDRESS(header_offset))
+ header_offset += (int32_t) size;
-void *loadrom(const char *filename)
-{
- void *romarea = loadfile(filename, &romsize, 0, SEEK_SET);
- if (romarea == NULL)
- return NULL;
- recalculate_rom_geometry(romarea);
- return romarea;
-}
+ DEBUG("cbfs_create_image: (real offset) bootblock=0x%x, "
+ "header=0x%x, entries_offset=0x%x\n",
+ bootblock_offset, header_offset, entries_offset);
-int writerom(const char *filename, void *start, uint32_t size)
-{
- FILE *file = fopen(filename, "wb");
- if (!file) {
- fprintf(stderr, "Could not open '%s' for writing: ", filename);
- perror("");
- return 1;
- }
+ if (align == 0)
+ align = 64; // default align size.
- if (fwrite(start, size, 1, file) != 1) {
- fprintf(stderr, "Could not write to '%s': ", filename);
- perror("");
- return 1;
+ // Prepare bootblock
+ if (bootblock_offset + bootblock->size > size) {
+ ERROR("Bootblock (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ bootblock_offset, bootblock->size, size);
+ return -1;
}
+ memcpy(image->buffer.data + bootblock_offset, bootblock->data,
+ bootblock->size);
- fclose(file);
+ // Prepare header
+ if (header_offset + sizeof(*header) > size) {
+ ERROR("Header (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ header_offset, sizeof(*header), size);
+ return -1;
+ }
+ header = (struct cbfs_header*)(image->buffer.data + header_offset);
+ image->header = header;
+ header->magic = htonl(CBFS_HEADER_MAGIC);
+ header->version = htonl(CBFS_HEADER_VERSION);
+ header->romsize = htonl(size);
+ header->bootblocksize = htonl(bootblock->size);
+ header->align = htonl(align);
+ header->offset = htonl(entries_offset);
+
+ // Prepare entries
+ if (align_up(entries_offset, align) != entries_offset) {
+ ERROR("Offset (0x%x) must be aligned to 0x%x.\n",
+ entries_offset, align);
+ return -1;
+ }
+ if (entries_offset + sizeof(*entry) > size) {
+ ERROR("Offset (0x%x+0x%zx) exceed ROM size(0x%zx)\n",
+ entries_offset, sizeof(*entry), size);
+ return -1;
+ }
+ entry = (struct cbfs_file*)(image->buffer.data + entries_offset);
+ // To calculate available length, find
+ // e = min(bootblock, header, size) where e > entries_offset.
+ cbfs_len = size;
+ if (bootblock_offset > entries_offset && bootblock_offset < cbfs_len)
+ cbfs_len = bootblock_offset;
+ if (header_offset > entries_offset && header_offset < cbfs_len)
+ cbfs_len = header_offset;
+ cbfs_len -= entries_offset + align;
+ cbfs_create_entry(image, entry, cbfs_len, "");
+ LOG("Created CBFS image (capacity = %d bytes)\n", cbfs_len);
return 0;
}
-int cbfs_file_header(unsigned long physaddr)
-{
- /* maybe improve this test */
- return (strncmp(phys_to_virt(physaddr), "LARCHIVE", 8) == 0);
-}
-
-struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size)
-{
- struct cbfs_file *nextfile = (struct cbfs_file *)phys_to_virt(physaddr);
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(size);
- nextfile->type = htonl(0xffffffff);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(sizeof(struct cbfs_file) + 16);
- memset(((void *)nextfile) + sizeof(struct cbfs_file), 0, 16);
- return nextfile;
-}
+static int cbfs_fix_legacy_size(struct cbfs_image *image) {
+ // A bug in old CBFStool may produce extra few bytes (by alignment) and
+ // cause cbfstool to overwrite things after free space -- which is
+ // usually CBFS header on x86. We need to workaround that.
-int iself(unsigned char *input)
-{
- Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
- return !memcmp(ehdr->e_ident, ELFMAG, 4);
+ struct cbfs_file *entry, *first = NULL, *last = NULL;
+ for (first = entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ last = entry;
+ }
+ if ((char*)first < (char*)image->header &&
+ (char*)entry > (char*)image->header) {
+ WARN("CBFS image was created with old cbfstool with size bug. "
+ "Fixing size in last entry...\n");
+ last->len = htonl(ntohl(last->len) -
+ ntohl(image->header->align));
+ DEBUG("Last entry has been changed from 0x%x to 0x%x.\n",
+ cbfs_get_entry_addr(image, entry),
+ cbfs_get_entry_addr(image,
+ cbfs_find_next_entry(image, last)));
+ }
+ return 0;
}
-static struct filetypes_t {
- uint32_t type;
- const char *name;
-} filetypes[] = {
- {CBFS_COMPONENT_STAGE, "stage"},
- {CBFS_COMPONENT_PAYLOAD, "payload"},
- {CBFS_COMPONENT_OPTIONROM, "optionrom"},
- {CBFS_COMPONENT_BOOTSPLASH, "bootsplash"},
- {CBFS_COMPONENT_RAW, "raw"},
- {CBFS_COMPONENT_VSA, "vsa"},
- {CBFS_COMPONENT_MBI, "mbi"},
- {CBFS_COMPONENT_MICROCODE, "microcode"},
- {CBFS_COMPONENT_CMOS_DEFAULT, "cmos default"},
- {CBFS_COMPONENT_CMOS_LAYOUT, "cmos layout"},
- {CBFS_COMPONENT_DELETED, "deleted"},
- {CBFS_COMPONENT_NULL, "null"}
-};
-
-void print_supported_filetypes(void)
-{
- int i, number = ARRAY_SIZE(filetypes);
-
- for (i=0; i<number; i++) {
- printf(" %s%c", filetypes[i].name, (i==(number-1))?'\n':',');
- if ((i%8) == 7)
- printf("\n");
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename) {
+ if (buffer_from_file(&image->buffer, filename) != 0)
+ return -1;
+ DEBUG("read_cbfs_image: %s (%zd bytes)\n", image->buffer.name,
+ image->buffer.size);
+ image->header = cbfs_find_header(image->buffer.data,
+ image->buffer.size);
+ if (!image->header) {
+ ERROR("%s does not have CBFS master header.\n", filename);
+ cbfs_image_delete(image);
+ return -1;
}
+
+ cbfs_fix_legacy_size(image);
+ return 0;
}
-const char *strfiletype(uint32_t number)
-{
- size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (filetypes[i].type == number)
- return filetypes[i].name;
- return "unknown";
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename) {
+ assert(image && image->buffer.data);
+ return buffer_write_file(&image->buffer, filename);
}
-uint64_t intfiletype(const char *name)
-{
- size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (strcmp(filetypes[i].name, name) == 0)
- return filetypes[i].type;
- return -1;
+int cbfs_image_delete(struct cbfs_image *image) {
+ buffer_delete(&image->buffer);
+ image->header = NULL;
+ return 0;
}
-void print_cbfs_directory(const char *filename)
-{
- printf
- ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n"
- "alignment: %d bytes, architecture: %s\n\n",
- basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize),
- romsize, ntohl(master_header->offset), align, arch_to_string(arch));
- printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
- if (strlen(fname) == 0)
- fname = "(empty)";
-
- printf("%-30s 0x%-8x %-12s %d\n", fname,
- current - phys_start + ntohl(master_header->offset),
- strfiletype(ntohl(thisfile->type)), length);
-
- /* note the components of the subheader are in host order ... */
- switch (ntohl(thisfile->type)) {
- case CBFS_COMPONENT_STAGE:
- {
- struct cbfs_stage *stage = CBFS_SUBHEADER(thisfile);
- dprintf(" %s compression, entry: 0x%llx, load: 0x%llx, length: %d/%d\n",
- stage->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- (unsigned long long)stage->entry,
- (unsigned long long)stage->load,
- stage->len,
- stage->memlen);
- break;
- }
- case CBFS_COMPONENT_PAYLOAD:
- {
- struct cbfs_payload_segment *payload = CBFS_SUBHEADER(thisfile);
- while(payload) {
- switch(payload->type) {
- case PAYLOAD_SEGMENT_CODE:
- case PAYLOAD_SEGMENT_DATA:
- dprintf(" %s (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d)\n",
- payload->type == PAYLOAD_SEGMENT_CODE ? "code " : "data" ,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len), ntohl(payload->mem_len));
- break;
- case PAYLOAD_SEGMENT_ENTRY:
- dprintf(" entry (0x%llx)\n", (unsigned long long)ntohll(payload->load_addr));
- break;
- case PAYLOAD_SEGMENT_BSS:
- dprintf(" BSS (address 0x%016llx, length 0x%x)\n", (unsigned long long)ntohll(payload->load_addr), ntohl(payload->len));
- break;
- case PAYLOAD_SEGMENT_PARAMS:
- dprintf(" parameters\n");
- break;
- default:
- dprintf(" %x (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d\n",
- payload->type,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len),
- ntohl(payload->mem_len));
- break;
- }
+/* Splits an empty entry at given offset. */
+int cbfs_split_empty_entry(struct cbfs_image *image,
+ struct cbfs_file *entry,
+ uint32_t offset) {
+ struct cbfs_file *next = cbfs_find_next_entry(image, entry);
+ uint32_t addr = cbfs_get_entry_addr(image, entry),
+ addr_next = cbfs_get_entry_addr(image, next);
+ size_t min_entry_size = sizeof(*entry) + CBFS_FILENAME_ALIGN;
+ size_t len;
+
+ assert(addr < offset && addr_next <= offset);
+ if (offset - addr < min_entry_size) {
+ ERROR("No space between previous entry 0x%x and offset 0x%x.\n",
+ addr, offset);
+ return -1;
+ }
+ if (addr_next - offset < min_entry_size) {
+ ERROR("No space between offset 0x%x and entry 0x%x\n",
+ offset, addr_next);
+ return -1;
+ }
+ cbfs_create_entry(image, entry, 0, "");
+ len = offset - addr - ntohl(entry->offset);
+ entry->len = htonl(len);
+ if (verbose > 1)
+ cbfs_print_entry_info(image, entry, NULL);
+
+ entry = cbfs_find_next_entry(image, entry);
+ addr = cbfs_get_entry_addr(image, entry);
+ cbfs_create_entry(image, entry, 0, "");
+ len = addr_next - offset - ntohl(entry->offset);
+ entry->len = htonl(len);
+ if (verbose > 1)
+ cbfs_print_entry_info(image, entry, NULL);
+ assert(cbfs_get_entry_addr(image, cbfs_find_next_entry(image, entry)) ==
+ addr_next);
+ return 0;
+}
- if(payload->type == PAYLOAD_SEGMENT_ENTRY)
- payload=NULL;
- else
- payload++;
- }
- break;
+int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer,
+ const char *name, uint32_t type, uint32_t offset) {
+ uint32_t entry_type, entry_capacity;
+ uint32_t addr;
+ struct cbfs_file *entry, *next;
+ uint32_t need_size, new_size;
+
+ need_size = (sizeof(*entry) + buffer->size +
+ align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN));
+ DEBUG("cbfs_add_entry('%s', %zd) => need_size = %u\n",
+ name, buffer->size, need_size);
+
+ // Check if offset is valid.
+ if (offset) {
+ uint32_t align = ntohl(image->header->align),
+ romsize = ntohl(image->header->romsize);
+ if (offset % align != 0) {
+ ERROR("Target address (0x%x) is not aligned to CBFS "
+ "image align (0x%x). It's impossible to add entry "
+ "in that location.\n", offset, align);
+ return -1;
}
- default:
- break;
+ // legacy cbfstool takes top-aligned address.
+ if (IS_TOP_ALIGNED_ADDRESS(offset)) {
+ INFO("Converting top-aligned address 0x%x to offset: "
+ " 0x%x\n", offset, offset - romsize);
+ offset += romsize;
}
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
}
-}
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath)
-{
- FILE *outfile = NULL;
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
+ // Merge empty entries.
+ DEBUG("(trying to merge empty entries...)\n");
+ cbfs_walk(image, cbfs_merge_empty_entry, NULL);
- // Locate the file start struct
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- // And its length
- uint32_t length = ntohl(thisfile->len);
- // Locate the file name
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
-
- // It's not the file we are looking for..
- if (strcmp(fname, payloadname) != 0)
- {
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+
+ entry_type = ntohl(entry->type);
+ if (entry_type != CBFS_COMPONENT_DELETED &&
+ entry_type != CBFS_COMPONENT_NULL)
continue;
- }
- // Else, it's our file.
- printf("Found file %.30s at 0x%x, type %.12s, size %d\n", fname,
- current - phys_start, strfiletype(ntohl(thisfile->type)),
- length);
-
- // If we are not dumping to stdout, open the out file.
- outfile = fopen(outpath, "wb");
- if (!outfile)
- {
- fprintf(stderr, "E: Could not open the file %s for writing.\n", outpath);
- return 1;
+ addr = cbfs_get_entry_addr(image, entry);
+ if (offset && addr > offset) {
+ ERROR("Not available to add component in 0x%x.\n",
+ offset);
+ return -1;
}
- if (ntohl(thisfile->type) != CBFS_COMPONENT_RAW)
- {
- fprintf(stderr, "W: Only 'raw' files are safe to extract.\n");
+ next = cbfs_find_next_entry(image, entry);
+ entry_capacity = cbfs_get_entry_addr(image, next) - addr;
+ if (offset && (addr + entry_capacity) <= offset) {
+ DEBUG("Skip entry 0x%x before specified offset 0x%x.\n",
+ addr, offset);
+ continue;
}
- fwrite(((char *)thisfile)
- + ntohl(thisfile->offset), length, 1, outfile);
+ DEBUG("cbfs_add_entry: space %s at 0x%x, %d bytes\n",
+ get_cbfs_entry_type_name(entry_type), addr,
+ entry_capacity);
+ if (entry_capacity < need_size)
+ continue;
- fclose(outfile);
- printf("Successfully dumped the file.\n");
+ // Should we create an empty partition before target offset?
+ if (offset && addr != offset) {
+ DEBUG("Split empty entry at 0x%x\n", addr);
+ if (cbfs_split_empty_entry(image, entry, offset) != 0) {
+ ERROR("Can't split empty entry for 0x%x\n",
+ offset);
+ return -1;
+ }
+ assert(cbfs_get_entry_addr(
+ image,
+ cbfs_find_next_entry(image, entry)) ==
+ addr);
+ continue;
+ }
- // We'll only dump one file.
+ DEBUG("Filling new entry data (%zd bytes).\n", buffer->size);
+ cbfs_create_entry(image, entry, buffer->size, name);
+ entry->type = htonl(type);
+ memcpy(CBFS_SUBHEADER(entry), buffer->data, buffer->size);
+ if (verbose)
+ cbfs_print_entry_info(image, entry, NULL);
+
+ // setup new entry
+ DEBUG("Seting new empty entry.\n");
+ entry = cbfs_find_next_entry(image, entry);
+ new_size = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ new_size -= sizeof(*entry) + CBFS_FILENAME_ALIGN;
+ DEBUG("new size: %d\n", new_size);
+ cbfs_create_entry(image, entry, new_size, "");
+ if (verbose)
+ cbfs_print_entry_info(image, entry, NULL);
return 0;
}
- fprintf(stderr, "E: File %s not found.\n", payloadname);
- return 1;
+
+ ERROR("Could not add [%s, %zd bytes (%zd KB)]; probably too big?\n",
+ buffer->name, buffer->size, buffer->size / 1024);
+ return 0;
}
+int cbfs_remove_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry, *next;
+ size_t len;
+ entry = cbfs_get_entry(image, name);
+ if (!entry) {
+ ERROR("CBFS file %s not found.\n", name);
+ return -1;
+ }
+ next = cbfs_find_next_entry(image, entry);
+ assert(next);
+ DEBUG("cbfs_remove_entry: Removed %s @ 0x%x\n",
+ CBFS_NAME(entry), cbfs_get_entry_addr(image, entry));
+ entry->type = htonl(CBFS_COMPONENT_DELETED);
+ len = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ entry->offset = htonl(sizeof(*entry) + CBFS_FILENAME_ALIGN);
+ entry->len = htonl(len - ntohl(entry->offset));
+ memset(CBFS_NAME(entry), 0, CBFS_FILENAME_ALIGN);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE,
+ ntohl(entry->len));
+ return 0;
+}
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location)
-{
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ if (strcasecmp(CBFS_NAME(entry), name) == 0) {
+ DEBUG("cbfs_get_entry: found %s\n", name);
+ return entry;
}
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
-
- dprintf("at %x, %x bytes\n", current, length);
- /* Is this a free chunk? */
- if ((thisfile->type == CBFS_COMPONENT_DELETED)
- || (thisfile->type == CBFS_COMPONENT_NULL)) {
- dprintf("null||deleted at %x, %x bytes\n", current,
- length);
- /* if this is the right size, and if specified, the right location, use it */
- if ((contentsize <= length)
- && ((location == 0) || (current == location))) {
- if (contentsize < length) {
- dprintf
- ("this chunk is %x bytes, we need %x. create a new chunk at %x with %x bytes\n",
- length, contentsize,
- ALIGN(current + contentsize,
- align),
- length - contentsize);
- uint32_t start =
- ALIGN(current + contentsize, align);
- uint32_t size =
- current + ntohl(thisfile->offset)
- + length - start - 16 -
- sizeof(struct cbfs_file);
- cbfs_create_empty_file(start, size);
- }
- dprintf("copying data\n");
- memcpy(phys_to_virt(current), content,
- contentsize);
- return 0;
- }
- if (location != 0) {
- /* CBFS has the constraint that the chain always moves up in memory. so once
- we're past the place we seek, we don't need to look any further */
- if (current > location) {
- fprintf
- (stderr, "E: The requested space is not available\n");
- return 1;
- }
-
- /* Is the requested location inside the current chunk? */
- if ((current < location)
- && ((location + contentsize) <=
- (current + length))) {
- /* Split it up. In the next iteration the code will be at the right place. */
- dprintf("split up. new length: %x\n",
- location - current -
- ntohl(thisfile->offset));
- thisfile->len =
- htonl(location - current -
- ntohl(thisfile->offset));
- cbfs_create_empty_file(location,
- length -
- (location -
- current));
- }
- }
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
}
- fprintf(stderr, "E: Could not add the file to CBFS, it's probably too big.\n");
- fprintf(stderr, "E: File size: %d bytes (%d KB).\n", contentsize, contentsize/1024);
- return 1;
+ return NULL;
}
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename) {
+ struct cbfs_file *entry = cbfs_get_entry(image, entry_name);
+ struct buffer buffer;
+ if (!entry) {
+ ERROR("File not found: %s\n", entry_name);
+ return -1;
+ }
+ LOG("Found file %.30s at 0x%x, type %.12s, size %d\n",
+ entry_name, cbfs_get_entry_addr(image, entry),
+ get_cbfs_entry_type_name(ntohl(entry->type)), ntohl(entry->len));
-static struct cbfs_file *merge_adjacent_files(struct cbfs_file *first,
- struct cbfs_file *second)
-{
- uint32_t new_length =
- ntohl(first->len) + ntohl(second->len) + ntohl(second->offset);
- first->len = htonl(new_length);
- first->checksum = 0; // FIXME?
- return first;
+ if (ntohl(entry->type) != CBFS_COMPONENT_RAW) {
+ WARN("Only 'raw' files are safe to extract.\n");
+ }
+
+ buffer.data = CBFS_SUBHEADER(entry);
+ buffer.size = ntohl(entry->len);
+ buffer.name = "(cbfs_export_entry)";
+ if (buffer_write_file(&buffer, filename) != 0) {
+ ERROR("Failed to write %s into %s.\n",
+ entry_name, filename);
+ return -1;
+ }
+ INFO("Successfully dumped the file to: %s\n", filename);
+ return 0;
}
-static struct cbfs_file *next_file(struct cbfs_file *prev)
-{
- uint32_t pos = (prev == NULL) ? phys_start :
- ALIGN(virt_to_phys(prev) + ntohl(prev->len) + ntohl(prev->offset),
- align);
+/* basename(3) may modify buffer, so we want a tiny alternative. */
+static const char *simple_basename(const char *name) {
+ const char *slash = strrchr(name, '/');
+ if (slash)
+ return slash + 1;
+ else
+ return name;
+}
- for (; pos < phys_end; pos += align) {
- if (cbfs_file_header(pos))
- return (struct cbfs_file *)phys_to_virt(pos);
- }
- return NULL;
+int cbfs_print_header_info(struct cbfs_image *image) {
+ assert(image && image->header);
+ printf("%s: %zd kB, bootblocksize %d, romsize %d, offset 0x%x\n"
+ "alignment: %d bytes\n\n",
+ simple_basename(image->buffer.name),
+ image->buffer.size / 1024,
+ ntohl(image->header->bootblocksize),
+ ntohl(image->header->romsize),
+ ntohl(image->header->offset),
+ ntohl(image->header->align));
+ return 0;
}
+static int cbfs_print_stage_info(struct cbfs_stage *stage) {
+ printf(" %s compression, entry: 0x%" PRIx64 ", load: 0x%" PRIx64 ", "
+ "length: %d/%d\n",
+ lookup_name_by_type(types_cbfs_compression,
+ stage->compression, "(unknown)"),
+ stage->entry,
+ stage->load,
+ stage->len,
+ stage->memlen);
+ return 0;
+}
-int remove_file_from_cbfs(const char *filename)
+static int cbfs_print_payload_segment_info(struct cbfs_payload_segment *payload)
{
- struct cbfs_file *prev = NULL;
- struct cbfs_file *cur = next_file(prev);
- struct cbfs_file *next = next_file(cur);
- for (; cur; prev = cur, cur = next, next = next_file(next)) {
-
- /* Check if this is the file to remove. */
- char *name = (char *)cur + sizeof(*cur);
- if (strcmp(name, filename))
- continue;
+ switch(payload->type) {
+ case PAYLOAD_SEGMENT_CODE:
+ case PAYLOAD_SEGMENT_DATA:
+ printf(" %s (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d)\n",
+ (payload->type == PAYLOAD_SEGMENT_CODE ?
+ "code " : "data"),
+ lookup_name_by_type(types_cbfs_compression,
+ payload->compression,
+ "(unknown)"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len), ntohl(payload->mem_len));
+ break;
- /* Mark the file as free space and erase its name. */
- cur->type = CBFS_COMPONENT_NULL;
- name[0] = '\0';
+ case PAYLOAD_SEGMENT_ENTRY:
+ printf(" entry (0x%" PRIx64 ")\n",
+ ntohll(payload->load_addr));
+ break;
- /* Merge it with the previous file if possible. */
- if (prev && prev->type == CBFS_COMPONENT_NULL)
- cur = merge_adjacent_files(prev, cur);
+ case PAYLOAD_SEGMENT_BSS:
+ printf(" BSS (address 0x%016" PRIx64 ", "
+ "length 0x%x)\n",
+ ntohll(payload->load_addr),
+ ntohl(payload->len));
+ break;
- /* Merge it with the next file if possible. */
- if (next && next->type == CBFS_COMPONENT_NULL)
- merge_adjacent_files(cur, next);
+ case PAYLOAD_SEGMENT_PARAMS:
+ printf(" parameters\n");
+ break;
- return 0;
+ default:
+ printf(" 0x%x (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d\n",
+ payload->type,
+ lookup_name_by_type(types_cbfs_compression,
+ payload->compression,
+ "(unknown)"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len),
+ ntohl(payload->mem_len));
+ break;
}
- fprintf(stderr, "E: CBFS file %s not found.\n", filename);
- return 1;
+ return 0;
}
-
-/* returns new data block with cbfs_file header, suitable to dump into the ROM. location returns
- the new location that points to the cbfs_file header */
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location)
-{
- uint32_t filename_len = ALIGN(strlen(filename) + 1, 16);
- uint32_t headersize = sizeof(struct cbfs_file) + filename_len;
- if ((location != 0) && (*location != 0)) {
- uint32_t offset = *location % align;
- /* If offset >= (headersize % align), we can stuff the header into the offset.
- Otherwise the header has to be aligned itself, and put before the offset data */
- if (offset >= (headersize % align)) {
- offset -= (headersize % align);
- } else {
- offset += align - (headersize % align);
- }
- headersize += offset;
- *location -= headersize;
- }
- void *newdata = malloc(*datasize + headersize);
- if (!newdata) {
- fprintf(stderr, "E: Could not get %d bytes for CBFS file.\n", *datasize +
- headersize);
- exit(1);
- }
- memset(newdata, 0xff, *datasize + headersize);
- struct cbfs_file *nextfile = (struct cbfs_file *)newdata;
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(*datasize);
- nextfile->type = htonl(type);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(headersize);
- strcpy(newdata + sizeof(struct cbfs_file), filename);
- memcpy(newdata + headersize, data, *datasize);
- *datasize += headersize;
- return newdata;
-}
-
-int create_cbfs_image(const char *romfile, uint32_t _romsize,
- const char *bootblock, uint32_t align, uint32_t offs)
-{
- uint32_t bootblocksize = 0;
- struct cbfs_header *master_header;
- unsigned char *romarea, *bootblk;
-
- romsize = _romsize;
- romarea = malloc(romsize);
- if (!romarea) {
- fprintf(stderr, "E: Could not get %d bytes of memory"
- " for CBFS image.\n", romsize);
- exit(1);
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ const char *name = CBFS_NAME(entry);
+ struct cbfs_payload_segment *payload;
+ if (!cbfs_is_valid_entry(entry)) {
+ ERROR("cbfs_print_entry_info: Invalid entry at 0x%x\n",
+ cbfs_get_entry_addr(image, entry));
+ return -1;
}
- memset(romarea, 0xff, romsize);
- if (align == 0)
- align = 64;
-
- bootblk = loadfile(bootblock, &bootblocksize,
- romarea + romsize, SEEK_END);
- if (!bootblk) {
- fprintf(stderr, "E: Could not load bootblock %s.\n",
- bootblock);
- free(romarea);
- return 1;
- }
+ printf("%-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));
+
+ if (!verbose)
+ return 0;
+
+ /* note the components of the subheader may be in host order ... */
+ switch (ntohl(entry->type)) {
+ case CBFS_COMPONENT_STAGE:
+ cbfs_print_stage_info((struct cbfs_stage*)
+ CBFS_SUBHEADER(entry));
+ break;
- // TODO(hungte) Replace magic numbers by named constants.
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- /* Set up physical/virtual mapping */
- offset = romarea;
-
- /*
- * The initial jump instruction and bootblock will be placed
- * before and after the master header, respectively. The
- * bootblock image must contain a blank, aligned region large
- * enough for the master header to fit.
- *
- * An anchor string must be left such that when cbfstool is run
- * we can find it and insert the master header at the next
- * aligned boundary.
- */
- loadfile(bootblock, &bootblocksize, romarea + offs, SEEK_SET);
-
- unsigned char *p = romarea + offs;
- while (1) {
- /* FIXME: assumes little endian... */
- if (*(uint32_t *)p == 0xdeadbeef)
- break;
- if (p >= (romarea + _romsize)) {
- fprintf(stderr, "E: Could not determine CBFS "
- "header location.\n", bootblock);
- return 1;
+ case CBFS_COMPONENT_PAYLOAD:
+ payload = (struct cbfs_payload_segment*)
+ CBFS_SUBHEADER(entry);
+ while (payload) {
+ cbfs_print_payload_segment_info(payload);
+ if (payload->type == PAYLOAD_SEGMENT_ENTRY)
+ break;
+ else
+ payload ++;
}
- p += (sizeof(unsigned int));
- }
- unsigned int u = ALIGN((unsigned int)(p - romarea), align);
- master_header = (struct cbfs_header *)(romarea + u);
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(
- ALIGN((0x40 + bootblocksize), align));
- master_header->architecture = htonl(CBFS_ARCHITECTURE_ARMV7);
-
- ((uint32_t *) phys_to_virt(0x4 + offs))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file(
- offs + ALIGN((0x40 + bootblocksize), align),
- romsize - offs - sizeof(struct cbfs_file) -
- ALIGN((bootblocksize + 0x40), align));
- break;
-
- case CBFS_ARCHITECTURE_X86:
- // Set up physical/virtual mapping
- offset = romarea + romsize - 0x100000000ULL;
-
- loadfile(bootblock, &bootblocksize, romarea + romsize,
- SEEK_END);
- master_header = (struct cbfs_header *)(romarea + romsize -
- bootblocksize - sizeof(struct cbfs_header));
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(offs);
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
-
- ((uint32_t *) phys_to_virt(CBFS_HEADPTR_ADDR_X86))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff,
- romsize - offs - bootblocksize -
- sizeof(struct cbfs_header) -
- sizeof(struct cbfs_file) - 16);
- break;
-
- default:
- // Should not happen.
- fprintf(stderr, "E: You found a bug in cbfstool.\n");
- exit(1);
+ break;
+ default:
+ break;
}
-
- writerom(romfile, romarea, romsize);
- free(romarea);
return 0;
}
-static int in_segment(int addr, int size, int gran)
-{
- return ((addr & ~(gran - 1)) == ((addr + size) & ~(gran - 1)));
+int cbfs_print_directory(struct cbfs_image *image) {
+ cbfs_print_header_info(image);
+ printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
+ cbfs_walk(image, cbfs_print_entry_info, NULL);
+ return 0;
}
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t alignment)
-{
- void *rom;
- size_t filename_size, headersize, totalsize;
- int ret = 0;
- uint32_t current;
-
- rom = loadrom(romfile);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- romfile);
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ struct cbfs_file *next, *last;
+ uint32_t type;
+ size_t newlen;
+ type = ntohl(entry->type);
+ if (type != CBFS_COMPONENT_NULL && type != CBFS_COMPONENT_DELETED)
+ return 0;
+ next = cbfs_find_next_entry(image, entry);
+ if (!next || !cbfs_is_valid_entry(next))
+ return -1;
+ last = cbfs_find_next_entry(image, next);
+ assert(last);
+ type = ntohl(next->type);
+ if (type != CBFS_COMPONENT_NULL && type != CBFS_COMPONENT_DELETED)
return 0;
- }
- filename_size = strlen(filename);
- headersize = sizeof(struct cbfs_file) + ALIGN(filename_size + 1, 16) +
- sizeof(struct cbfs_stage);
- totalsize = headersize + filesize;
+ // Now, we find two deleted/empty entries; try to merge now.
+ DEBUG("cbfs_join_empty_entry: combine 0x%x+0x%x and 0x%x+0x%x.\n",
+ cbfs_get_entry_addr(image, entry), ntohl(entry->len),
+ cbfs_get_entry_addr(image, next), ntohl(next->len));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ newlen = (cbfs_get_entry_addr(image, last) -
+ cbfs_get_entry_addr(image, entry) - ntohl(entry->offset));
+ entry->len = htonl(newlen);
+ DEBUG("new empty entry: length=0x%zx\n", newlen);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, newlen);
+ // TODO we should try again until no more entries are found...
+ return 0;
+}
- current = phys_start;
- while (current < phys_end) {
- uint32_t top;
- struct cbfs_file *thisfile;
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback,
+ void *arg) {
+ int count = 0;
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ count ++;
+ if (callback(image, entry, arg) != 0)
+ break;
+ }
+ return count;
+}
- if (!cbfs_file_header(current)) {
- current += align;
+struct cbfs_header *cbfs_find_header(char *data, size_t size) {
+ size_t offset;
+ int found = 0;
+ uint32_t x86sig;
+ struct cbfs_header *header, *result = NULL;
+
+ // Try x86 style (check signature in bottom) header first.
+ x86sig = *(uint32_t*)(data + size - sizeof(uint32_t));
+ offset = (x86sig + (uint32_t)size);
+ DEBUG("x86sig: 0x%x, offset: 0x%zx\n", x86sig, offset);
+ if (offset >= size - sizeof(*header) ||
+ ntohl(((struct cbfs_header*)(data + offset))->magic) !=
+ CBFS_HEADER_MAGIC)
+ offset = 0;
+
+ for (; offset + sizeof(*header) < size; offset++) {
+ header = (struct cbfs_header*)(data + offset);
+ if (ntohl(header->magic) !=(CBFS_HEADER_MAGIC))
+ continue;
+ if (ntohl(header->version) != CBFS_HEADER_VERSION1 &&
+ ntohl(header->version) != CBFS_HEADER_VERSION2) {
+ // Probably not a real CBFS header?
continue;
}
+ found++;
+ result = header;
+ }
+ if (found > 1) {
+ ERROR("multiple (%d) CBFS headers found!\n",
+ found);
+ result = NULL;
+ }
+ return result;
+}
- thisfile = (struct cbfs_file *)phys_to_virt(current);
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image) {
+ assert(image && image->header);
+ return (struct cbfs_file*)(image->buffer.data +
+ ntohl(image->header->offset));
+}
- top = current + ntohl(thisfile->len) + ntohl(thisfile->offset);
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry) {
+ uint32_t addr = cbfs_get_entry_addr(image, entry);
+ int align = ntohl(image->header->align);
+ assert(entry && cbfs_is_valid_entry(entry));
+ addr += ntohl(entry->offset) + ntohl(entry->len);
+ addr = align_up(addr, align);
+ return (struct cbfs_file*)(image->buffer.data + addr);
+}
- if (((ntohl(thisfile->type) == 0x0)
- || (ntohl(thisfile->type) == 0xffffffff))
- && (ntohl(thisfile->len) + ntohl(thisfile->offset) >=
- totalsize)) {
- if (in_segment
- (current + headersize, filesize, alignment)) {
- ret = current + headersize;
- break;
- }
- if ((ALIGN(current, alignment) + filesize < top)
- && (ALIGN(current, alignment) - headersize >
- current)
- && in_segment(ALIGN(current, alignment), filesize,
- alignment)) {
- ret = ALIGN(current, alignment);
- break;
- }
- if ((ALIGN(current, alignment) + alignment + filesize <
- top)
- && (ALIGN(current, alignment) + alignment -
- headersize > current)
- && in_segment(ALIGN(current, alignment) + alignment,
- filesize, alignment)) {
- ret = ALIGN(current, alignment) + alignment;
- break;
- }
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
- }
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry) {
+ assert(image && image->buffer.data && entry);
+ return (int32_t)((char*)entry - image->buffer.data);
+}
+
+int cbfs_is_valid_entry(struct cbfs_file *entry) {
+ return (entry &&memcmp(entry->magic, CBFS_FILE_MAGIC,
+ sizeof(entry->magic)) == 0);
+}
- free(rom);
- return ret;
+int cbfs_init_entry(struct cbfs_file *entry,
+ struct buffer *buffer) {
+ memset(entry, 0, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->len = htonl(buffer->size);
+ entry->offset = htonl(sizeof(*entry) + strlen(buffer->name) + 1);
+ return 0;
+}
+
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name) {
+ memset(entry, CBFS_CONTENT_DEFAULT_VALUE, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ entry->len = htonl(len);
+ entry->checksum = 0; // TODO Build a checksum algorithm.
+ entry->offset = htonl(sizeof(*entry) + align_up(strlen(name) + 1,
+ CBFS_FILENAME_ALIGN));
+ memset(CBFS_NAME(entry), 0, ntohl(entry->offset) - sizeof(*entry));
+ strcpy(CBFS_NAME(entry), name);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, len);
+ return 0;
}
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index 853e529..77bd100 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -2,6 +2,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,71 +22,172 @@
#define __CBFSTOOL_COMMON_H
#include <stdint.h>
+#include "cbfs.h"
+
+/* Message output */
+extern int verbose;
+#define ERROR(x...) { fprintf(stderr, "ERROR: " x); }
+#define WARN(x...) { fprintf(stderr, "WARN: " 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 ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#define IS_TOP_ALIGNED_ADDRESS(x) ((uint32_t)(x) > 0x80000000)
+
+/* Endianess */
+#include <arpa/inet.h> // for ntohl, htonl
#include "swab.h"
-#ifndef __APPLE__
-#define ntohl(x) (host_bigendian?(x):swab32(x))
-#define htonl(x) (host_bigendian?(x):swab32(x))
-#endif
-#define ntohll(x) (host_bigendian?(x):swab64(x))
-#define htonll(x) (host_bigendian?(x):swab64(x))
+int is_big_endian(void);
+#define ntohll(x) (is_big_endian() ? (x) : swab64(x))
+#define htonll(x) (is_big_endian() ? (x) : swab64(x))
-extern void *offset;
-extern uint32_t romsize;
-extern int host_bigendian;
-extern uint32_t arch;
+/* Buffer and file I/O */
+struct buffer {
+ char *name;
+ char *data;
+ size_t size;
+};
-const char *arch_to_string(uint32_t a);
-uint32_t string_to_arch(const char *arch_string);
+/* Creates an empty memory buffer with given size.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_create(struct buffer *buffer, size_t size, const char *name);
-static inline void *phys_to_virt(uint32_t addr)
-{
- return offset + addr;
-}
+/* Loads a file into memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_from_file(struct buffer *buffer, const char *filename);
-static inline uint32_t virt_to_phys(void *addr)
-{
- return (unsigned long)(addr - offset) & 0xffffffff;
-}
+/* Writes memory buffer content into file.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_write_file(struct buffer *buffer, const char *filename);
-#define ALIGN(val, by) (((val) + (by)-1)&~((by)-1))
+/* Destroys a memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_delete(struct buffer *buffer);
-size_t getfilesize(const char *filename);
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place);
-void *loadrom(const char *filename);
-int writerom(const char *filename, void *start, uint32_t size);
-int iself(unsigned char *input);
+/* Type and format */
+
+/* Returns 1 if input points to an ELF object, otherwise 0. */
+int is_elf_object(const void *input);
+
+/* Returns the value from CBFS entry type name, or default_value if
+ * the name is not found. */
+uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value);
+/* Returns the compression name, or default_value if not found. */
+uint32_t get_cbfs_compression(const char *name, uint32_t default_value);
-typedef void (*comp_func_ptr) (char *, int, char *, int *);
-typedef enum { CBFS_COMPRESS_NONE = 0, CBFS_COMPRESS_LZMA = 1 } comp_algo;
+/* Prints all known CBFS entry types. */
+void print_all_cbfs_entry_types();
-comp_func_ptr compression_function(comp_algo algo);
-uint64_t intfiletype(const char *name);
+/* CBFS image processing */
+
+struct cbfs_image {
+ struct buffer buffer;
+ struct cbfs_header *header;
+};
+
+/* Creates an empty CBFS image by given size, and description to its content
+ * (bootblock, align, header location, starting offset of CBFS entries.
+ * The output image will contain a valid cbfs_header, with one cbfs_file
+ * entry with type CBFS_COMPONENT_NULL, with max available size.
+ * Returns 0 on success, otherwise none-zero. */
+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);
+
+
+/* Loads a CBFS image from file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename);
+
+/* Writes a CBFS image into file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename);
+
+/* Releases the CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_delete(struct cbfs_image *image);
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo);
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location);
+/* Adds an entry to CBFS image by given name and type. If offset is non-zero,
+ * try to add at assigned location.
+ * Returns 0 on success, otherwise non-zero. */
+int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer,
+ const char *name, uint32_t type, uint32_t offset);
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location);
+/* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_remove_entry(struct cbfs_image *image, const char *name);
-int create_cbfs_image(const char *romfile, uint32_t romsize,
- const char *bootblock, uint32_t align, uint32_t offs);
+/* Returns a pointer to entry by name, or NULL if name is not found. */
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name);
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location);
-int remove_file_from_cbfs(const char *filename);
-void print_cbfs_directory(const char *filename);
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath);
-int remove_file_from_cbfs(const char *filename);
+/* Exports an entry to external file.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename);
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t align);
+/* Initializes a new entry with size and name in CBFS image.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name);
-void print_supported_filetypes(void);
+/* Callback function used by cbfs_walk.
+ * Returns 0 on success, or non-zero to stop further iteration. */
+typedef int (*cbfs_entry_callback)(struct cbfs_image *image,
+ struct cbfs_file *file,
+ void *arg);
-#define ARRAY_SIZE(a) (int)(sizeof(a) / sizeof((a)[0]))
+/* Iterates through all entries in CBFS image, and invoke with callback.
+ * Stops if callback returns non-zero values.
+ * Returns number of entries invoked. */
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback, void *arg);
+
+/* Primitive CBFS utilities */
+
+/* Returns a pointer to the only valid CBFS header in give buffer, otherwise
+ * NULL (including when multiple headers were found). If there is a X86 ROM
+ * style signature (pointer at 0xfffffffc) found in ROM, it will be selected as
+ * the only header.*/
+struct cbfs_header *cbfs_find_header(char *data, size_t size);
+
+/* Returns the first cbfs_file entry in CBFS image by CBFS header (no matter if
+ * the entry has valid content or not), otherwise NULL. */
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image);
+
+/* Returns next cbfs_file entry (no matter if its content is valid or not), or
+ * NULL on failure. */
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry);
+
+/* Returns ROM address (offset) of entry.
+ * This is different from entry->offset (pointer to content). */
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry);
+
+int cbfs_print_directory(struct cbfs_image *image);
+int cbfs_print_header_info(struct cbfs_image *image);
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+
+/* Returns 1 if entry has valid data (by checking magic number), otherwise 0. */
+int cbfs_is_valid_entry(struct cbfs_file *entry);
+
+/* Utilities */
+
+/* compress.c */
+typedef void (*comp_func_ptr) (char *, int, char *, int *);
+typedef enum {
+ CBFS_COMPRESS_NONE = 0,
+ CBFS_COMPRESS_LZMA
+} comp_algo;
+comp_func_ptr compression_function(comp_algo algo);
+/* cbfs-mkpayload.c */
+int parse_elf_to_payload(char *input, char **output, comp_algo algo);
+int parse_flat_binary_to_payload(char *input, char **output,
+ uint32_t input_size, uint32_t loadaddress,
+ uint32_t entrypoint, comp_algo algo);
+/* cbfs-mkstage.c */
+int parse_elf_to_stage(char *input, char **output, comp_algo algo,
+ uint32_t location);
#endif
1
0
Patch set updated for coreboot: b52df5b Extend CBFS to support arbitrary ROM source media.
by Hung-Te Lin 27 Jan '13
by Hung-Te Lin 27 Jan '13
27 Jan '13
Hung-Te Lin (hungte(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2182
-gerrit
commit b52df5b87feb4c59764f23247498402b1f8ddfb5
Author: Hung-Te Lin <hungte(a)chromium.org>
Date: Tue Jan 22 18:57:56 2013 +0800
Extend CBFS to support arbitrary ROM source media.
Summary:
CBFS functions now all take a new "media source" parameter; use
CBFS_DEFAULT_MEDIA if you simply want to load from main firmware.
API Changes:
cbfs_find => cbfs_get_file.
cbfs_find_file => cbfs_get_file_content.
cbfs_get_file => cbfs_get_file_content with correct type.
CBFS used to work only on memory-mapped ROM (all x86). For platforms like ARM,
the ROM may come from USB, UART, or SPI -- any serial devices and not available
for memory mapping.
To support these devices (and allowing CBFS to read from multiple source
at the same time), CBFS operations are now virtual-ized into "cbfs_media". To
simplify porting existing code, every media source must support both "reading
into pre-allocated memory (read)" and "read and return an allocated buffer
(map)". For devices without native memory-mapped ROM, "cbfs_simple_buffer*"
provides simple memory mapping simulation.
Every CBFS function now takes a cbfs_media* as parameter. CBFS_DEFAULT_MEDIA
is defined for CBFS functions to automatically initialize a per-board default
media (CBFS will internally calls init_default_cbfs_media). Also revised CBFS
function names relying on memory mapped backend (ex, "cbfs_find" => actually
loads files). Now we only have two getters:
struct cbfs_file *entry = cbfs_get_file(media, name);
void *data = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, name, type);
Test results:
- Verified to work on ARM (loaded romstage properly for Google/Snow).
- Verified to work on x86/qemu.
Change-Id: Iac911ded25a6f2feffbf3101a81364625bb07746
Signed-off-by: Hung-Te Lin <hungte(a)chromium.org>
---
src/arch/armv7/boot/coreboot_table.c | 4 +-
src/arch/armv7/bootblock_simple.c | 4 +-
src/arch/armv7/include/arch/cbfs.h | 101 +++----
src/arch/x86/boot/coreboot_table.c | 4 +-
src/arch/x86/boot/smbios.c | 12 +-
src/arch/x86/lib/Makefile.inc | 3 +
src/arch/x86/lib/cbfs_and_run.c | 2 +-
src/arch/x86/lib/rom_media.c | 101 +++++++
src/cpu/intel/microcode/microcode.c | 5 +-
src/cpu/samsung/exynos5-common/Makefile.inc | 4 +-
src/cpu/samsung/exynos5-common/spi.c | 239 +++++++++++++++++
src/cpu/samsung/exynos5-common/spi.h | 13 +
src/cpu/samsung/exynos5-common/spl_boot.c | 291 ---------------------
src/cpu/samsung/exynos5250/Kconfig | 18 +-
src/cpu/via/nano/update_ucode.c | 2 +-
src/device/oprom/realmode/x86.c | 8 +-
src/device/oprom/yabel/vbe.c | 4 +-
src/device/pci_rom.c | 9 +-
src/drivers/pc80/mc146818rtc.c | 6 +-
src/include/cbfs.h | 37 ++-
src/include/cbfs_core.h | 72 +++--
src/include/endian.h | 28 ++
src/lib/cbfs.c | 141 +++++++---
src/lib/cbfs_core.c | 198 ++++++++------
src/lib/hardwaremain.c | 5 +-
src/lib/selfboot.c | 9 -
src/mainboard/google/snow/bootblock.c | 253 +-----------------
src/mainboard/samsung/lumpy/romstage.c | 2 +-
.../amd/agesa/family15tn/fam15tn_callouts.c | 4 +-
src/northbridge/intel/i82830/vga.c | 2 +-
src/northbridge/intel/sandybridge/raminit.c | 4 +-
31 files changed, 791 insertions(+), 794 deletions(-)
diff --git a/src/arch/armv7/boot/coreboot_table.c b/src/arch/armv7/boot/coreboot_table.c
index 86a004d..b2d88aa 100644
--- a/src/arch/armv7/boot/coreboot_table.c
+++ b/src/arch/armv7/boot/coreboot_table.c
@@ -640,7 +640,9 @@ unsigned long write_coreboot_table(
#if CONFIG_USE_OPTION_TABLE
{
- struct cmos_option_table *option_table = cbfs_find_file("cmos_layout.bin", 0x1aa);
+ struct cmos_option_table *option_table = cbfs_get_file_content(
+ CBFS_DEFAULT_MEDIA, "cmos_layout.bin",
+ CBFS_COMPONENT_CMOS_LAYOUT);
if (option_table) {
struct lb_record *rec_dest = lb_new_record(head);
/* Copy the option config table, it's already a lb_record... */
diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c
index af76d4c..d97075e 100644
--- a/src/arch/armv7/bootblock_simple.c
+++ b/src/arch/armv7/bootblock_simple.c
@@ -45,7 +45,9 @@ void main(unsigned long bist)
}
printk(BIOS_INFO, "bootblock main(): loading romstage\n");
- romstage_entry = loadstage(target1);
+ romstage_entry = (unsigned long)cbfs_load_stage(
+ CBFS_DEFAULT_MEDIA, target1);
+
printk(BIOS_INFO, "bootblock main(): jumping to romstage\n");
if (romstage_entry) bootblock_exit(romstage_entry);
hlt();
diff --git a/src/arch/armv7/include/arch/cbfs.h b/src/arch/armv7/include/arch/cbfs.h
index f060643..e34a0d2 100644
--- a/src/arch/armv7/include/arch/cbfs.h
+++ b/src/arch/armv7/include/arch/cbfs.h
@@ -20,82 +20,41 @@
#ifndef __INCLUDE_ARCH_CBFS__
#define __INCLUDE_ARCH_CBFS__
-#include <string.h>
-#include <types.h>
#include <cbfs_core.h>
#include <arch/byteorder.h>
-#include <arch/cbfs.h>
+// TODO FIXME This file is only for providing CBFS function in bootblock.
+// Should be removed once bootblock can link lib/* files.
+#include "lib/cbfs.c"
-static int cbfs_check_magic(struct cbfs_file *file)
-{
- return strcmp(file->magic, CBFS_FILE_MAGIC) ? 0 : 1;
+// mem* and ulzma are now workarounds for bootblock compilation.
+void *memcpy(void *dest, const void *src, size_t n) {
+ char *d = (char *)dest;
+ const char *s = (const char*)src;
+ while (n-- > 0)
+ *d++ = *s++;
+ return dest;
}
-static unsigned long loadstage(const char* target)
-{
- unsigned long offset, align;
- struct cbfs_header *header = (struct cbfs_header *)(CONFIG_BOOTBLOCK_BASE + 0x40);
- /* FIXME: magic offsets */
- // if (ntohl(header->magic) != CBFS_HEADER_MAGIC)
- // printk(BIOS_ERR, "ERROR: No valid CBFS header found!\n");
+void *memset(void *dest, int c, size_t n) {
+ char *d = (char*)dest;
+ while (n-- > 0)
+ *d++ = c;
+ return dest;
+}
+
+int memcmp(const void *ptr1, const void *ptr2, size_t n) {
+ const char *s1 = (const char*)ptr1, *s2 = (const char*)ptr2;
+ int c;
+ while (n-- > 0)
+ if ((c = *s1++ - *s2++))
+ return c;
+ return 0;
+}
- offset = ntohl(header->offset);
- align = ntohl(header->align);
- printk(BIOS_INFO, "cbfs header (0x%p)\n", header);
- printk(BIOS_INFO, "\tmagic: 0x%08x\n", ntohl(header->magic));
- printk(BIOS_INFO, "\tversion: 0x%08x\n", ntohl(header->version));
- printk(BIOS_INFO, "\tromsize: 0x%08x\n", ntohl(header->romsize));
- printk(BIOS_INFO, "\tbootblocksize: 0x%08x\n", ntohl(header->bootblocksize));
- printk(BIOS_INFO, "\talign: 0x%08x\n", ntohl(header->align));
- printk(BIOS_INFO, "\toffset: 0x%08x\n", ntohl(header->offset));
- while(1) {
- struct cbfs_file *file;
- struct cbfs_stage *stage;
- /* FIXME: SPI image hack */
- file = (struct cbfs_file *)(offset + CONFIG_SPI_IMAGE_HACK);
- if (!cbfs_check_magic(file)) {
- printk(BIOS_INFO, "magic is wrong, file: %p\n", file);
- return 0;
- }
- if (!strcmp(CBFS_NAME(file), target)) {
- uint32_t load, entry;
- printk(BIOS_INFO, "CBFS name matched, offset: %p\n", file);
- printk(BIOS_INFO, "\tmagic: %02x%02x%02x%02x%02x%02x%02x%02x\n",
- file->magic[0], file->magic[1], file->magic[2], file->magic[3],
- file->magic[4], file->magic[5], file->magic[6], file->magic[7]);
- printk(BIOS_INFO, "\tlen: 0x%08x\n", ntohl(file->len));
- printk(BIOS_INFO, "\ttype: 0x%08x\n", ntohl(file->type));
- printk(BIOS_INFO, "\tchecksum: 0x%08x\n", ntohl(file->checksum));
- printk(BIOS_INFO, "\toffset: 0x%08x\n", ntohl(file->offset));
- /* exploit the fact that this is all word-aligned. */
- stage = CBFS_SUBHEADER(file);
- load = stage->load;
- entry = stage->entry;
- int i;
- u32 *to = (void *)load;
- u32 *from = (void *)((u8 *)stage+sizeof(*stage));
- /* we could do memmove/memset here. But the math gets messy.
- * far easier just to do what we want.
- */
- printk(BIOS_INFO, "entry: 0x%08x, load: 0x%08x, "
- "len: 0x%08x, memlen: 0x%08x\n", entry,
- load, stage->len, stage->memlen);
- for(i = 0; i < stage->len; i += 4)
- *to++ = *from++;
- for(; i < stage->memlen; i += 4)
- *to++ = 0;
- return entry;
- }
- int flen = ntohl(file->len);
- int foffset = ntohl(file->offset);
- unsigned long oldoffset = offset;
- offset = ALIGN(offset + foffset + flen, align);
- printk(BIOS_INFO, "offset: 0x%08lx\n", offset);
- if (offset <= oldoffset)
- return 0;
- if (offset > CONFIG_ROMSTAGE_SIZE)
- return 0;
- }
+unsigned long ulzma(unsigned char *src, unsigned char *dest) {
+ // TODO remove this.
+ return -1;
}
-#endif
+
+#endif // __INCLUDE_ARCH_CBFS__
diff --git a/src/arch/x86/boot/coreboot_table.c b/src/arch/x86/boot/coreboot_table.c
index 8dccd77..04fba47 100644
--- a/src/arch/x86/boot/coreboot_table.c
+++ b/src/arch/x86/boot/coreboot_table.c
@@ -638,7 +638,9 @@ unsigned long write_coreboot_table(
#if CONFIG_USE_OPTION_TABLE
{
- struct cmos_option_table *option_table = cbfs_find_file("cmos_layout.bin", 0x1aa);
+ struct cmos_option_table *option_table = cbfs_get_file_content(
+ CBFS_DEFAULT_MEDIA, "cmos_layout.bin",
+ CBFS_COMPONENT_CMOS_LAYOUT);
if (option_table) {
struct lb_record *rec_dest = lb_new_record(head);
/* Copy the option config table, it's already a lb_record... */
diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c
index 72e70ba..f65ced2 100644
--- a/src/arch/x86/boot/smbios.c
+++ b/src/arch/x86/boot/smbios.c
@@ -120,7 +120,6 @@ static int smbios_processor_name(char *start)
static int smbios_write_type0(unsigned long *current, int handle)
{
- struct cbfs_header *hdr;
struct smbios_type0 *t = (struct smbios_type0 *)*current;
int len = sizeof(struct smbios_type0);
@@ -143,8 +142,15 @@ static int smbios_write_type0(unsigned long *current, int handle)
vboot_data->vbt10 = (u32)t->eos + (version_offset - 1);
#endif
- if ((hdr = get_cbfs_header()) != (struct cbfs_header *)0xffffffff)
- t->bios_rom_size = (ntohl(hdr->romsize) / 65535) - 1;
+ {
+ const struct cbfs_header *header;
+ u32 romsize = CONFIG_ROM_SIZE;
+ header = cbfs_get_header(CBFS_DEFAULT_MEDIA);
+ if (header != CBFS_HEADER_INVALID_ADDRESS)
+ romsize = ntohl(header->romsize);
+ t->bios_rom_size = (romsize / 65535) - 1;
+ }
+
t->system_bios_major_release = 4;
t->bios_characteristics =
BIOS_CHARACTERISTICS_PCI_SUPPORTED |
diff --git a/src/arch/x86/lib/Makefile.inc b/src/arch/x86/lib/Makefile.inc
index 2186072..f4dc8b8 100644
--- a/src/arch/x86/lib/Makefile.inc
+++ b/src/arch/x86/lib/Makefile.inc
@@ -8,13 +8,16 @@ ramstage-$(CONFIG_IOAPIC) += ioapic.c
ramstage-y += memset.c
ramstage-y += memcpy.c
ramstage-y += ebda.c
+ramstage-y += rom_media.c
romstage-y += romstage_console.c
romstage-y += cbfs_and_run.c
romstage-y += memset.c
romstage-y += memcpy.c
+romstage-y += rom_media.c
smm-y += memset.c
smm-y += memcpy.c
+smm-y += rom_media.c
$(obj)/arch/x86/lib/console.ramstage.o :: $(obj)/build.h
diff --git a/src/arch/x86/lib/cbfs_and_run.c b/src/arch/x86/lib/cbfs_and_run.c
index 1f87e7a..a023141 100644
--- a/src/arch/x86/lib/cbfs_and_run.c
+++ b/src/arch/x86/lib/cbfs_and_run.c
@@ -28,7 +28,7 @@ static void cbfs_and_run_core(const char *filename, unsigned ebp)
timestamp_add_now(TS_START_COPYRAM);
print_debug("Loading image.\n");
- dst = cbfs_load_stage(filename);
+ dst = cbfs_load_stage(CBFS_DEFAULT_MEDIA, filename);
if ((void *)dst == (void *) -1)
die("FATAL: Essential component is missing.\n");
diff --git a/src/arch/x86/lib/rom_media.c b/src/arch/x86/lib/rom_media.c
new file mode 100644
index 0000000..1a0f8d6
--- /dev/null
+++ b/src/arch/x86/lib/rom_media.c
@@ -0,0 +1,101 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+#include <cbfs.h>
+#include <string.h>
+
+#ifdef LIBPAYLOAD
+# define printk(x...)
+# define init_default_cbfs_media libpayload_init_default_cbfs_media
+ extern int libpayload_init_default_cbfs_media(struct cbfs_media *media);
+#else
+# include <console/console.h>
+#endif
+
+// Implementation of memory-mapped ROM media source on X86.
+
+static int x86_rom_open(struct cbfs_media *media) {
+ return 0;
+}
+
+static void *x86_rom_map(struct cbfs_media *media, size_t offset, size_t count) {
+ void *ptr;
+ // Some address (ex, pointer to master header) may be given in memory
+ // mapped location. To workaround that, we handle >0xf0000000 as real
+ // memory pointer.
+
+ if ((uint32_t)offset > (uint32_t)0xf0000000)
+ ptr = (void*)offset;
+ else
+ ptr = (void*)(0 - (uint32_t)media->context + offset);
+ return ptr;
+}
+
+static void *x86_rom_unmap(struct cbfs_media *media, const void *address) {
+ return NULL;
+}
+
+static size_t x86_rom_read(struct cbfs_media *media, void *dest, size_t offset,
+ size_t count) {
+ void *ptr = x86_rom_map(media, offset, count);
+ memcpy(dest, ptr, count);
+ x86_rom_unmap(media, ptr);
+ return count;
+}
+
+static int x86_rom_close(struct cbfs_media *media) {
+ return 0;
+}
+
+int init_x86rom_cbfs_media(struct cbfs_media *media);
+int init_x86rom_cbfs_media(struct cbfs_media *media) {
+ // On X86, we always keep a reference of pointer to CBFS header in
+ // 0xfffffffc, and the pointer is still a memory-mapped address.
+ // Since the CBFS core always use ROM offset, we need to figure out
+ // header->romsize even before media is initialized.
+ struct cbfs_header *header = (struct cbfs_header*)
+ *(uint32_t*)(0xfffffffc);
+ if (CBFS_HEADER_MAGIC != ntohl(header->magic)) {
+#if defined(CONFIG_ROM_SIZE)
+ printk(BIOS_ERR, "Invalid CBFS master header at %p\n", header);
+ media->context = (void*)CONFIG_ROM_SIZE;
+#else
+ return -1;
+#endif
+ } else {
+ uint32_t romsize = ntohl(header->romsize);
+ media->context = (void*)romsize;
+#if defined(CONFIG_ROM_SIZE)
+ if (CONFIG_ROM_SIZE != romsize)
+ printk(BIOS_INFO, "Warning: rom size unmatch (%d/%d)\n",
+ CONFIG_ROM_SIZE, romsize);
+#endif
+ }
+ media->open = x86_rom_open;
+ media->close = x86_rom_close;
+ media->map = x86_rom_map;
+ media->unmap = x86_rom_unmap;
+ media->read = x86_rom_read;
+ return 0;
+}
+
+int init_default_cbfs_media(struct cbfs_media *media) {
+ return init_x86rom_cbfs_media(media);
+}
diff --git a/src/cpu/intel/microcode/microcode.c b/src/cpu/intel/microcode/microcode.c
index 15d6513..713a6df 100644
--- a/src/cpu/intel/microcode/microcode.c
+++ b/src/cpu/intel/microcode/microcode.c
@@ -166,8 +166,9 @@ void intel_update_microcode_from_cbfs(void)
#ifdef __PRE_RAM__
microcode_blob = walkcbfs((char *) MICROCODE_CBFS_FILE);
#else
- microcode_blob = cbfs_find_file(MICROCODE_CBFS_FILE,
- CBFS_TYPE_MICROCODE);
+ microcode_blob = cbfs_get_file_content(CBFS_DEFAULT_MEDIA,
+ MICROCODE_CBFS_FILE,
+ CBFS_TYPE_MICROCODE);
#endif
intel_update_microcode(microcode_blob);
}
diff --git a/src/cpu/samsung/exynos5-common/Makefile.inc b/src/cpu/samsung/exynos5-common/Makefile.inc
index cad6cb3..d919347 100644
--- a/src/cpu/samsung/exynos5-common/Makefile.inc
+++ b/src/cpu/samsung/exynos5-common/Makefile.inc
@@ -1,2 +1,2 @@
-#romstage-y += soc.c
-romstage-y += spl_boot.c
+romstage-y += spi.c
+ramstage-y += spi.c
diff --git a/src/cpu/samsung/exynos5-common/spi.c b/src/cpu/samsung/exynos5-common/spi.c
new file mode 100644
index 0000000..b0d2d6e
--- /dev/null
+++ b/src/cpu/samsung/exynos5-common/spi.c
@@ -0,0 +1,239 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/* FIXME(dhendrix): pulled in a lot of extra crap such as partition and string
+ libs*/
+#include <assert.h>
+#include <common.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <console/console.h>
+#include <console/loglevel.h>
+
+#include <config.h>
+#include <spi.h>
+
+#include <cpu/samsung/exynos5250/gpio.h>
+#include <cpu/samsung/exynos5250/clk.h>
+#include <cpu/samsung/exynos5250/cpu.h>
+#include <cpu/samsung/exynos5250/periph.h>
+#include <cpu/samsung/exynos5250/pinmux.h>
+
+#include <cpu/samsung/exynos5-common/cpu.h>
+#include <cpu/samsung/exynos5-common/exynos5-common.h>
+#include <cpu/samsung/exynos5-common/spi.h>
+
+#include <system.h>
+#include <arch/io.h>
+#include <lib.h>
+
+#define OM_STAT (0x1f << 1)
+#define EXYNOS_BASE_SPI1 ((void *)0x12d30000)
+
+static void exynos_spi_rx_tx(struct exynos_spi *regs, int todo,
+ void *dinp, void const *doutp, int i)
+{
+ int rx_lvl, tx_lvl;
+ uint *rxp = (uint *)(dinp + (i * (32 * 1024)));
+ uint out_bytes, in_bytes;
+
+ out_bytes = in_bytes = todo;
+ setbits_le32(®s->ch_cfg, SPI_CH_RST);
+ clrbits_le32(®s->ch_cfg, SPI_CH_RST);
+ writel(((todo * 8) / 32) | SPI_PACKET_CNT_EN, ®s->pkt_cnt);
+
+ while (in_bytes) {
+ uint32_t spi_sts;
+ int temp;
+
+ spi_sts = readl(®s->spi_sts);
+ rx_lvl = ((spi_sts >> 15) & 0x7f);
+ tx_lvl = ((spi_sts >> 6) & 0x7f);
+ while (tx_lvl < 32 && out_bytes) {
+ temp = 0xffffffff;
+ writel(temp, ®s->tx_data);
+ out_bytes -= 4;
+ tx_lvl += 4;
+ }
+ while (rx_lvl >= 4 && in_bytes) {
+ temp = readl(®s->rx_data);
+ if (rxp)
+ *rxp++ = temp;
+ in_bytes -= 4;
+ rx_lvl -= 4;
+ }
+ }
+}
+
+int exynos_spi_open(struct exynos_spi *regs)
+{
+ clock_set_rate(PERIPH_ID_SPI1, 50000000); /* set spi clock to 50Mhz */
+ /* set the spi1 GPIO */
+
+ // TODO Some of these should be done in board's bootblock file.
+ // We should fix-up the mainboard-specific vs. exynos-specific parts in a
+ // follow-up CL.
+
+// exynos_pinmux_config(PERIPH_ID_SPI1, PINMUX_FLAG_NONE);
+ gpio_cfg_pin(GPIO_A24, 0x2);
+ gpio_cfg_pin(GPIO_A25, 0x2);
+ gpio_cfg_pin(GPIO_A26, 0x2);
+ gpio_cfg_pin(GPIO_A27, 0x2);
+
+ /* set pktcnt and enable it */
+ writel(4 | SPI_PACKET_CNT_EN, ®s->pkt_cnt);
+ /* set FB_CLK_SEL */
+ writel(SPI_FB_DELAY_180, ®s->fb_clk);
+ /* set CH_WIDTH and BUS_WIDTH as word */
+ setbits_le32(®s->mode_cfg,
+ SPI_MODE_CH_WIDTH_WORD | SPI_MODE_BUS_WIDTH_WORD);
+ clrbits_le32(®s->ch_cfg, SPI_CH_CPOL_L); /* CPOL: active high */
+
+ /* clear rx and tx channel if set priveously */
+ clrbits_le32(®s->ch_cfg, SPI_RX_CH_ON | SPI_TX_CH_ON);
+
+ setbits_le32(®s->swap_cfg,
+ SPI_RX_SWAP_EN | SPI_RX_BYTE_SWAP | SPI_RX_HWORD_SWAP);
+
+ /* do a soft reset */
+ setbits_le32(®s->ch_cfg, SPI_CH_RST);
+ clrbits_le32(®s->ch_cfg, SPI_CH_RST);
+
+ /* now set rx and tx channel ON */
+ setbits_le32(®s->ch_cfg, SPI_RX_CH_ON | SPI_TX_CH_ON | SPI_CH_HS_EN);
+ clrbits_le32(®s->cs_reg, SPI_SLAVE_SIG_INACT); /* CS low */
+ return 0;
+}
+
+int exynos_spi_read(struct exynos_spi *regs, void *dest, u32 len, u32 off)
+{
+ int upto, todo;
+ int i;
+ /* Send read instruction (0x3h) followed by a 24 bit addr */
+ writel((SF_READ_DATA_CMD << 24) | off, ®s->tx_data);
+
+ /* waiting for TX done */
+ while (!(readl(®s->spi_sts) & SPI_ST_TX_DONE));
+
+ for (upto = 0, i = 0; upto < len; upto += todo, i++) {
+ todo = MIN(len - upto, (1 << 15));
+ exynos_spi_rx_tx(regs, todo, dest, (void *)(off), i);
+ }
+
+ setbits_le32(®s->cs_reg, SPI_SLAVE_SIG_INACT);/* make the CS high */
+
+ /*
+ * Let put controller mode to BYTE as
+ * SPI driver does not support WORD mode yet
+ */
+ clrbits_le32(®s->mode_cfg,
+ SPI_MODE_CH_WIDTH_WORD | SPI_MODE_BUS_WIDTH_WORD);
+ writel(0, ®s->swap_cfg);
+
+ return len;
+}
+
+int exynos_spi_close(struct exynos_spi *regs)
+{
+ /*
+ * Flush spi tx, rx fifos and reset the SPI controller
+ * and clear rx/tx channel
+ */
+ clrsetbits_le32(®s->ch_cfg, SPI_CH_HS_EN, SPI_CH_RST);
+ clrbits_le32(®s->ch_cfg, SPI_CH_RST);
+ clrbits_le32(®s->ch_cfg, SPI_TX_CH_ON | SPI_RX_CH_ON);
+ return 0;
+}
+
+// SPI as CBFS media.
+struct exynos_spi_media {
+ struct exynos_spi *regs;
+ struct cbfs_simple_buffer buffer;
+};
+
+static int exynos_spi_cbfs_open(struct cbfs_media *media) {
+ struct exynos_spi_media *spi = (struct exynos_spi_media*)media->context;
+ printk(BIOS_SPEW, "SPI: exynos_spi_cbfs_open\n");
+ return exynos_spi_open(spi->regs);
+}
+
+static int exynos_spi_cbfs_close(struct cbfs_media *media) {
+ struct exynos_spi_media *spi = (struct exynos_spi_media*)media->context;
+ printk(BIOS_SPEW, "SPI: exynos_spi_cbfs_close\n");
+ return exynos_spi_close(spi->regs);
+}
+
+static size_t exynos_spi_cbfs_read(struct cbfs_media *media, void *dest,
+ size_t offset, size_t count) {
+ struct exynos_spi_media *spi = (struct exynos_spi_media*)media->context;
+ int bytes;
+ printk(BIOS_SPEW, "SPI: exynos_spi_cbfs_read\n");
+ bytes = exynos_spi_read(spi->regs, dest, count, offset);
+ // Flush and re-open the device.
+ exynos_spi_close(spi->regs);
+ exynos_spi_open(spi->regs);
+ return bytes;
+}
+
+static void *exynos_spi_cbfs_map(struct cbfs_media *media, size_t offset,
+ size_t count) {
+ struct exynos_spi_media *spi = (struct exynos_spi_media*)media->context;
+ printk(BIOS_SPEW, "SPI: exynos_spi_cbfs_map\n");
+ return cbfs_simple_buffer_map(&spi->buffer, media, offset, count);
+}
+
+static void *exynos_spi_cbfs_unmap(struct cbfs_media *media,
+ const void *address) {
+ struct exynos_spi_media *spi = (struct exynos_spi_media*)media->context;
+ printk(BIOS_SPEW, "SPI: exynos_spi_cbfs_unmap\n");
+ return cbfs_simple_buffer_unmap(&spi->buffer, address);
+}
+
+int initialize_exynos_spi_cbfs_media(struct cbfs_media *media,
+ void *buffer_address,
+ size_t buffer_size) {
+ // TODO Replace static variable to support multiple streams.
+ static struct exynos_spi_media context;
+ printk(BIOS_SPEW, "SPI: initialize_exynos_spi_cbfs_media\n");
+
+ context.regs = EXYNOS_BASE_SPI1;
+ context.buffer.allocated = context.buffer.last_allocate = 0;
+ context.buffer.buffer = buffer_address;
+ context.buffer.size = buffer_size;
+ media->context = (void*)&context;
+ media->open = exynos_spi_cbfs_open;
+ media->close = exynos_spi_cbfs_close;
+ media->read = exynos_spi_cbfs_read;
+ media->map = exynos_spi_cbfs_map;
+ media->unmap = exynos_spi_cbfs_unmap;
+
+ return 0;
+}
+
+int init_default_cbfs_media(struct cbfs_media *media) {
+ return initialize_exynos_spi_cbfs_media(
+ media,
+ (void*)CONFIG_CBFS_CACHE_ADDRESS,
+ CONFIG_CBFS_CACHE_SIZE);
+}
diff --git a/src/cpu/samsung/exynos5-common/spi.h b/src/cpu/samsung/exynos5-common/spi.h
index 3f36759..e021888 100644
--- a/src/cpu/samsung/exynos5-common/spi.h
+++ b/src/cpu/samsung/exynos5-common/spi.h
@@ -22,6 +22,9 @@
#ifndef __ASSEMBLER__
+// This driver serves as a CBFS media source.
+#include <cbfs.h>
+
/* SPI peripheral register map; padded to 64KB */
struct exynos_spi {
unsigned int ch_cfg; /* 0x00 */
@@ -85,5 +88,15 @@ struct exynos_spi {
#define SPI_RX_BYTE_SWAP (1 << 6)
#define SPI_RX_HWORD_SWAP (1 << 7)
+/* API */
+int exynos_spi_open(struct exynos_spi *regs);
+int exynos_spi_read(struct exynos_spi *regs, void *dest, u32 len, u32 off);
+int exynos_spi_close(struct exynos_spi *regs);
+
+/* Serve as CBFS Media */
+int initialize_exynos_spi_cbfs_media(struct cbfs_media *media,
+ void *buffer_address,
+ size_t buffer_size);
+
#endif /* __ASSEMBLER__ */
#endif
diff --git a/src/cpu/samsung/exynos5-common/spl_boot.c b/src/cpu/samsung/exynos5-common/spl_boot.c
index ecff871..1e264e3 100644
--- a/src/cpu/samsung/exynos5-common/spl_boot.c
+++ b/src/cpu/samsung/exynos5-common/spl_boot.c
@@ -55,9 +55,6 @@
#include <arch/io.h>
-/* FIXME(dhendrix): clean out u-boot global data stuff */
-//DECLARE_GLOBAL_DATA_PTR;
-
#define OM_STAT (0x1f << 1)
/**
@@ -102,117 +99,6 @@ static int config_branch_prediction(int set_cr_z)
return cr & CR_Z;
}
-#if 0
-static void spi_rx_tx(struct exynos_spi *regs, int todo,
- void *dinp, void const *doutp, int i)
-{
- uint *rxp = (uint *)(dinp + (i * (32 * 1024)));
- int rx_lvl, tx_lvl;
- uint out_bytes, in_bytes;
-
- out_bytes = in_bytes = todo;
- setbits_le32(®s->ch_cfg, SPI_CH_RST);
- clrbits_le32(®s->ch_cfg, SPI_CH_RST);
- writel(((todo * 8) / 32) | SPI_PACKET_CNT_EN, ®s->pkt_cnt);
-
- while (in_bytes) {
- uint32_t spi_sts;
- int temp;
-
- spi_sts = readl(®s->spi_sts);
- rx_lvl = ((spi_sts >> 15) & 0x7f);
- tx_lvl = ((spi_sts >> 6) & 0x7f);
- while (tx_lvl < 32 && out_bytes) {
- temp = 0xffffffff;
- writel(temp, ®s->tx_data);
- out_bytes -= 4;
- tx_lvl += 4;
- }
- while (rx_lvl >= 4 && in_bytes) {
- temp = readl(®s->rx_data);
- if (rxp)
- *rxp++ = temp;
- in_bytes -= 4;
- rx_lvl -= 4;
- }
- }
-}
-#endif
-
-/* FIXME(dhendrix): feels like exynos_spi_copy should go somewhere else... */
-#if 0
-/**
- * Copy uboot from spi flash to RAM
- *
- * @parma uboot_size size of u-boot to copy
- */
-static void exynos_spi_copy(unsigned int uboot_size)
-{
- int upto, todo;
- int i;
-// struct exynos_spi *regs = (struct exynos_spi *)samsung_get_base_spi1();
- struct exynos_spi *regs = (struct exynos_spi *)0x12d30000;
-
- clock_set_rate(PERIPH_ID_SPI1, 50000000); /* set spi clock to 50Mhz */
- /* set the spi1 GPIO */
- exynos_pinmux_config(PERIPH_ID_SPI1, PINMUX_FLAG_NONE);
-
- /* set pktcnt and enable it */
- writel(4 | SPI_PACKET_CNT_EN, ®s->pkt_cnt);
- /* set FB_CLK_SEL */
- writel(SPI_FB_DELAY_180, ®s->fb_clk);
- /* set CH_WIDTH and BUS_WIDTH as word */
- setbits_le32(®s->mode_cfg, SPI_MODE_CH_WIDTH_WORD |
- SPI_MODE_BUS_WIDTH_WORD);
- clrbits_le32(®s->ch_cfg, SPI_CH_CPOL_L); /* CPOL: active high */
-
- /* clear rx and tx channel if set priveously */
- clrbits_le32(®s->ch_cfg, SPI_RX_CH_ON | SPI_TX_CH_ON);
-
- setbits_le32(®s->swap_cfg, SPI_RX_SWAP_EN |
- SPI_RX_BYTE_SWAP |
- SPI_RX_HWORD_SWAP);
-
- /* do a soft reset */
- setbits_le32(®s->ch_cfg, SPI_CH_RST);
- clrbits_le32(®s->ch_cfg, SPI_CH_RST);
-
- /* now set rx and tx channel ON */
- setbits_le32(®s->ch_cfg, SPI_RX_CH_ON | SPI_TX_CH_ON | SPI_CH_HS_EN);
- clrbits_le32(®s->cs_reg, SPI_SLAVE_SIG_INACT); /* CS low */
-
- /* Send read instruction (0x3h) followed by a 24 bit addr */
- writel((SF_READ_DATA_CMD << 24) | SPI_FLASH_UBOOT_POS, ®s->tx_data);
-
- /* waiting for TX done */
- while (!(readl(®s->spi_sts) & SPI_ST_TX_DONE));
-
- for (upto = 0, i = 0; upto < uboot_size; upto += todo, i++) {
- todo = MIN(uboot_size - upto, (1 << 15));
- spi_rx_tx(regs, todo, (void *)(CONFIG_SYS_TEXT_BASE),
- (void *)(SPI_FLASH_UBOOT_POS), i);
- }
-
- setbits_le32(®s->cs_reg, SPI_SLAVE_SIG_INACT);/* make the CS high */
-
- /*
- * Let put controller mode to BYTE as
- * SPI driver does not support WORD mode yet
- */
- clrbits_le32(®s->mode_cfg, SPI_MODE_CH_WIDTH_WORD |
- SPI_MODE_BUS_WIDTH_WORD);
- writel(0, ®s->swap_cfg);
-
- /*
- * Flush spi tx, rx fifos and reset the SPI controller
- * and clear rx/tx channel
- */
- clrsetbits_le32(®s->ch_cfg, SPI_CH_HS_EN, SPI_CH_RST);
- clrbits_le32(®s->ch_cfg, SPI_CH_RST);
- clrbits_le32(®s->ch_cfg, SPI_TX_CH_ON | SPI_RX_CH_ON);
-}
-#endif
-
/* Copy U-Boot image to RAM */
static void copy_uboot_to_ram(void)
{
@@ -272,34 +158,6 @@ static void copy_uboot_to_ram(void)
debug("U-Boot copied\n");
}
-#if 0
-/**
- * Set up the U-Boot global_data pointer
- *
- * This sets the address of the global data, and sets up basic values.
- *
- * @param gdp Value to give to gd
- */
-static void setup_global_data(gd_t *gdp)
-{
- gd = gdp;
- memzero((void *)gd, sizeof(gd_t));
- gd->flags |= GD_FLG_RELOC;
- gd->baudrate = CONFIG_BAUDRATE;
- gd->have_console = 1;
-}
-#endif
-
-#if 0
-/* Tell the loaded U-Boot that it was loaded from SPL */
-static void exynos5_set_spl_marker(void)
-{
- uint32_t *marker = (uint32_t *)CONFIG_SPL_MARKER;
-
- *marker = EXYNOS5_SPL_MARKER;
-}
-#endif
-
/* Board-specific call to see if wakeup is allowed. */
static int __def_board_wakeup_permitted(void)
{
@@ -308,152 +166,3 @@ static int __def_board_wakeup_permitted(void)
int board_wakeup_permitted(void)
__attribute__((weak, alias("__def_board_wakeup_permitted")));
-void board_init_f(void)
-{
- /*
- * The gd struct is only needed for serial initialization. Since this
- * function is called in SPL u-boot. We store the gd struct in the
- * stack instead of the default memory region which may not be
- * initialized.
- */
-// __attribute__((aligned(8))) gd_t local_gd;
-// __attribute__((noreturn)) void (*uboot)(void);
-
-// exynos5_set_spl_marker();
-// setup_global_data(&local_gd);
-
- /*
- * Init subsystems, and resume if required. For a normal boot this
- * will set up the UART and display a message.
- */
- if (lowlevel_init_subsystems()) {
- if (!board_wakeup_permitted())
- power_reset();
- power_exit_wakeup();
- }
-
-// printk(BIOS_INFO, "\n\nU-Boot SPL, board rev %u\n", board_get_revision());
-
- copy_uboot_to_ram();
- /* Jump to U-Boot image */
-// uboot = (void *)CONFIG_SYS_TEXT_BASE;
-// uboot();
- /* Never returns Here */
-// printk(BIOS_ERR, "%s: u-boot jump failed", __func__);
- printk(BIOS_INFO, "%s: we should not be here...", __func__);
- hlt();
-}
-
-/* Place Holders */
-void board_init_r(gd_t *id, ulong dest_addr)
-{
- /* Function attribute is no-return */
- /* This Function never executes */
- while (1)
- ;
-}
-
-//void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) {}
-
-#if 0
-/*
- * The following functions are required when linking console library to SPL.
- *
- * Enabling UART in SPL u-boot requires console library. But some
- * functions we needed in the console library depends on a bunch
- * of library in libgeneric, like lib/ctype.o, lib/div64.o, lib/string.o,
- * and lib/vsprintf.o. Adding them makes the SPL u-boot too large and not
- * fit into the expected size.
- *
- * So we mock these functions in SPL, i.e. vsprintf(), panic(), etc.,
- * in order to cut its dependency.
- */
-int vsprintf(char *buf, const char *fmt, va_list args)
-{
- char *str = buf, *s;
- ulong u;
-
- /*
- * We won't implement all full functions of vsprintf().
- * We only implement %s and %u, and ignore others and directly use
- * the original format string as its result.
- */
-
- while (*fmt) {
- if (*fmt != '%') {
- *str++ = *fmt++;
- continue;
- }
- fmt++;
- switch (*fmt) {
- case '%':
- *str++ = *fmt++;
- break;
- case 's':
- fmt++;
- s = va_arg(args, char *);
- while (*s)
- *str++ = *s++;
- break;
- case 'u':
- fmt++;
- u = va_arg(args, ulong);
- s = simple_itoa(u);
- while (*s)
- *str++ = *s++;
- break;
- default:
- /* Print the original string for unsupported formats */
- *str++ = '%';
- *str++ = *fmt++;
- }
- }
- *str = '\0';
- return str - buf;
-}
-#endif
-
-#if 0
-void panic(const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- vprintf(fmt, args);
- putc('\n');
- va_end(args);
-#if defined(CONFIG_PANIC_HANG)
- hang();
-#else
- udelay(100000); /* allow messages to go out */
- do_reset(NULL, 0, 0, NULL);
-#endif
- while (1)
- ;
-}
-#endif
-
-#if 0
-void __assert_fail(const char *assertion, const char *file, unsigned line,
- const char *function)
-{
- /* This will not return */
- panic("%s:%u: %s: Assertion `%s' failed.", file, line, function,
- assertion);
-}
-#endif
-
-#if 0
-char *simple_itoa(ulong i)
-{
- /* 21 digits plus null terminator, good for 64-bit or smaller ints */
- static char local[22] __attribute__((section(".data")));
- char *p = &local[21];
-
- *p-- = '\0';
- do {
- *p-- = '0' + i % 10;
- i /= 10;
- } while (i > 0);
- return p + 1;
-}
-#endif
diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/cpu/samsung/exynos5250/Kconfig
index f5beddc..176f0b3 100644
--- a/src/cpu/samsung/exynos5250/Kconfig
+++ b/src/cpu/samsung/exynos5250/Kconfig
@@ -48,12 +48,22 @@ config ROMSTAGE_SIZE
hex
default 0x10000
-# FIXME: This is for copying SPI content into SRAM temporarily and
-# will be removed when we have the SPI streaming driver implemented.
-config SPI_IMAGE_HACK
- hex
+# TODO Change this to some better address not overlapping bootblock when
+# cbfstool supports creating header in arbitrary location.
+config CBFS_HEADER_ROM_OFFSET
+ hex "offset of master CBFS header in ROM"
+ default 0x2040
+
+# TODO We may probably move this to board-specific implementation files instead
+# of KConfig values.
+config CBFS_CACHE_ADDRESS
+ hex "memory address to put CBFS cache data"
default 0x02060000
+config CBFS_CACHE_SIZE
+ hex "size of CBFS cache data"
+ default 0x000017000
+
config IRAM_STACK
hex
default 0x02077f00
diff --git a/src/cpu/via/nano/update_ucode.c b/src/cpu/via/nano/update_ucode.c
index 8f7ee22..d5757f8 100644
--- a/src/cpu/via/nano/update_ucode.c
+++ b/src/cpu/via/nano/update_ucode.c
@@ -105,7 +105,7 @@ unsigned int nano_update_ucode(void)
const struct cbfs_file *cbfs_ucode;
u32 fms = cpuid_eax(0x1);
- cbfs_ucode = cbfs_find("cpu_microcode_blob.bin");
+ cbfs_ucode = cbfs_get_file(CBFS_DEFAULT_MEDIA, "cpu_microcode_blob.bin");
/* Oops, did you forget to include the microcode ? */
if(cbfs_ucode == NULL) {
printk(BIOS_ALERT, "WARNING: No microcode file found in CBFS. "
diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c
index 697d869..07eff0d 100644
--- a/src/device/oprom/realmode/x86.c
+++ b/src/device/oprom/realmode/x86.c
@@ -248,8 +248,9 @@ void vbe_set_graphics(void)
#if CONFIG_BOOTSPLASH
struct jpeg_decdata *decdata;
decdata = malloc(sizeof(*decdata));
- unsigned char *jpeg = cbfs_find_file("bootsplash.jpg",
- CBFS_TYPE_BOOTSPLASH);
+ unsigned char *jpeg = cbfs_get_file_content(CBFS_DEFAULT_MEDIA,
+ "bootsplash.jpg",
+ CBFS_TYPE_BOOTSPLASH);
if (!jpeg) {
printk(BIOS_DEBUG, "VBE: No bootsplash found.\n");
return;
@@ -366,7 +367,8 @@ void do_vsmbios(void)
printk(BIOS_SPEW, "VSA: Real mode stub @%p: %d bytes\n", REALMODE_BASE,
(u32)&__realmode_code_size);
- if ((unsigned int)cbfs_load_stage("vsa") != VSA2_ENTRY_POINT) {
+ if ((unsigned int)cbfs_load_stage(CBFS_DEFAULT_MEDIA, "vsa") !=
+ VSA2_ENTRY_POINT) {
printk(BIOS_ERR, "Failed to load VSA.\n");
return;
}
diff --git a/src/device/oprom/yabel/vbe.c b/src/device/oprom/yabel/vbe.c
index 9dbe07c..5952dae 100644
--- a/src/device/oprom/yabel/vbe.c
+++ b/src/device/oprom/yabel/vbe.c
@@ -725,7 +725,9 @@ void vbe_set_graphics(void)
* cares. */
// int imagesize = 1024*768*2;
- unsigned char *jpeg = cbfs_find_file("bootsplash.jpg", CBFS_TYPE_BOOTSPLASH);
+ unsigned char *jpeg = cbfs_get_file_content(CBFS_DEFAULT_MEDIA,
+ "bootsplash.jpg",
+ CBFS_TYPE_BOOTSPLASH);
if (!jpeg) {
DEBUG_PRINTF_VBE("Could not find bootsplash.jpg\n");
return;
diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c
index fe67515..bb0d760 100644
--- a/src/device/pci_rom.c
+++ b/src/device/pci_rom.c
@@ -35,7 +35,8 @@ struct rom_header *pci_rom_probe(struct device *dev)
struct pci_data *rom_data;
/* If it's in FLASH, then don't check device for ROM. */
- rom_header = cbfs_load_optionrom(dev->vendor, dev->device, NULL);
+ rom_header = cbfs_load_optionrom(CBFS_DEFAULT_MEDIA, dev->vendor,
+ dev->device, NULL);
u32 vendev = (dev->vendor << 16) | dev->device;
u32 mapped_vendev = vendev;
@@ -45,8 +46,10 @@ struct rom_header *pci_rom_probe(struct device *dev)
if (!rom_header) {
if (vendev != mapped_vendev) {
- rom_header = cbfs_load_optionrom(mapped_vendev >> 16,
- mapped_vendev & 0xffff , NULL);
+ rom_header = cbfs_load_optionrom(
+ CBFS_DEFAULT_MEDIA,
+ mapped_vendev >> 16,
+ mapped_vendev & 0xffff, NULL);
}
}
diff --git a/src/drivers/pc80/mc146818rtc.c b/src/drivers/pc80/mc146818rtc.c
index d8d1778..5ffa9d7 100644
--- a/src/drivers/pc80/mc146818rtc.c
+++ b/src/drivers/pc80/mc146818rtc.c
@@ -190,7 +190,8 @@ int get_option(void *dest, const char *name)
namelen = strnlen(name, CMOS_MAX_NAME_LENGTH);
/* find the requested entry record */
- ct=cbfs_find_file("cmos_layout.bin", CBFS_COMPONENT_CMOS_LAYOUT);
+ ct = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "cmos_layout.bin",
+ CBFS_COMPONENT_CMOS_LAYOUT);
if (!ct) {
printk(BIOS_ERR, "RTC: cmos_layout.bin could not be found. "
"Options are disabled\n");
@@ -268,7 +269,8 @@ int set_option(const char *name, void *value)
namelen = strnlen(name, CMOS_MAX_NAME_LENGTH);
/* find the requested entry record */
- ct=cbfs_find_file("cmos_layout.bin", CBFS_COMPONENT_CMOS_LAYOUT);
+ ct = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "cmos_layout.bin",
+ CBFS_COMPONENT_CMOS_LAYOUT);
if (!ct) {
printk(BIOS_ERR, "cmos_layout.bin could not be found. Options are disabled\n");
return(-2);
diff --git a/src/include/cbfs.h b/src/include/cbfs.h
index b33e932..a4716c1 100644
--- a/src/include/cbfs.h
+++ b/src/include/cbfs.h
@@ -2,6 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net>
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This file is dual-licensed. You can choose between:
* - The GNU GPL, version 2, as published by the Free Software Foundation
@@ -49,14 +50,38 @@
#ifndef _CBFS_H_
#define _CBFS_H_
-#include "cbfs_core.h"
-#include <boot/coreboot_tables.h>
+#include <cbfs_core.h>
-void *cbfs_load_payload(struct lb_memory *lb_mem, const char *name);
-void *cbfs_load_stage(const char *name);
-int cbfs_execute_stage(const char *name);
-void *cbfs_load_optionrom(u16 vendor, u16 device, void * dest);
+int cbfs_execute_stage(struct cbfs_media *media, const char *name);
+void *cbfs_load_optionrom(struct cbfs_media *media, uint16_t vendor,
+ uint16_t device, void * dest);
+void *cbfs_load_payload(struct cbfs_media *media, const char *name);
+void *cbfs_load_stage(struct cbfs_media *media, const char *name);
+
+/* Simple buffer for streaming media. */
+struct cbfs_simple_buffer {
+ char *buffer;
+ size_t allocated;
+ size_t size;
+ size_t last_allocate;
+};
+
+void *cbfs_simple_buffer_map(struct cbfs_simple_buffer *buffer,
+ struct cbfs_media *media,
+ size_t offset, size_t count);
+
+void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer,
+ const void *address);
+
+// Utility functions
int run_address(void *f);
+
+/* Defined in src/lib/selfboot.c */
+struct lb_memory;
int selfboot(struct lb_memory *mem, struct cbfs_payload *payload);
+
+/* Defined in individual arch / board implementation. */
+int init_default_cbfs_media(struct cbfs_media *media);
+
#endif
diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h
index a3c54b1..8ee1a47 100644
--- a/src/include/cbfs_core.h
+++ b/src/include/cbfs_core.h
@@ -3,6 +3,7 @@
*
* Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This file is dual-licensed. You can choose between:
* - The GNU GPL, version 2, as published by the Free Software Foundation
@@ -50,6 +51,10 @@
#ifndef _CBFS_CORE_H_
#define _CBFS_CORE_H_
+#include <endian.h>
+#include <stddef.h>
+#include <stdint.h>
+
/** These are standard values for the known compression
alogrithms that coreboot knows about for stages and
payloads. Of course, other CBFS users can use whatever
@@ -74,24 +79,18 @@
#define CBFS_COMPONENT_CMOS_DEFAULT 0xaa
#define CBFS_COMPONENT_CMOS_LAYOUT 0x01aa
-
-/** this is the master cbfs header - it need to be
- located somewhere in the bootblock. Where it
- actually lives is up to coreboot. On x86, a
- pointer to this header will live at 0xFFFFFFFC,
- so we can easily find it. */
-
#define CBFS_HEADER_MAGIC 0x4F524243
-#if CONFIG_ARCH_X86
-#define CBFS_HEADPTR_ADDR 0xFFFFFFFC
-#elif CONFIG_ARCH_ARMV7
-/* FIXME: This could also be 0xFFFF0000 with HIVECS enabled */
-#define CBFS_HEADPTR_ADDR 0x0000000C
-#endif
#define CBFS_HEADER_VERSION1 0x31313131
#define CBFS_HEADER_VERSION2 0x31313132
#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION2
+#define CBFS_HEADER_INVALID_ADDRESS ((void*)(0xffffffff))
+
+/** this is the master cbfs header - it need to be located somewhere available
+ to bootblock (to load romstage). Where it actually lives is up to coreboot.
+ On x86, a pointer to this header will live at 0xFFFFFFFC.
+ For other platforms, you need to define CONFIG_CBFS_HEADER_ROM_OFFSET */
+
struct cbfs_header {
uint32_t magic;
uint32_t version;
@@ -181,16 +180,49 @@ struct cbfs_optionrom {
#define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file))
#define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) )
-/* returns pointer to file inside CBFS or NULL */
-struct cbfs_file *cbfs_find(const char *name);
+#define CBFS_MEDIA_INVALID_MAP_ADDRESS ((void*)(0xffffffff))
+#define CBFS_DEFAULT_MEDIA ((void*)(0x0))
+
+/* Media for CBFS to load files. */
+struct cbfs_media {
+
+ /* implementation dependent context, to hold resource references */
+ void *context;
-/* returns pointer to file data inside CBFS */
-void *cbfs_get_file(const char *name);
+ /* opens media and returns 0 on success, -1 on failure */
+ int (*open)(struct cbfs_media *media);
-/* returns pointer to file data inside CBFS after if type is correct */
-void *cbfs_find_file(const char *name, int type);
+ /* returns number of bytes read from media into dest, starting from
+ * offset for count of bytes */
+ size_t (*read)(struct cbfs_media *media, void *dest, size_t offset,
+ size_t count);
+
+ /* returns a pointer to memory with count of bytes from media source
+ * starting from offset, or CBFS_MEDIA_INVALID_MAP_ADDRESS on failure.
+ * Note: mapped data can't be free unless unmap is called, even if you
+ * do close first. */
+ void * (*map)(struct cbfs_media *media, size_t offset, size_t count);
+
+ /* returns NULL and releases the memory by address, which was allocated
+ * by map */
+ void * (*unmap)(struct cbfs_media *media, const void *address);
+
+ /* closes media and returns 0 on success, -1 on failure. */
+ int (*close)(struct cbfs_media *media);
+};
+
+/* returns pointer to a file entry inside CBFS or NULL */
+struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name);
+
+/* returns pointer to file content inside CBFS after if type is correct */
+void *cbfs_get_file_content(struct cbfs_media *media, const char *name,
+ int type);
/* returns 0 on success, -1 on failure */
int cbfs_decompress(int algo, void *src, void *dst, int len);
-struct cbfs_header *get_cbfs_header(void);
+
+/* returns a pointer to CBFS master header, or CBFS_HEADER_INVALID_ADDRESS
+ * on failure */
+const struct cbfs_header *cbfs_get_header(struct cbfs_media *media);
+
#endif
diff --git a/src/include/endian.h b/src/include/endian.h
new file mode 100644
index 0000000..1c623b0
--- /dev/null
+++ b/src/include/endian.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2013 The Chromium OS Authors.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but without any warranty; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _ENDIAN_H_
+#define _ENDIAN_H_
+
+#include <arch/byteorder.h>
+
+#endif
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index 98672d4..8cd544e 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -2,6 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2008, Jordan Crouse <jordan(a)cosmicpenguin.net>
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,57 +18,74 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
-#include <types.h>
-#include <string.h>
-#include <console/console.h>
+#ifdef LIBPAYLOAD
+# include <libpayload-config.h>
+# ifdef CONFIG_LZMA
+# include <lzma.h>
+# define CBFS_CORE_WITH_LZMA
+# endif
+# define CBFS_MINI_BUILD
+#elif defined(__SMM__)
+# define CBFS_MINI_BUILD
+#else
+# define CBFS_CORE_WITH_LZMA
+# include <lib.h>
+#endif
+
#include <cbfs.h>
-#include <lib.h>
-#include <arch/byteorder.h>
+#include <string.h>
-// use CBFS core
-#ifndef __SMM__
-#define CBFS_CORE_WITH_LZMA
+#ifdef LIBPAYLOAD
+# include <stdio.h>
+# define DEBUG(x...)
+# define LOG(x...) printf(x)
+# define ERROR(x...) printf(x)
+#else
+# include <console/console.h>
+# define ERROR(x...) printk(BIOS_ERR, "CBFS: " x)
+# define LOG(x...) printk(BIOS_INFO, "CBFS: " x)
+# if CONFIG_DEBUG_CBFS
+# define DEBUG(x...) printk(BIOS_SPEW, "CBFS: " x)
+# else
+# define DEBUG(x...)
+# endif
#endif
-#define phys_to_virt(x) (void*)(x)
-#define virt_to_phys(x) (uint32_t)(x)
-#define ERROR(x...) printk(BIOS_ERR, "CBFS: " x)
-#define LOG(x...) printk(BIOS_INFO, "CBFS: " x)
-#if CONFIG_DEBUG_CBFS
-#define DEBUG(x...) printk(BIOS_SPEW, "CBFS: " x)
+
+#if defined(CONFIG_CBFS_HEADER_ROM_OFFSET) && (CONFIG_CBFS_HEADER_ROM_OFFSET)
+# define CBFS_HEADER_ROM_ADDRESS (CONFIG_CBFS_HEADER_ROM_OFFSET)
#else
-#define DEBUG(x...)
+// Indirect address: only works on 32bit top-aligned systems.
+# define CBFS_HEADER_ROM_ADDRESS (*(uint32_t*)0xfffffffc)
#endif
-// FIXME: romstart/romend are fine on x86, but not on ARM
-#define romstart() 0xffffffff
-#define romend() 0
#include "cbfs_core.c"
#ifndef __SMM__
static inline int tohex4(unsigned int c)
{
- return (c<=9)?(c+'0'):(c-10+'a');
+ return (c <= 9) ? (c + '0') : (c - 10 + 'a');
}
static void tohex16(unsigned int val, char* dest)
{
- dest[0]=tohex4(val>>12);
- dest[1]=tohex4((val>>8) & 0xf);
- dest[2]=tohex4((val>>4) & 0xf);
- dest[3]=tohex4(val & 0xf);
+ dest[0] = tohex4(val>>12);
+ dest[1] = tohex4((val>>8) & 0xf);
+ dest[2] = tohex4((val>>4) & 0xf);
+ dest[3] = tohex4(val & 0xf);
}
-void *cbfs_load_optionrom(u16 vendor, u16 device, void * dest)
+void *cbfs_load_optionrom(struct cbfs_media *media, uint16_t vendor,
+ uint16_t device, void *dest)
{
- char name[17]="pciXXXX,XXXX.rom";
+ char name[17] = "pciXXXX,XXXX.rom";
struct cbfs_optionrom *orom;
- u8 *src;
+ uint8_t *src;
tohex16(vendor, name+3);
tohex16(device, name+8);
orom = (struct cbfs_optionrom *)
- cbfs_find_file(name, CBFS_TYPE_OPTIONROM);
+ cbfs_get_file_content(media, name, CBFS_TYPE_OPTIONROM);
if (orom == NULL)
return NULL;
@@ -77,10 +95,10 @@ void *cbfs_load_optionrom(u16 vendor, u16 device, void * dest)
* in the common case, the expansion rom is uncompressed, we
* pass 0 in for the dest, and all we have to do is find the rom and
* return a pointer to it.
- */
+ */
/* BUG: the cbfstool is (not yet) including a cbfs_optionrom header */
- src = ((unsigned char *) orom); // + sizeof(struct cbfs_optionrom);
+ src = (uint8_t*)orom; // + sizeof(struct cbfs_optionrom);
if (! dest)
return src;
@@ -94,27 +112,27 @@ void *cbfs_load_optionrom(u16 vendor, u16 device, void * dest)
return dest;
}
-void * cbfs_load_stage(const char *name)
+void * cbfs_load_stage(struct cbfs_media *media, const char *name)
{
struct cbfs_stage *stage = (struct cbfs_stage *)
- cbfs_find_file(name, CBFS_TYPE_STAGE);
+ cbfs_get_file_content(media, name, CBFS_TYPE_STAGE);
/* this is a mess. There is no ntohll. */
/* for now, assume compatible byte order until we solve this. */
- u32 entry;
+ uint32_t entry;
if (stage == NULL)
return (void *) -1;
LOG("loading stage %s @ 0x%x (%d bytes), entry @ 0x%llx\n",
name,
- (u32) stage->load, stage->memlen,
+ (uint32_t) stage->load, stage->memlen,
stage->entry);
- memset((void *) (u32) stage->load, 0, stage->memlen);
+ memset((void *) (uint32_t) stage->load, 0, stage->memlen);
if (cbfs_decompress(stage->compression,
((unsigned char *) stage) +
sizeof(struct cbfs_stage),
- (void *) (u32) stage->load,
+ (void *) (uint32_t) stage->load,
stage->len))
return (void *) -1;
@@ -126,10 +144,10 @@ void * cbfs_load_stage(const char *name)
return (void *) entry;
}
-int cbfs_execute_stage(const char *name)
+int cbfs_execute_stage(struct cbfs_media *media, const char *name)
{
struct cbfs_stage *stage = (struct cbfs_stage *)
- cbfs_find_file(name, CBFS_TYPE_STAGE);
+ cbfs_get_file_content(media, name, CBFS_TYPE_STAGE);
if (stage == NULL)
return 1;
@@ -141,8 +159,52 @@ int cbfs_execute_stage(const char *name)
}
/* FIXME: This isn't right */
- LOG("run @ %p\n", (void *) ntohl((u32) stage->entry));
- return run_address((void *) (intptr_t)ntohll(stage->entry));
+ LOG("run @ %p\n", (void *) ntohl((uint32_t) stage->entry));
+ return run_address((void *)(uintptr_t)ntohll(stage->entry));
+}
+
+void *cbfs_load_payload(struct cbfs_media *media, const char *name)
+{
+ return (struct cbfs_payload *)cbfs_get_file_content(
+ media, name, CBFS_TYPE_PAYLOAD);
+}
+
+/* Simple buffer */
+
+void *cbfs_simple_buffer_map(struct cbfs_simple_buffer *buffer,
+ struct cbfs_media *media,
+ size_t offset, size_t count) {
+ void *address = buffer->buffer + buffer->allocated;;
+ DEBUG("simple_buffer_map(offset=%d, count=%d): "
+ "allocated=%d, size=%d, last_allocate=%d\n",
+ offset, count, buffer->allocated, buffer->size,
+ buffer->last_allocate);
+ if (buffer->allocated + count >= buffer->size)
+ return CBFS_MEDIA_INVALID_MAP_ADDRESS;
+ if (media->read(media, address, offset, count) != count) {
+ ERROR("simple_buffer: fail to read %zd bytes from 0x%zx\n",
+ count, offset);
+ return CBFS_MEDIA_INVALID_MAP_ADDRESS;
+ }
+ buffer->allocated += count;
+ buffer->last_allocate = count;
+ return address;
+}
+
+void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer,
+ const void *address) {
+ // TODO Add simple buffer management so we can free more than last
+ // allocated one.
+ DEBUG("simple_buffer_unmap(address=0x%p): "
+ "allocated=%d, size=%d, last_allocate=%d\n",
+ address, buffer->allocated, buffer->size,
+ buffer->last_allocate);
+ if ((buffer->buffer + buffer->allocated - buffer->last_allocate) ==
+ address) {
+ buffer->allocated -= buffer->last_allocate;
+ buffer->last_allocate = 0;
+ }
+ return NULL;
}
/**
@@ -158,4 +220,5 @@ int run_address(void *f)
v = f;
return v();
}
+
#endif
diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c
index 15cb68e..8455f5e 100644
--- a/src/lib/cbfs_core.c
+++ b/src/lib/cbfs_core.c
@@ -1,7 +1,8 @@
/*
- * This file is part of the libpayload project.
+ * This file is part of the coreboot project.
*
* Copyright (C) 2011 secunet Security Networks AG
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,14 +28,15 @@
* SUCH DAMAGE.
*/
-/* The CBFS core requires a couple of #defines or functions to adapt it to the target environment:
+/* The CBFS core requires a couple of #defines or functions to adapt it to the
+ * target environment:
*
* CBFS_CORE_WITH_LZMA (must be #define)
* if defined, ulzma() must exist for decompression of data streams
*
- * phys_to_virt(x), virt_to_phys(x)
- * translate physical addresses to virtual and vice versa
- * can be idempotent if no mapping is necessary.
+ * CBFS_HEADER_ROM_ADDRESS
+ * ROM address (offset) of CBFS header. Underlying CBFS media may interpret
+ * it in other way so we call this "address".
*
* ERROR(x...)
* print an error message x (in printf format)
@@ -45,105 +47,134 @@
* DEBUG(x...)
* print a debug message x (in printf format)
*
- * romstart()
- * returns the start address of the ROM image, or 0xffffffff if ROM is
- * top-aligned. This is a physical address.
- *
- * romend()
- * returns the highest address of the ROM image + 1, for use if
- * romstart() == 0xffffffff. This is a physical address.
*/
-#include <cbfs_core.h>
-
+#include <cbfs.h>
+#include <string.h>
-/* returns pointer to master header or 0xffffffff if not found */
-struct cbfs_header *get_cbfs_header(void)
+/* returns a pointer to CBFS master header, or CBFS_HEADER_INVALID_ADDRESS
+ * on failure */
+const struct cbfs_header *cbfs_get_header(struct cbfs_media *media)
{
- struct cbfs_header *header;
-
- /* find header */
- if (romstart() == 0xffffffff) {
- header = (struct cbfs_header*)phys_to_virt(*(uint32_t*)phys_to_virt(romend() + CBFS_HEADPTR_ADDR));
- } else {
- // FIXME: where's the master header on ARM (our current bottom-aligned platform)?
- header = NULL;
+ const struct cbfs_header *header;
+ struct cbfs_media default_media;
+
+ if (media == CBFS_DEFAULT_MEDIA) {
+ media = &default_media;
+ if (init_default_cbfs_media(media) != 0) {
+ ERROR("Failed to initializee default media.\n");
+ return NULL;
+ }
+ }
+
+ media->open(media);
+ DEBUG("CBFS_HEADER_ROM_ADDRESS: 0x%x/0x%x\n", CBFS_HEADER_ROM_ADDRESS,
+ CONFIG_ROM_SIZE);
+ header = media->map(media, CBFS_HEADER_ROM_ADDRESS, sizeof(*header));
+ media->close(media);
+
+ if (header == CBFS_MEDIA_INVALID_MAP_ADDRESS) {
+ ERROR("Failed to load CBFS header from 0x%x\n",
+ CBFS_HEADER_ROM_ADDRESS);
+ return CBFS_HEADER_INVALID_ADDRESS;
}
+
if (CBFS_HEADER_MAGIC != ntohl(header->magic)) {
- ERROR("Could not find valid CBFS master header at %p: %x vs %x.\n", header, CBFS_HEADER_MAGIC, ntohl(header->magic));
+ ERROR("Could not find valid CBFS master header at %x: "
+ "%x vs %x.\n", CBFS_HEADER_ROM_ADDRESS, CBFS_HEADER_MAGIC,
+ ntohl(header->magic));
if (header->magic == 0xffffffff) {
ERROR("Maybe ROM is not mapped properly?\n");
}
- return (void*)0xffffffff;
+ return CBFS_HEADER_INVALID_ADDRESS;
}
return header;
}
-// by must be power-of-two
-#define CBFS_ALIGN(val, by) (typeof(val))((uint32_t)(val + by - 1) & (uint32_t)~(by - 1))
-#define CBFS_ALIGN_UP(val, by) CBFS_ALIGN(val + 1, by)
-
/* public API starts here*/
-struct cbfs_file *cbfs_find(const char *name)
+struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name)
{
- struct cbfs_header *header = get_cbfs_header();
- if (header == (void*)0xffffffff) return NULL;
-
- LOG("Looking for '%s'\n", name);
-
- void *data, *dataend, *origdata;
- /* find first entry */
- if (romstart() == 0xffffffff) {
- data = (void*)phys_to_virt(romend()) - ntohl(header->romsize) + ntohl(header->offset);
- dataend = (void*)phys_to_virt(romend());
- } else {
- data = (void*)phys_to_virt(romstart()) + ntohl(header->offset);
- dataend = (void*)phys_to_virt(romstart()) + ntohl(header->romsize);
- }
- dataend -= ntohl(header->bootblocksize);
-
- int align = ntohl(header->align);
-
- origdata = data;
- while ((data < (dataend - 1)) && (data >= origdata)) {
- struct cbfs_file *file = data;
- if (memcmp(CBFS_FILE_MAGIC, file->magic, strlen(CBFS_FILE_MAGIC)) != 0) {
- // no file header found. corruption?
- // proceed in aligned steps to resynchronize
- LOG("ERROR: No file header found at %p, attempting to recover by searching for header\n", data);
- data = phys_to_virt(CBFS_ALIGN_UP(virt_to_phys(data), align));
- continue;
- }
- DEBUG("Check '%s'\n", CBFS_NAME(file));
- if (strcmp(CBFS_NAME(file), name) == 0) {
- LOG("found.\n");
- return file;
- }
- void *olddata = data;
- data = phys_to_virt(CBFS_ALIGN(virt_to_phys(data) + ntohl(file->len) + ntohl(file->offset), align));
- if (olddata > data) {
- LOG("Something is wrong here. File chain moved from %p to %p\n", olddata, data);
+ const char *file_name;
+ uint32_t offset, align, romsize, name_len;
+ const struct cbfs_header *header;
+ struct cbfs_file file, *file_ptr;
+ struct cbfs_media default_media;
+
+ if (media == CBFS_DEFAULT_MEDIA) {
+ media = &default_media;
+ if (init_default_cbfs_media(media) != 0) {
+ ERROR("Failed to initializee default media.\n");
return NULL;
}
}
- return NULL;
-}
-
-void *cbfs_get_file(const char *name)
-{
- struct cbfs_file *file = cbfs_find(name);
- if (file == NULL) {
- ERROR("Could not find file '%s'.\n", name);
+ if (CBFS_HEADER_INVALID_ADDRESS == (header = cbfs_get_header(media)))
return NULL;
- }
- return (void*)CBFS_SUBHEADER(file);
+ // Logical offset (for source media) of first file.
+ offset = ntohl(header->offset);
+ align = ntohl(header->align);
+ romsize = ntohl(header->romsize);
+
+ // TODO header->romsize seems broken now on ARM. Remove this when it's
+ // fixed.
+#if defined(CONFIG_ARCH_ARMV7) && CONFIG_ARCH_ARMV7
+ romsize = CONFIG_ROM_SIZE;
+#endif
+ DEBUG("offset: 0x%x, align: %d, romsize: %d\n", offset, align, romsize);
+
+ LOG("Looking for '%s' starting from 0x%x.\n", name, offset);
+ media->open(media);
+ while (offset < romsize &&
+ media->read(media, &file, offset, sizeof(file)) == sizeof(file)) {
+ if (memcmp(CBFS_FILE_MAGIC, file.magic,
+ sizeof(file.magic)) != 0) {
+ uint32_t new_align = align;
+ if (offset % align)
+ new_align += align - (offset % align);
+ ERROR("ERROR: No file header found at 0x%xx - "
+ "try next aligned address: 0x%x.\n", offset,
+ offset + new_align);
+ offset += new_align;
+ continue;
+ }
+ name_len = ntohl(file.offset) - sizeof(file);
+ DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset,
+ name_len);
+
+ // load file name (arbitrary length).
+ file_name = (const char*)media->map(
+ media, offset + sizeof(file), name_len);
+ if (file_name == CBFS_MEDIA_INVALID_MAP_ADDRESS) {
+ ERROR("ERROR: Failed to get filename: 0x%x.\n", offset);
+ } else if (strcmp(file_name, name) == 0) {
+ int file_offset = ntohl(file.offset),
+ file_len = ntohl(file.len);
+ LOG("Found file (offset=0x%x, len=%d).\n",
+ offset + file_offset, file_len);
+ media->unmap(media, file_name);
+ file_ptr = media->map(media, offset,
+ file_offset + file_len);
+ media->close(media);
+ return file_ptr;
+ } else {
+ LOG(" (unmatched file @0x%x: %s)\n", offset, file_name);
+ media->unmap(media, file_name);
+ }
+
+ // Move to next file.
+ offset += ntohl(file.len) + ntohl(file.offset);
+ if (offset % align)
+ offset += align - (offset % align);
+ }
+ media->close(media);
+ ERROR("ERROR: Not found.\n");
+ return NULL;
}
-void *cbfs_find_file(const char *name, int type)
+void *cbfs_get_file_content(struct cbfs_media *media, const char *name, int type)
{
- struct cbfs_file *file = cbfs_find(name);
+ struct cbfs_file *file = cbfs_get_file(media, name);
if (file == NULL) {
ERROR("Could not find file '%s'.\n", name);
@@ -151,7 +182,8 @@ void *cbfs_find_file(const char *name, int type)
}
if (ntohl(file->type) != type) {
- ERROR("File '%s' is of type %x, but we requested %x.\n", name, ntohl(file->type), type);
+ ERROR("File '%s' is of type %x, but we requested %x.\n", name,
+ ntohl(file->type), type);
return NULL;
}
@@ -172,7 +204,9 @@ int cbfs_decompress(int algo, void *src, void *dst, int len)
return -1;
#endif
default:
- ERROR("tried to decompress %d bytes with algorithm #%x, but that algorithm id is unsupported.\n", len, algo);
+ ERROR("tried to decompress %d bytes with algorithm #%x,"
+ "but that algorithm id is unsupported.\n", len,
+ algo);
return -1;
}
}
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index eed243a..85c05f5 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -59,6 +59,7 @@ void hardwaremain(int boot_complete);
void hardwaremain(int boot_complete)
{
struct lb_memory *lb_mem;
+ void *payload;
timestamp_stash(TS_START_RAMSTAGE);
post_code(POST_ENTRY_RAMSTAGE);
@@ -141,8 +142,8 @@ void hardwaremain(int boot_complete)
timestamp_add_now(TS_LOAD_PAYLOAD);
- void *payload;
- payload = cbfs_load_payload(lb_mem, CONFIG_CBFS_PREFIX "/payload");
+ payload = cbfs_load_payload(CBFS_DEFAULT_MEDIA,
+ CONFIG_CBFS_PREFIX "/payload");
if (! payload)
die("Could not find a payload\n");
diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index c5fb62a..56124da 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -536,12 +536,3 @@ out:
return 0;
}
-void *cbfs_load_payload(struct lb_memory *lb_mem, const char *name)
-{
- struct cbfs_payload *payload;
-
- payload = (struct cbfs_payload *)cbfs_find_file(name, CBFS_TYPE_PAYLOAD);
-
- return payload;
-}
-
diff --git a/src/mainboard/google/snow/bootblock.c b/src/mainboard/google/snow/bootblock.c
index d5ee0a3..e9fc13e 100644
--- a/src/mainboard/google/snow/bootblock.c
+++ b/src/mainboard/google/snow/bootblock.c
@@ -17,11 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define uchar unsigned char
-#define uint unsigned int
-
#include <stdlib.h>
#include <types.h>
+#include <assert.h>
+#include <arch/armv7/include/common.h>
#include <arch/io.h>
#include "cpu/samsung/exynos5250/clk.h"
#include "cpu/samsung/exynos5250/cpu.h"
@@ -34,6 +33,7 @@
#include "cpu/samsung/s5p-common/s3c24x0_i2c.h"
#include "cpu/samsung/exynos5-common/spi.h"
#include "cpu/samsung/exynos5-common/uart.h"
+#include "cbfs_core.h"
#include <device/i2c.h>
#include <drivers/maxim/max77686/max77686.h>
@@ -42,87 +42,9 @@
#define EXYNOS5_CLOCK_BASE 0x10010000
-/* FIXME(dhendrix): Can we move this SPI stuff elsewhere? */
-static void spi_rx_tx(struct exynos_spi *regs, int todo,
- void *dinp, void const *doutp, int i)
-{
- unsigned int *rxp = (unsigned int *)(dinp + (i * (32 * 1024)));
- int rx_lvl, tx_lvl;
- unsigned int out_bytes, in_bytes;
-
- out_bytes = in_bytes = todo;
- setbits_le32(®s->ch_cfg, SPI_CH_RST);
- clrbits_le32(®s->ch_cfg, SPI_CH_RST);
- writel(((todo * 8) / 32) | SPI_PACKET_CNT_EN, ®s->pkt_cnt);
-
- while (in_bytes) {
- uint32_t spi_sts;
- int temp;
-
- spi_sts = readl(®s->spi_sts);
- rx_lvl = ((spi_sts >> 15) & 0x7f);
- tx_lvl = ((spi_sts >> 6) & 0x7f);
- while (tx_lvl < 32 && out_bytes) {
- temp = 0xffffffff;
- writel(temp, ®s->tx_data);
- out_bytes -= 4;
- tx_lvl += 4;
- }
- while (rx_lvl >= 4 && in_bytes) {
- temp = readl(®s->rx_data);
- if (rxp)
- *rxp++ = temp;
- in_bytes -= 4;
- rx_lvl -= 4;
- }
- }
-}
+// TODO Move this to Makefile.inc once we support adding bootblock stage files.
+#include "cpu/samsung/exynos5-common/spi.c"
-#if 0
-void clock_ll_set_pre_ratio(enum periph_id periph_id, unsigned divisor)
-{
- struct exynos5_clock *clk =
- (struct exynos5_clock *)samsung_get_base_clock();
- unsigned shift;
- unsigned mask = 0xff;
- u32 *reg;
-
- /*
- * For now we only handle a very small subset of peipherals here.
- * Others will need to (and do) mangle the clock registers
- * themselves, At some point it is hoped that this function can work
- * from a table or calculated register offset / mask. For now this
- * is at least better than spreading clock control code around
- * U-Boot.
- */
- switch (periph_id) {
- case PERIPH_ID_SPI0:
- reg = &clk->div_peric1;
- shift = 8;
- break;
- case PERIPH_ID_SPI1:
- reg = &clk->div_peric1;
- shift = 24;
- break;
- case PERIPH_ID_SPI2:
- reg = &clk->div_peric2;
- shift = 8;
- break;
- case PERIPH_ID_SPI3:
- reg = &clk->sclk_div_isp;
- shift = 4;
- break;
- case PERIPH_ID_SPI4:
- reg = &clk->sclk_div_isp;
- shift = 16;
- break;
- default:
- debug("%s: Unsupported peripheral ID %d\n", __func__,
- periph_id);
- return;
- }
-}
-#endif
void clock_ll_set_pre_ratio(enum periph_id periph_id, unsigned divisor)
{
struct exynos5_clock *clk =
@@ -136,43 +58,6 @@ void clock_ll_set_pre_ratio(enum periph_id periph_id, unsigned divisor)
clrsetbits_le32(reg, mask << shift, (divisor & mask) << shift);
}
-#if 0
-void clock_ll_set_ratio(enum periph_id periph_id, unsigned divisor)
-{
- struct exynos5_clock *clk =
- (struct exynos5_clock *)samsung_get_base_clock();
- unsigned shift;
- unsigned mask = 0xff;
- u32 *reg;
-
- switch (periph_id) {
- case PERIPH_ID_SPI0:
- reg = &clk->div_peric1;
- shift = 0;
- break;
- case PERIPH_ID_SPI1:
- reg = &clk->div_peric1;
- shift = 16;
- break;
- case PERIPH_ID_SPI2:
- reg = &clk->div_peric2;
- shift = 0;
- break;
- case PERIPH_ID_SPI3:
- reg = &clk->sclk_div_isp;
- shift = 0;
- break;
- case PERIPH_ID_SPI4:
- reg = &clk->sclk_div_isp;
- shift = 12;
- break;
- default:
- debug("%s: Unsupported peripheral ID %d\n", __func__,
- periph_id);
- return;
- }
-}
-#endif
void clock_ll_set_ratio(enum periph_id periph_id, unsigned divisor)
{
struct exynos5_clock *clk =
@@ -249,44 +134,6 @@ static int clock_calc_best_scalar(unsigned int main_scaler_bits,
return best_main_scalar;
}
-#if 0
-int clock_set_rate(enum periph_id periph_id, unsigned int rate)
-{
- int main;
- unsigned int fine;
-
- switch (periph_id) {
- case PERIPH_ID_SPI0:
- case PERIPH_ID_SPI1:
- case PERIPH_ID_SPI2:
- case PERIPH_ID_SPI3:
- case PERIPH_ID_SPI4:
- main = clock_calc_best_scalar(4, 8, 400000000, rate, &fine);
- if (main < 0) {
- debug("%s: Cannot set clock rate for periph %d",
- __func__, periph_id);
- return -1;
- }
- clock_ll_set_ratio(periph_id, main - 1);
- clock_ll_set_pre_ratio(periph_id, fine - 1);
- break;
- default:
- debug("%s: Unsupported peripheral ID %d\n", __func__,
- periph_id);
- return -1;
- }
- main = clock_calc_best_scalar(4, 8, 400000000, rate, &fine);
- if (main < 0) {
- debug("%s: Cannot set clock rate for periph %d",
- __func__, periph_id);
- return -1;
- }
- clock_ll_set_ratio(PERIPH_ID_SPI1, main - 1);
- clock_ll_set_pre_ratio(PERIPH_ID_SPI1, fine - 1);
-
- return 0;
-}
-#endif
int clock_set_rate(enum periph_id periph_id, unsigned int rate)
{
int main;
@@ -358,77 +205,6 @@ void gpio_cfg_pin(int gpio, int cfg)
writel(value, &bank->con);
}
-//static void exynos_spi_copy(unsigned int uboot_size)
-static void copy_romstage(uint32_t spi_addr, uint32_t sram_addr, unsigned int len)
-{
- int upto, todo;
- int i;
-// struct exynos_spi *regs = (struct exynos_spi *)samsung_get_base_spi1();
- struct exynos_spi *regs = (struct exynos_spi *)0x12d30000;
-
- clock_set_rate(PERIPH_ID_SPI1, 50000000); /* set spi clock to 50Mhz */
- /* set the spi1 GPIO */
-// exynos_pinmux_config(PERIPH_ID_SPI1, PINMUX_FLAG_NONE);
- gpio_cfg_pin(GPIO_A24, 0x2);
- gpio_cfg_pin(GPIO_A25, 0x2);
- gpio_cfg_pin(GPIO_A26, 0x2);
- gpio_cfg_pin(GPIO_A27, 0x2);
-
- /* set pktcnt and enable it */
- writel(4 | SPI_PACKET_CNT_EN, ®s->pkt_cnt);
- /* set FB_CLK_SEL */
- writel(SPI_FB_DELAY_180, ®s->fb_clk);
- /* set CH_WIDTH and BUS_WIDTH as word */
- setbits_le32(®s->mode_cfg, SPI_MODE_CH_WIDTH_WORD |
- SPI_MODE_BUS_WIDTH_WORD);
- clrbits_le32(®s->ch_cfg, SPI_CH_CPOL_L); /* CPOL: active high */
-
- /* clear rx and tx channel if set priveously */
- clrbits_le32(®s->ch_cfg, SPI_RX_CH_ON | SPI_TX_CH_ON);
-
- setbits_le32(®s->swap_cfg, SPI_RX_SWAP_EN |
- SPI_RX_BYTE_SWAP |
- SPI_RX_HWORD_SWAP);
-
- /* do a soft reset */
- setbits_le32(®s->ch_cfg, SPI_CH_RST);
- clrbits_le32(®s->ch_cfg, SPI_CH_RST);
-
- /* now set rx and tx channel ON */
- setbits_le32(®s->ch_cfg, SPI_RX_CH_ON | SPI_TX_CH_ON | SPI_CH_HS_EN);
- clrbits_le32(®s->cs_reg, SPI_SLAVE_SIG_INACT); /* CS low */
-
- /* Send read instruction (0x3h) followed by a 24 bit addr */
- writel((SF_READ_DATA_CMD << 24) | spi_addr, ®s->tx_data);
-
- /* waiting for TX done */
- while (!(readl(®s->spi_sts) & SPI_ST_TX_DONE));
-
- for (upto = 0, i = 0; upto < len; upto += todo, i++) {
- todo = MIN(len - upto, (1 << 15));
- spi_rx_tx(regs, todo, (void *)(sram_addr),
- (void *)(spi_addr), i);
- }
-
- setbits_le32(®s->cs_reg, SPI_SLAVE_SIG_INACT);/* make the CS high */
-
- /*
- * Let put controller mode to BYTE as
- * SPI driver does not support WORD mode yet
- */
- clrbits_le32(®s->mode_cfg, SPI_MODE_CH_WIDTH_WORD |
- SPI_MODE_BUS_WIDTH_WORD);
- writel(0, ®s->swap_cfg);
-
- /*
- * Flush spi tx, rx fifos and reset the SPI controller
- * and clear rx/tx channel
- */
- clrsetbits_le32(®s->ch_cfg, SPI_CH_HS_EN, SPI_CH_RST);
- clrbits_le32(®s->ch_cfg, SPI_CH_RST);
- clrbits_le32(®s->ch_cfg, SPI_TX_CH_ON | SPI_RX_CH_ON);
-}
-
/* Pull mode */
#define EXYNOS_GPIO_PULL_NONE 0x0
#define EXYNOS_GPIO_PULL_DOWN 0x1
@@ -850,21 +626,15 @@ void do_barriers(void)
);
}
-void sdelay(unsigned long loops);
-void sdelay(unsigned long loops)
-{
- __asm__ volatile ("1:\n" "subs %0, %1, #1\n"
- "bne 1b":"=r" (loops):"0"(loops));
-}
-
/* is this right? meh, it seems to work well enough... */
void my_udelay(unsigned int n);
void my_udelay(unsigned int n)
{
- sdelay(n * 1000);
+ n *= 1000;
+ __asm__ volatile ("1:\n" "subs %0, %1, #1\n"
+ "bne 1b":"=r" (n):"0"(n));
}
-
void i2c_init(int speed, int slaveadd)
{
struct s3c24x0_i2c_bus *i2c = &i2c0;
@@ -2141,13 +1911,6 @@ void bootblock_mainboard_init(void)
do_serial();
printk(BIOS_INFO, "%s: UART initialized\n", __func__);
- /* Copy romstage data from SPI ROM to SRAM */
- printk(BIOS_INFO, "Copying romstage:\n"
- "\tSPI offset: 0x%06x\n"
- "\tiRAM offset: 0x%08x\n"
- "\tSize: 0x%x\n",
- 0, CONFIG_SPI_IMAGE_HACK, CONFIG_ROMSTAGE_SIZE);
- copy_romstage(0x0, CONFIG_SPI_IMAGE_HACK, CONFIG_ROMSTAGE_SIZE);
#if 0
/* FIXME: dump SRAM content for sanity checking */
uint32_t u;
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index 5600cf6..9bc193b 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -301,7 +301,7 @@ void main(unsigned long bist)
break;
}
- spd_file = cbfs_find("spd.bin");
+ spd_file = cbfs_get_file(CBFS_DEFAULT_MEDIA, "spd.bin");
if (!spd_file)
die("SPD data not found.");
if (spd_file->len < (spd_index + 1) * 256)
diff --git a/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.c b/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.c
index 7c3b0ac..8c5605c 100644
--- a/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.c
+++ b/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.c
@@ -398,7 +398,9 @@ AGESA_STATUS fam15tn_DefaultRet (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
AGESA_STATUS fam15tn_HookGfxGetVbiosImage(UINT32 Func, UINT32 FchData, VOID *ConfigPrt)
{
GFX_VBIOS_IMAGE_INFO *pVbiosImageInfo = (GFX_VBIOS_IMAGE_INFO *)ConfigPrt;
- pVbiosImageInfo->ImagePtr = cbfs_find_file("pci"CONFIG_VGA_BIOS_ID".rom", CBFS_TYPE_OPTIONROM);
+ pVbiosImageInfo->ImagePtr = cbfs_get_file_content(
+ CBFS_DEFAULT_MEDIA, "pci"CONFIG_VGA_BIOS_ID".rom",
+ CBFS_TYPE_OPTIONROM);
/* printk(BIOS_DEBUG, "IMGptr=%x\n", pVbiosImageInfo->ImagePtr); */
return pVbiosImageInfo->ImagePtr == NULL ? AGESA_WARNING : AGESA_SUCCESS;
}
diff --git a/src/northbridge/intel/i82830/vga.c b/src/northbridge/intel/i82830/vga.c
index 1ec7f87..40e7d9d 100644
--- a/src/northbridge/intel/i82830/vga.c
+++ b/src/northbridge/intel/i82830/vga.c
@@ -32,7 +32,7 @@
static void vga_init(device_t dev)
{
printk(BIOS_INFO, "Starting Graphics Initialization\n");
- struct cbfs_file *file = cbfs_find("mbi.bin");
+ struct cbfs_file *file = cbfs_get_file(CBFS_DEFAULT_MEDIA, "mbi.bin");
void *mbi = NULL;
unsigned int mbi_len = 0;
diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c
index b5a1c23..f25aaa1 100644
--- a/src/northbridge/intel/sandybridge/raminit.c
+++ b/src/northbridge/intel/sandybridge/raminit.c
@@ -252,7 +252,9 @@ void sdram_initialize(struct pei_data *pei_data)
pei_data->tx_byte = console_tx_byte;
/* Locate and call UEFI System Agent binary. */
- entry = (unsigned long)cbfs_find_file("mrc.bin", 0xab);
+ /* TODO make MRC blob (0xab?) defined in cbfs_core.h. */
+ entry = (unsigned long)cbfs_get_file_content(
+ CBFS_DEFAULT_MEDIA, "mrc.bin", 0xab);
if (entry) {
int rv;
asm volatile (
1
0
Patch set updated for coreboot: f09c916 Improve CBFS tool to support platform without top-aligned mapping.
by Hung-Te Lin 27 Jan '13
by Hung-Te Lin 27 Jan '13
27 Jan '13
Hung-Te Lin (hungte(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2194
-gerrit
commit f09c916722ee6f9cc84808f605171699591c1853
Author: Hung-Te Lin <hungte(a)chromium.org>
Date: Sat Jan 26 02:03:28 2013 +0800
Improve CBFS tool to support platform without top-aligned mapping.
CBFS tool was written with lots of global variables and designed with assumption
based on x86 architecture. To support other platforms better, we should rewrite
using logical offset instead of top-aligned memory mapped address.
Also fixed a calculation error in size of last entry (which will cause
overwriting header data when you really used every bits in CBFS) in old
CBFS tool.
Usage changes:
- "locate" is changed to "locate-stage" (which is the real behavior in old
cbfstool) and prefix output with "0x". The output is now platform
independent offset. To retrieve x86 top-aligned virtual address, add "-T".
"-a" for locate-stage is ignored because it's not used in current x86 build
process, and can't be assigned when you really add a stage.
- "create" takes two extra optional params:
"-A": bootblock offset. When omitted, put bootblock in end of ROM.
"-H": header offset. When omitted, put header right before bootblock,
and put a top-aligned virtual address reference in end of ROM.
- "architecture" (-m) is deprecated because we won't want to list hundreds of
architecture variants (ex, ARM).
- "-v" (verbose out) now really works.
- "-b" (base-address) was ignored for add-* commands. Need more testing to see
if that will break some platform.
Verified to work on ARM (google/snow) and X86 (qemu/x86).
Change-Id: I28c737c8f290e51332119188248ac9e28042024c
Signed-off-by: Hung-Te Lin <hungte(a)chromium.org>
---
src/arch/armv7/Makefile.inc | 13 +-
src/arch/x86/Makefile.inc | 8 +-
util/cbfstool/cbfs-mkpayload.c | 82 ++-
util/cbfstool/cbfs-mkstage.c | 39 +-
util/cbfstool/cbfs.h | 7 +-
util/cbfstool/cbfstool.c | 671 +++++++++++-----------
util/cbfstool/common.c | 1214 +++++++++++++++++++---------------------
util/cbfstool/common.h | 196 +++++--
8 files changed, 1120 insertions(+), 1110 deletions(-)
diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc
index 872365c..e889890 100644
--- a/src/arch/armv7/Makefile.inc
+++ b/src/arch/armv7/Makefile.inc
@@ -46,9 +46,12 @@ prebuild-files = \
$(if $(call extract_nth,4,$(file)),-b $(call extract_nth,4,$(file))) &&)
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
+# TODO(hungte) Change CBFS command to use per-board params. Also we don't need
+# to prefix 0x2000 bytes of zero in boot block anymore!
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
- $(CBFSTOOL) $@.tmp create -m armv7 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
- -B $(objcbfs)/bootblock.bin -a 64
+ $(CBFSTOOL) $@.tmp create -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
+ -B $(objcbfs)/bootblock.bin -a 64 -A 0x0000 -H 0x2040 \
+ -o 0x5000
$(prebuild-files) true
mv $@.tmp $@
else
@@ -314,11 +317,9 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas
$(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin
@printf " generating base_xip.txt\n"
rm -f $@
- $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
+ $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
|| { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; }
- sed -e 's/^/0x/g' $@.tmp > $@.tmp2
- rm $@.tmp
- mv $@.tmp2 $@
+ mv $@.tmp $@
$(objgenerated)/crt0.romstage.S: $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n"
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index ea86f8f..c71cb5e 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -65,7 +65,7 @@ prebuild-files = \
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
- $(CBFSTOOL) $@.tmp create -m x86 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
+ $(CBFSTOOL) $@.tmp create -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
-B $(objcbfs)/bootblock.bin -a 64 \
-o $$(( $(CONFIG_ROM_SIZE) - $(CONFIG_CBFS_SIZE) ))
$(prebuild-files) true
@@ -375,11 +375,9 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas
$(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin
rm -f $@
- $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
+ $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -T -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
|| { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; }
- sed -e 's/^/0x/g' $@.tmp > $@.tmp2
- rm $@.tmp
- mv $@.tmp2 $@
+ mv $@.tmp $@
$(objgenerated)/crt0.romstage.S: $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n"
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index 0d3986e..3c19d55 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -22,24 +22,18 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo)
+int parse_elf_to_payload(char *input, char **output, comp_algo algo)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
Elf32_Shdr *shdr;
char *header;
char *strtab;
- unsigned char *sptr;
+ char *sptr;
int headers;
int segments = 1;
int isize = 0, osize = 0;
@@ -47,21 +41,16 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
struct cbfs_payload_segment *segs;
int i;
- if(!iself(input)){
+ if(!is_elf_object(input)){
fprintf(stderr, "E: The payload file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The payload file has the wrong architecture\n");
- return -1;
- }
-
comp_func_ptr compress = compression_function(algo);
if (!compress)
return -1;
+ DEBUG("start: parse_elf_to_payload\n");
headers = ehdr->e_phnum;
header = (char *)ehdr;
@@ -156,9 +145,9 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
if (phdr[i].p_filesz == 0) {
segs[segments].type = PAYLOAD_SEGMENT_BSS;
segs[segments].load_addr =
- (uint64_t)htonll(phdr[i].p_paddr);
+ htonll(phdr[i].p_paddr);
segs[segments].mem_len =
- (uint32_t)htonl(phdr[i].p_memsz);
+ htonl(phdr[i].p_memsz);
segs[segments].offset = htonl(doffset);
segments++;
@@ -169,8 +158,8 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
segs[segments].type = PAYLOAD_SEGMENT_CODE;
else
segs[segments].type = PAYLOAD_SEGMENT_DATA;
- segs[segments].load_addr = (uint64_t)htonll(phdr[i].p_paddr);
- segs[segments].mem_len = (uint32_t)htonl(phdr[i].p_memsz);
+ segs[segments].load_addr = htonll(phdr[i].p_paddr);
+ segs[segments].mem_len = htonl(phdr[i].p_memsz);
segs[segments].compression = htonl(algo);
segs[segments].offset = htonl(doffset);
@@ -197,7 +186,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
}
segs[segments].type = PAYLOAD_SEGMENT_ENTRY;
- segs[segments++].load_addr = (uint64_t)htonll(ehdr->e_entry);
+ segs[segments++].load_addr = htonll(ehdr->e_entry);
*output = sptr;
@@ -206,3 +195,54 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
err:
return -1;
}
+
+int parse_flat_binary_to_payload(char *input,
+ char **output,
+ uint32_t input_size,
+ uint32_t loadaddress,
+ uint32_t entrypoint,
+ comp_algo algo)
+{
+ comp_func_ptr compress;
+ char *payload;
+ struct cbfs_payload_segment *segs;
+ int doffset, len = 0;
+
+ compress = compression_function(algo);
+ if (!compress)
+ return 1;
+
+ DEBUG("start: parse_flat_binary_to_payload\n");
+ /* FIXME compressed file size might be bigger than original file */
+ payload = calloc((2 * sizeof(*segs)) + input_size, 1);
+ if (payload == NULL) {
+ fprintf(stderr, "E: Could not allocate memory.\n");
+ return 1;
+ }
+
+ segs = (struct cbfs_payload_segment *)payload;
+ doffset = (2 * sizeof(*segs));
+
+ /* Prepare code segment */
+ segs[0].type = PAYLOAD_SEGMENT_CODE;
+ segs[0].load_addr = htonll(loadaddress);
+ segs[0].mem_len = htonl(input_size);
+ segs[0].offset = htonl(doffset);
+
+ compress(input, input_size, (char *)(payload + doffset), &len);
+ segs[0].compression = htonl(algo);
+ segs[0].len = htonl(len);
+
+ if ((unsigned int)len >= input_size) {
+ segs[0].compression = 0;
+ segs[0].len = htonl(input_size);
+ memcpy(payload + doffset, input, input_size);
+ }
+
+ /* prepare entry point segment */
+ segs[1].type = PAYLOAD_SEGMENT_ENTRY;
+ segs[1].load_addr = htonll(entrypoint);
+
+ *output = payload;
+ return doffset + ntohl(segs[0].len);
+}
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index 0541d4b..9e47047 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -23,14 +23,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
static unsigned int idemp(unsigned int x)
{
@@ -48,13 +43,13 @@ static unsigned int swap32(unsigned int x)
unsigned int (*elf32_to_native) (unsigned int) = idemp;
/* returns size of result, or -1 if error */
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location)
+int parse_elf_to_stage(char *input, char **output,
+ comp_algo algo, uint32_t location)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
char *header, *buffer;
- unsigned char *out;
+ char *out;
int headers;
int i;
@@ -67,21 +62,16 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
if (!compress)
return -1;
- if (!iself(input)) {
+ DEBUG("start: parse_elf_to_stage(location=0x%x)\n", location);
+ if (!is_elf_object(input)) {
fprintf(stderr, "E: The stage file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The stage file has the wrong architecture\n");
- return -1;
- }
-
if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
elf_bigendian = 1;
}
- if (elf_bigendian != host_bigendian) {
+ if (elf_bigendian != is_big_endian()) {
elf32_to_native = swap32;
}
@@ -125,8 +115,8 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
mem_end = mend;
}
- if (data_start < *location) {
- data_start = *location;
+ if (data_start < location) {
+ data_start = location;
}
if (data_end <= data_start) {
@@ -155,9 +145,9 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
continue;
l_start = elf32_to_native(phdr[i].p_paddr);
- if (l_start < *location) {
- l_offset = *location - l_start;
- l_start = *location;
+ if (l_start < location) {
+ l_offset = location - l_start;
+ l_start = location;
}
memcpy(buffer + (l_start - data_start),
@@ -184,10 +174,7 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
(char *)(out + sizeof(struct cbfs_stage)), (int *)&stage->len);
free(buffer);
-
*output = out;
- if (*location)
- *location -= sizeof(struct cbfs_stage);
- return sizeof(struct cbfs_stage) + stage->len;
+ return sizeof(*stage) + stage->len;
}
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 3dbeefd..26ab62f 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -25,7 +25,9 @@
#define CBFS_HEADPTR_ADDR_X86 0xFFFFFFFC
#define CBFS_HEADER_VERSION1 0x31313131
#define CBFS_HEADER_VERSION2 0x31313132
-#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION2
+// TODO(hungte) We probably don't need "architecture" anymore - remove in future
+// Right now, to make old cbfstool happy, declare version as 1.
+#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION1
struct cbfs_header {
uint32_t magic;
@@ -42,6 +44,8 @@ struct cbfs_header {
#define CBFS_ARCHITECTURE_X86 0x00000001
#define CBFS_ARCHITECTURE_ARMV7 0x00000010
+#define CBFS_FILE_MAGIC "LARCHIVE"
+
struct cbfs_file {
uint8_t magic[8];
uint32_t len;
@@ -106,6 +110,7 @@ struct cbfs_payload {
#define CBFS_COMPONENT_NULL 0xFFFFFFFF
int cbfs_file_header(unsigned long physaddr);
+#define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file))
#define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) )
struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size);
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 4202801..4b07096 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,6 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -26,7 +28,8 @@
#include <unistd.h>
#include <getopt.h>
#include "common.h"
-#include "cbfs.h"
+
+int verbose = 0;
struct command {
const char *name;
@@ -34,438 +37,395 @@ struct command {
int (*function) (void);
};
-int verbose = 0;
-static char *cbfs_name = NULL;
-static char *rom_name = NULL;
-static char *rom_filename = NULL;
-static char *rom_bootblock = NULL;
-static uint32_t rom_type = 0;
-static uint32_t rom_baseaddress = 0;
-static uint32_t rom_loadaddress = 0;
-static uint32_t rom_entrypoint = 0;
-static uint32_t rom_size = 0;
-static uint32_t rom_alignment = 0;
-static uint32_t rom_offset = 0;
-static comp_algo rom_algo = CBFS_COMPRESS_NONE;
-
-static int cbfs_add(void)
-{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
-
- if (!rom_filename) {
+struct param {
+ char *cbfs_name;
+ char *name;
+ char *filename;
+ char *bootblock_file;
+ uint32_t type;
+ uint32_t base_address;
+ uint32_t load_address;
+ uint32_t bootblock_offset;
+ uint32_t bootblock_offset_assigned;
+ uint32_t header_offset;
+ uint32_t header_offset_assigned;
+ uint32_t entrypoint;
+ uint32_t size;
+ uint32_t alignment;
+ uint32_t offset;
+ uint32_t top_aligned;
+ comp_algo algo;
+} param;
+
+typedef int (*convert_buffer_t)(struct buffer *buffer);
+
+static int cbfs_add_file(const char *filename,
+ const char *name,
+ uint32_t type,
+ convert_buffer_t convert,
+ const char *cbfs_name) {
+ struct cbfs_image image;
+ struct buffer buffer;
+ int result = 1;
+
+ if (!filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (rom_type == 0) {
+ if (type == 0) {
fprintf(stderr, "E: You need to specify a valid -t/--type.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (cbfs_get_entry(&image, name)) {
+ fprintf(stderr, "E: '%s' already in ROM image.\n", name);
return 1;
}
- cbfsfile = create_cbfs_file(rom_name, filedata, &filesize,
- rom_type, &rom_baseaddress);
- free(filedata);
-
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding file '%s' failed.\n", rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (buffer_from_file(&buffer, filename) != 0) {
+ fprintf(stderr, "E: Could not load file '%s'.\n", filename);
+ cbfs_image_delete(&image);
return 1;
}
- free(cbfsfile);
- free(rom);
- return 0;
-}
+ do {
+ if (convert && convert(&buffer) != 0) {
+ fprintf(stderr, "E: Failed to parse file '%s'.\n",
+ filename);
+ break;
+ }
+ if (cbfs_add_entry(&image, name, type, &buffer) != 0)
+ break;
+ if (cbfs_image_write_file(&image, cbfs_name) != 0)
+ break;
-static int cbfs_add_payload(void)
-{
- int32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
+ result = 0;
+ } while (0);
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ return result;
+}
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
+static int cbfs_convert_mkstage(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_stage(buffer->data, &output, param.algo,
+ param.base_address);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
- }
+static int cbfs_convert_elf_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_payload(buffer->data, &output,
+ param.algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
- return 1;
- }
+static int cbfs_convert_flat_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result;
+ result = parse_flat_binary_to_payload(buffer->data, &output,
+ buffer->size,
+ param.load_address,
+ param.entrypoint,
+ param.algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- filesize = parse_elf_to_payload(filedata, &payload, rom_algo);
- if (filesize <= 0) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(rom);
- return 1;
- }
+static int cbfstool_add(void)
+{
+ // TODO where is rom_base_address?
+ return cbfs_add_file(param.filename,
+ param.name,
+ param.type,
+ NULL,
+ param.cbfs_name);
+}
- cbfsfile = create_cbfs_file(rom_name, payload, &filesize,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
- free(filedata);
- free(payload);
+static int cbfstool_add_payload(void)
+{
+ return cbfs_add_file(param.filename,
+ param.name,
+ CBFS_COMPONENT_PAYLOAD,
+ cbfs_convert_elf_mkpayload,
+ param.cbfs_name);
+}
+
+static int cbfstool_add_stage(void)
+{
+ return cbfs_add_file(param.filename,
+ param.name,
+ CBFS_COMPONENT_STAGE,
+ cbfs_convert_mkstage,
+ param.cbfs_name);
+}
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+static int cbfstool_add_flat_binary(void)
+{
+ if (param.load_address == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-l/--load-address.\n");
return 1;
}
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (param.entrypoint == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-e/--entry-point.\n");
return 1;
}
-
- free(cbfsfile);
- free(rom);
- return 0;
+ return cbfs_add_file(param.filename,
+ param.name,
+ CBFS_COMPONENT_PAYLOAD,
+ cbfs_convert_flat_mkpayload,
+ param.cbfs_name);
}
-static int cbfs_add_stage(void)
+static int cbfstool_remove(void)
{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *stage;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+ int result = 1;
+ struct cbfs_image image;
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
- return 1;
- }
-
- filesize = parse_elf_to_stage(filedata, &stage, rom_algo, &rom_baseaddress);
-
- cbfsfile = create_cbfs_file(rom_name, stage, &filesize,
- CBFS_COMPONENT_STAGE, &rom_baseaddress);
-
- free(filedata);
- free(stage);
-
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding stage '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
- return 1;
- }
+ do {
+ if (cbfs_remove_entry(&image, param.name) != 0) {
+ fprintf(stderr, "E: Removing file '%s' failed.\n",
+ param.name);
+ break;
+ }
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0)
+ break;
+ result = 0;
+ } while (0);
- free(cbfsfile);
- free(rom);
- return 0;
+ cbfs_image_delete(&image);
+ return result;
}
-static int cbfs_add_flat_binary(void)
+static int cbfstool_create(void)
{
- uint32_t filesize = 0;
- uint32_t final_size;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
- comp_func_ptr compress;
- struct cbfs_payload_segment *segs;
- int doffset, len = 0;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+ struct cbfs_image image;
+ struct buffer bootblock;
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
-
- if (rom_loadaddress == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-l/--load-address.\n");
- return 1;
- }
-
- if (rom_entrypoint == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-e/--entry-point.\n");
+ if (param.size == 0) {
+ fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
return 1;
}
- compress = compression_function(rom_algo);
- if (!compress)
- return 1;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ if (!param.bootblock_file) {
+ fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (buffer_from_file(&bootblock, param.bootblock_file) != 0) {
return 1;
}
- /* FIXME compressed file size might be bigger than original file */
- payload = calloc((2 * sizeof(struct cbfs_payload_segment)) + filesize, 1);
- if (payload == NULL) {
- fprintf(stderr, "E: Could not allocate memory.\n");
- free(filedata);
- free(rom);
- return 1;
+ // Setup default boot offset and header offset.
+ if (!param.bootblock_offset_assigned) {
+ // put boot block before end of ROM.
+ param.bootblock_offset = param.size - bootblock.size;
+ DEBUG("bootblock in end of ROM.\n");
}
-
- segs = (struct cbfs_payload_segment *)payload;
- doffset = (2 * sizeof(struct cbfs_payload_segment));
-
- /* Prepare code segment */
- segs[0].type = PAYLOAD_SEGMENT_CODE;
- segs[0].load_addr = (uint64_t)htonll(rom_loadaddress);
- segs[0].mem_len = (uint32_t)htonl(filesize);
- segs[0].offset = (uint32_t)htonl(doffset);
-
- compress(filedata, filesize, (char *)(payload + doffset), &len);
- segs[0].compression = htonl(rom_algo);
- segs[0].len = htonl(len);
-
- if ((unsigned int)len >= filesize) {
- segs[0].compression = 0;
- segs[0].len = htonl(filesize);
- memcpy((char *)(payload + doffset), filedata, filesize);
+ if (!param.header_offset_assigned) {
+ // Put header before bootblock, and make a reference in end of
+ // bootblock.
+ param.header_offset = (
+ param.bootblock_offset -
+ sizeof(struct cbfs_header));
+ if (bootblock.size >= sizeof(uint32_t)) {
+ // TODO this only works for 32b top-aligned system now...
+ uint32_t ptr = param.header_offset - param.size;
+ uint32_t *sig = (uint32_t*)(bootblock.data +
+ bootblock.size -
+ sizeof(ptr));
+ *sig = ptr;
+ DEBUG("CBFS header reference in end of bootblock.\n");
+ }
}
- /* prepare entry point segment */
- segs[1].type = PAYLOAD_SEGMENT_ENTRY;
- segs[1].load_addr = (uint64_t)htonll(rom_entrypoint);
-
- final_size = doffset + ntohl(segs[0].len);
- cbfsfile =
- create_cbfs_file(rom_name, payload, &final_size,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
-
- free(filedata);
- free(payload);
-
- if (add_file_to_cbfs(cbfsfile, final_size, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_create(&image,
+ param.size,
+ param.alignment,
+ &bootblock,
+ param.bootblock_offset,
+ param.header_offset,
+ param.offset) != 0) {
+ fprintf(stderr, "E: Failed to create %s.\n", param.cbfs_name);
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to write %s.\n", param.cbfs_name);
return 1;
}
-
- free(cbfsfile);
- free(rom);
+ cbfs_image_delete(&image);
return 0;
+
}
-static int cbfs_remove(void)
+static int cbfstool_locate_stage(void)
{
- void *rom;
+ struct cbfs_image image;
+ struct cbfs_file *entry;
+ struct buffer buffer;
+ size_t stage_size;
+ uint32_t address;
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
+ if (!param.filename) {
+ fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ if (!param.name) {
+ fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (remove_file_from_cbfs(rom_name)) {
- fprintf(stderr, "E: Removing file '%s' failed.\n",
- rom_name);
- free(rom);
+ if (param.alignment) {
+ WARN("-a is deprecated because you can't align when add.\n");
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
- free(rom);
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to load %s.\n", param.cbfs_name);
return 1;
}
- free(rom);
- return 0;
-}
-
-static int cbfs_create(void)
-{
- if (rom_size == 0) {
- fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
+ if (buffer_from_file(&buffer, param.filename) != 0) {
+ fprintf(stderr, "E: Cannot load %s.\n", param.filename);
+ cbfs_image_delete(&image);
return 1;
}
- if (!rom_bootblock) {
- fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
- return 1;
- }
+ // Increase buffer for cbfs_stage header.
+ stage_size = buffer.size + sizeof(struct cbfs_stage);
+ buffer_delete(&buffer);
+ buffer_create(&buffer, stage_size, param.name);
- if (arch == CBFS_ARCHITECTURE_UNKNOWN) {
- fprintf(stderr, "E: You need to specify -m/--machine arch\n");
+ if (cbfs_get_entry(&image, param.name)) {
+ fprintf(stderr, "E: '%s' already in CBFS.\n", param.name);
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
- return create_cbfs_image(cbfs_name, rom_size, rom_bootblock,
- rom_alignment, rom_offset);
-}
-
-static int cbfs_locate(void)
-{
- uint32_t filesize, location;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
+ if (cbfs_add_entry(&image, param.name, CBFS_COMPONENT_STAGE,
+ &buffer) != 0) {
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
+ entry = cbfs_get_entry(&image, param.name);
+ assert(entry);
+ assert(cbfs_is_valid_entry(entry));
+ address = (cbfs_get_entry_addr(&image, entry) + ntohl(entry->offset) +
+ sizeof(struct cbfs_stage));
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
+ if (param.top_aligned) {
+ address = address - ntohl(image.header->romsize);
}
-
- filesize = getfilesize(rom_filename);
-
- location = cbfs_find_location(cbfs_name, filesize,
- rom_name, rom_alignment);
-
- printf("%x\n", location);
- return location == 0 ? 1 : 0;
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ printf("0x%x\n", address);
+ return 0;
}
-static int cbfs_print(void)
+static int cbfstool_print(void)
{
- void *rom;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ struct cbfs_image image;
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
-
- print_cbfs_directory(cbfs_name);
-
- free(rom);
+ cbfs_print_directory(&image);
+ cbfs_image_delete(&image);
return 0;
}
-static int cbfs_extract(void)
+static int cbfstool_extract(void)
{
- void *rom;
- int ret;
+ int result = 0;
+ struct cbfs_image image;
- if (!rom_filename) {
+ if (!param.filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
+ param.cbfs_name);
+ result = 1;
+ } else if (cbfs_export_entry(&image, param.name,
+ param.filename) != 0) {
+ result = 1;
}
- ret = extract_file_from_cbfs(cbfs_name, rom_name, rom_filename);
-
- free(rom);
- return ret;
+ cbfs_image_delete(&image);
+ return result;
}
static const struct command commands[] = {
- {"add", "f:n:t:b:h?", cbfs_add},
- {"add-payload", "f:n:t:c:b:h?", cbfs_add_payload},
- {"add-stage", "f:n:t:c:b:h?", cbfs_add_stage},
- {"add-flat-binary", "f:n:l:e:c:b:h?", cbfs_add_flat_binary},
- {"remove", "n:h?", cbfs_remove},
- {"create", "s:B:a:o:m:h?", cbfs_create},
- {"locate", "f:n:a:h?", cbfs_locate},
- {"print", "h?", cbfs_print},
- {"extract", "n:f:h?", cbfs_extract},
+ {"add", "vf:n:t:b:h?", cbfstool_add},
+ {"add-payload", "vf:n:t:c:b:h?", cbfstool_add_payload},
+ {"add-stage", "vf:n:t:c:b:h?", cbfstool_add_stage},
+ {"add-flat-binary", "vf:n:l:e:c:b:h?", cbfstool_add_flat_binary},
+ {"remove", "vn:h?", cbfstool_remove},
+ {"create", "vs:B:A:H:a:o:m:h?", cbfstool_create},
+ {"locate-stage", "vTf:n:a:h?", cbfstool_locate_stage},
+ {"print", "vh?", cbfstool_print},
+ {"extract", "vn:f:h?", cbfstool_extract},
};
static struct option long_options[] = {
@@ -477,10 +437,13 @@ static struct option long_options[] = {
{"entry-point", required_argument, 0, 'e' },
{"size", required_argument, 0, 's' },
{"bootblock", required_argument, 0, 'B' },
+ {"bootblock-offset", required_argument, 0, 'A' },
+ {"header-offset",required_argument,0, 'H' },
{"alignment", required_argument, 0, 'a' },
{"offset", required_argument, 0, 'o' },
{"file", required_argument, 0, 'f' },
{"arch", required_argument, 0, 'm' },
+ {"top-aligned", no_argument, 0, 'T' },
{"verbose", no_argument, 0, 'v' },
{"help", no_argument, 0, 'h' },
{NULL, 0, 0, 0 }
@@ -491,8 +454,10 @@ static void usage(char *name)
printf
("cbfstool: Management utility for CBFS formatted ROM images\n\n"
"USAGE:\n" " %s [-h]\n"
- " %s FILE COMMAND [PARAMETERS]...\n\n" "OPTIONs:\n"
- " -h Display this help message\n\n"
+ " %s FILE COMMAND [-v] [PARAMETERS]...\n\n" "OPTIONs:\n"
+ " -h Display this help message\n\n"
+ " -T Display top-aligned address instead of offset\n"
+ " -v Verbose output\n"
"COMMANDs:\n"
" add -f FILE -n NAME -t TYPE [-b base-address] "
"Add a component\n"
@@ -505,10 +470,11 @@ static void usage(char *name)
"Add a 32bit flat mode binary\n"
" remove -n NAME "
"Remove a component\n"
- " create -s size -B bootblock -m ARCH [-a align] [-o offset] "
+ " create -s size -B bootblock [-A bootblock-offset] \\\n"
+ " [-H header-offset] [-a align] [-o offset] "
"Create a ROM file\n"
- " locate -f FILE -n NAME -a align "
- "Find a place for a file of that size\n"
+ " locate-stage -f FILE -n NAME [-T] "
+ "Find the entry if the stage component is added\n"
" print "
"Show the contents of the ROM\n"
" extract -n NAME -f FILE "
@@ -518,19 +484,7 @@ static void usage(char *name)
" armv7, x86\n"
"TYPEs:\n", name, name
);
- print_supported_filetypes();
-}
-
-/* Small, OS/libc independent runtime check for endianess */
-int host_bigendian = 0;
-
-static void which_endian(void)
-{
- static const uint32_t inttest = 0x12345678;
- uint8_t inttest_lsb = *(uint8_t *)&inttest;
- if (inttest_lsb == 0x12) {
- host_bigendian = 1;
- }
+ print_all_cbfs_entry_types();
}
int main(int argc, char **argv)
@@ -543,9 +497,7 @@ int main(int argc, char **argv)
return 1;
}
- which_endian();
-
- cbfs_name = argv[1];
+ param.cbfs_name = argv[1];
char *cmd = argv[2];
optind += 2;
@@ -572,61 +524,74 @@ int main(int argc, char **argv)
switch(c) {
case 'n':
- rom_name = optarg;
+ param.name = optarg;
break;
case 't':
- if (intfiletype(optarg) != ((uint64_t) - 1))
- rom_type = intfiletype(optarg);
- else
- rom_type = strtoul(optarg, NULL, 0);
- if (rom_type == 0)
+ param.type = get_cbfs_entry_type(optarg);
+ if (param.type == (uint32_t)-1)
+ param.type = strtoul(optarg, NULL,
+ 0);
+ if (param.type == 0)
printf("W: Unknown type '%s' ignored\n",
- optarg);
+ optarg);
break;
case 'c':
if (!strncasecmp(optarg, "lzma", 5))
- rom_algo = CBFS_COMPRESS_LZMA;
+ param.algo = CBFS_COMPRESS_LZMA;
else if (!strncasecmp(optarg, "none", 5))
- rom_algo = CBFS_COMPRESS_NONE;
+ param.algo = CBFS_COMPRESS_NONE;
else
printf("W: Unknown compression '%s'"
- " ignored.\n", optarg);
+ " ignored.\n", optarg);
break;
case 'b':
- rom_baseaddress = strtoul(optarg, NULL, 0);
+ param.base_address = strtoul(optarg, NULL, 0);
break;
case 'l':
- rom_loadaddress = strtoul(optarg, NULL, 0);
+ param.load_address = strtoul(optarg, NULL, 0);
break;
case 'e':
- rom_entrypoint = strtoul(optarg, NULL, 0);
+ param.entrypoint = strtoul(optarg, NULL, 0);
break;
case 's':
- rom_size = strtoul(optarg, &suffix, 0);
+ param.size = strtoul(optarg, &suffix, 0);
if (tolower(suffix[0])=='k') {
- rom_size *= 1024;
+ param.size *= 1024;
}
if (tolower(suffix[0])=='m') {
- rom_size *= 1024 * 1024;
+ param.size *= 1024 * 1024;
}
case 'B':
- rom_bootblock = optarg;
+ param.bootblock_file = optarg;
+ break;
+ case 'A':
+ param.bootblock_offset = strtoul(
+ optarg, NULL, 0);
+ param.bootblock_offset_assigned = 1;
+ break;
+ case 'H':
+ param.header_offset = strtoul(
+ optarg, NULL, 0);
+ param.header_offset_assigned = 1;
break;
case 'a':
- rom_alignment = strtoul(optarg, NULL, 0);
+ param.alignment = strtoul(optarg, NULL, 0);
break;
case 'o':
- rom_offset = strtoul(optarg, NULL, 0);
+ param.offset = strtoul(optarg, NULL, 0);
break;
case 'f':
- rom_filename = optarg;
+ param.filename = optarg;
+ break;
+ case 'T':
+ param.top_aligned = 1;
break;
case 'v':
verbose++;
break;
case 'm':
- arch = string_to_arch(optarg);
+ INFO("Architecture (-m) is deprecated.\n");
break;
case 'h':
case '?':
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 97bf168..4dab244 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,215 +20,105 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <assert.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <libgen.h>
+
#include "common.h"
-#include "cbfs.h"
#include "elf.h"
-#define dprintf(x...)
+/* Utilities */
-size_t getfilesize(const char *filename)
+/* Small, OS/libc independent runtime check for endianess */
+int is_big_endian(void)
{
- size_t size;
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return -1;
-
- fseek(file, 0, SEEK_END);
- size = ftell(file);
- fclose(file);
- return size;
-}
-
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place)
-{
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return NULL;
-
- fseek(file, 0, SEEK_END);
- *romsize_p = ftell(file);
- fseek(file, 0, SEEK_SET);
- if (!content) {
- content = malloc(*romsize_p);
- if (!content) {
- fprintf(stderr, "E: Could not get %d bytes for file %s\n",
- *romsize_p, filename);
- exit(1);
- }
- } else if (place == SEEK_END)
- content -= *romsize_p;
-
- if (!fread(content, *romsize_p, 1, file)) {
- fprintf(stderr, "E: Failed to read %s\n", filename);
- return NULL;
+ static const uint32_t inttest = 0x12345678;
+ uint8_t inttest_lsb = *(uint8_t *)&inttest;
+ if (inttest_lsb == 0x12) {
+ return 1;
}
- fclose(file);
- return content;
+ return 0;
}
-static struct cbfs_header *master_header;
-static uint32_t phys_start, phys_end, align;
-uint32_t romsize;
-void *offset;
-uint32_t arch = CBFS_ARCHITECTURE_UNKNOWN;
-
-static struct {
- uint32_t arch;
- const char *name;
-} arch_names[] = {
- { CBFS_ARCHITECTURE_ARMV7, "armv7" },
- { CBFS_ARCHITECTURE_X86, "x86" },
- { CBFS_ARCHITECTURE_UNKNOWN, "unknown" }
-};
-
-uint32_t string_to_arch(const char *arch_string)
-{
- int i;
- uint32_t ret = CBFS_ARCHITECTURE_UNKNOWN;
-
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (!strcasecmp(arch_string, arch_names[i].name)) {
- ret = arch_names[i].arch;
- break;
- }
- }
-
- return ret;
+uint32_t align_up(uint32_t value, uint32_t align) {
+ if (value % align)
+ value += align - (value % align);
+ return value;
}
-const char *arch_to_string(uint32_t a)
-{
- int i;
- const char *ret = NULL;
-
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (a == arch_names[i].arch) {
- ret = arch_names[i].name;
- break;
- }
- }
-
- return ret;
+/* Buffer and file I/O */
+int buffer_create(struct buffer *buffer, size_t size, const char *name) {
+ buffer->name = strdup(name);
+ buffer->size = size;
+ buffer->data = (char*)malloc(buffer->size);
+ return (buffer->data == NULL);
}
-int find_master_header(void *romarea, size_t size)
-{
- size_t offset;
-
- if (master_header)
- return 0;
-
- for (offset = 0; offset < size - sizeof(struct cbfs_header); offset++) {
- struct cbfs_header *tmp = romarea + offset;
-
- if (tmp->magic == ntohl(CBFS_HEADER_MAGIC)) {
- master_header = tmp;
- break;
- }
+int buffer_from_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "rb");
+ if (!fp) {
+ perror(filename);
+ return -1;
}
-
- return master_header ? 0 : 1;
-}
-
-void recalculate_rom_geometry(void *romarea)
-{
- if (find_master_header(romarea, romsize)) {
- fprintf(stderr, "E: Cannot find master header\n");
- exit(1);
+ fseek(fp, 0, SEEK_END);
+ buffer->size = ftell(fp);
+ buffer->name = strdup(filename);
+ rewind(fp);
+ buffer->data = (char*)malloc(buffer->size);
+ assert(buffer->data);
+ if (fread(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete read: %s\n", filename);
+ fclose(fp);
+ return -1;
}
+ fclose(fp);
+ return 0;
+}
- /* Update old headers */
- if (master_header->version == CBFS_HEADER_VERSION1 &&
- ntohl(master_header->architecture) == CBFS_ARCHITECTURE_UNKNOWN) {
- dprintf("Updating CBFS master header to version 2\n");
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
+int buffer_write_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "wb");
+ if (!fp) {
+ perror(filename);
+ return -1;
}
-
- arch = ntohl(master_header->architecture);
-
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- offset = romarea;
- phys_start = (0 + ntohl(master_header->offset)) & 0xffffffff;
- phys_end = romsize & 0xffffffff;
- break;
- case CBFS_ARCHITECTURE_X86:
- offset = romarea + romsize - 0x100000000ULL;
- phys_start = (0 - romsize + ntohl(master_header->offset)) &
- 0xffffffff;
- phys_end = (0 - ntohl(master_header->bootblocksize) -
- sizeof(struct cbfs_header)) & 0xffffffff;
- break;
- default:
- fprintf(stderr, "E: Unknown architecture\n");
- exit(1);
+ assert(buffer && buffer->data);
+ if (fwrite(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete write: %s\n", filename);
+ fclose(fp);
+ return -1;
}
-
- align = ntohl(master_header->align);
-}
-
-void *loadrom(const char *filename)
-{
- void *romarea = loadfile(filename, &romsize, 0, SEEK_SET);
- if (romarea == NULL)
- return NULL;
- recalculate_rom_geometry(romarea);
- return romarea;
+ fclose(fp);
+ return 0;
}
-int writerom(const char *filename, void *start, uint32_t size)
-{
- FILE *file = fopen(filename, "wb");
- if (!file) {
- fprintf(stderr, "Could not open '%s' for writing: ", filename);
- perror("");
- return 1;
+int buffer_delete(struct buffer *buffer) {
+ assert(buffer);
+ if (buffer->name) {
+ free(buffer->name);
+ buffer->name = NULL;
}
-
- if (fwrite(start, size, 1, file) != 1) {
- fprintf(stderr, "Could not write to '%s': ", filename);
- perror("");
- return 1;
+ if (buffer->data) {
+ free(buffer->data);
+ buffer->data = NULL;
}
-
- fclose(file);
+ buffer->size = 0;
return 0;
}
-int cbfs_file_header(unsigned long physaddr)
-{
- /* maybe improve this test */
- return (strncmp(phys_to_virt(physaddr), "LARCHIVE", 8) == 0);
-}
-
-struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size)
-{
- struct cbfs_file *nextfile = (struct cbfs_file *)phys_to_virt(physaddr);
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(size);
- nextfile->type = htonl(0xffffffff);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(sizeof(struct cbfs_file) + 16);
- memset(((void *)nextfile) + sizeof(struct cbfs_file), 0, 16);
- return nextfile;
-}
+/* Type and format */
-int iself(unsigned char *input)
-{
- Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
+int is_elf_object(const void *input) {
+ Elf32_Ehdr *ehdr = (Elf32_Ehdr *)input;
return !memcmp(ehdr->e_ident, ELFMAG, 4);
}
static struct filetypes_t {
uint32_t type;
const char *name;
-} filetypes[] = {
+} cbfs_filetypes[] = {
{CBFS_COMPONENT_STAGE, "stage"},
{CBFS_COMPONENT_PAYLOAD, "payload"},
{CBFS_COMPONENT_OPTIONROM, "optionrom"},
@@ -236,550 +127,573 @@ static struct filetypes_t {
{CBFS_COMPONENT_VSA, "vsa"},
{CBFS_COMPONENT_MBI, "mbi"},
{CBFS_COMPONENT_MICROCODE, "microcode"},
- {CBFS_COMPONENT_CMOS_DEFAULT, "cmos default"},
- {CBFS_COMPONENT_CMOS_LAYOUT, "cmos layout"},
+ {CBFS_COMPONENT_CMOS_DEFAULT, "cmos_default"},
+ {CBFS_COMPONENT_CMOS_LAYOUT, "cmos_layout"},
{CBFS_COMPONENT_DELETED, "deleted"},
{CBFS_COMPONENT_NULL, "null"}
};
-void print_supported_filetypes(void)
-{
- int i, number = ARRAY_SIZE(filetypes);
-
- for (i=0; i<number; i++) {
- printf(" %s%c", filetypes[i].name, (i==(number-1))?'\n':',');
- if ((i%8) == 7)
- printf("\n");
- }
-}
-
-const char *strfiletype(uint32_t number)
-{
+uint32_t get_cbfs_entry_type(const char *name) {
size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (filetypes[i].type == number)
- return filetypes[i].name;
- return "unknown";
+ for (i = 0; i < ARRAY_SIZE(cbfs_filetypes); i++)
+ if (strcmp(cbfs_filetypes[i].name, name) == 0)
+ return cbfs_filetypes[i].type;
+ return -1;
}
-uint64_t intfiletype(const char *name)
-{
+const char * get_cbfs_entry_type_name(uint32_t type) {
size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (strcmp(filetypes[i].name, name) == 0)
- return filetypes[i].type;
- return -1;
+ for (i = 0; i < ARRAY_SIZE(cbfs_filetypes); i++)
+ if (cbfs_filetypes[i].type == type)
+ return cbfs_filetypes[i].name;
+ return "(unknown)";
}
-void print_cbfs_directory(const char *filename)
-{
- printf
- ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n"
- "alignment: %d bytes, architecture: %s\n\n",
- basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize),
- romsize, ntohl(master_header->offset), align, arch_to_string(arch));
- printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
- if (strlen(fname) == 0)
- fname = "(empty)";
-
- printf("%-30s 0x%-8x %-12s %d\n", fname,
- current - phys_start + ntohl(master_header->offset),
- strfiletype(ntohl(thisfile->type)), length);
-
- /* note the components of the subheader are in host order ... */
- switch (ntohl(thisfile->type)) {
- case CBFS_COMPONENT_STAGE:
- {
- struct cbfs_stage *stage = CBFS_SUBHEADER(thisfile);
- dprintf(" %s compression, entry: 0x%llx, load: 0x%llx, length: %d/%d\n",
- stage->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- (unsigned long long)stage->entry,
- (unsigned long long)stage->load,
- stage->len,
- stage->memlen);
- break;
- }
- case CBFS_COMPONENT_PAYLOAD:
- {
- struct cbfs_payload_segment *payload = CBFS_SUBHEADER(thisfile);
- while(payload) {
- switch(payload->type) {
- case PAYLOAD_SEGMENT_CODE:
- case PAYLOAD_SEGMENT_DATA:
- dprintf(" %s (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d)\n",
- payload->type == PAYLOAD_SEGMENT_CODE ? "code " : "data" ,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len), ntohl(payload->mem_len));
- break;
- case PAYLOAD_SEGMENT_ENTRY:
- dprintf(" entry (0x%llx)\n", (unsigned long long)ntohll(payload->load_addr));
- break;
- case PAYLOAD_SEGMENT_BSS:
- dprintf(" BSS (address 0x%016llx, length 0x%x)\n", (unsigned long long)ntohll(payload->load_addr), ntohl(payload->len));
- break;
- case PAYLOAD_SEGMENT_PARAMS:
- dprintf(" parameters\n");
- break;
- default:
- dprintf(" %x (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d\n",
- payload->type,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len),
- ntohl(payload->mem_len));
- break;
- }
+void print_all_cbfs_entry_types(void) {
+ size_t i, total = ARRAY_SIZE(cbfs_filetypes);
- if(payload->type == PAYLOAD_SEGMENT_ENTRY)
- payload=NULL;
- else
- payload++;
- }
- break;
- }
- default:
- break;
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
+ for (i = 0; i < total; i++) {
+ printf(" %s%c", cbfs_filetypes[i].name,
+ (i + 1 == total) ? '\n' : ',');
+ if ((i + 1) % 8 == 0)
+ printf("\n");
}
}
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath)
+/* CBFS image processing */
+
+/* The file name align is not defined in CBFS spec -- only a preference by
+ * (old) cbfstool. */
+#define CBFS_FILENAME_ALIGN (16)
+
+/* To make CBFS more friendly to ROM, fill -1 (0xFF) instead of zero. */
+#define CBFS_CONTENT_DEFAULT_VALUE (-1)
+
+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)
{
- FILE *outfile = NULL;
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
+ struct cbfs_header *header;
+ struct cbfs_file *entry;
+ uint32_t cbfs_len;
- // Locate the file start struct
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- // And its length
- uint32_t length = ntohl(thisfile->len);
- // Locate the file name
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
-
- // It's not the file we are looking for..
- if (strcmp(fname, payloadname) != 0)
- {
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
- continue;
- }
+ DEBUG("cbfs_create_image: bootblock=0x%x+0x%zx, "
+ "header=0x%x+0x%zx, entries_offset=0x%x\n",
+ bootblock_offset, bootblock->size,
+ header_offset, sizeof(*header), entries_offset);
- // Else, it's our file.
- printf("Found file %.30s at 0x%x, type %.12s, size %d\n", fname,
- current - phys_start, strfiletype(ntohl(thisfile->type)),
- length);
-
- // If we are not dumping to stdout, open the out file.
- outfile = fopen(outpath, "wb");
- if (!outfile)
- {
- fprintf(stderr, "E: Could not open the file %s for writing.\n", outpath);
- return 1;
- }
+ if (buffer_create(&image->buffer, size, "(new)") != 0) {
+ ERROR("Cannot allocate memory for %zd bytes.\n", size);
+ return -1;
+ }
+ image->header = NULL;
+ memset(image->buffer.data, CBFS_CONTENT_DEFAULT_VALUE, size);
- if (ntohl(thisfile->type) != CBFS_COMPONENT_RAW)
- {
- fprintf(stderr, "W: Only 'raw' files are safe to extract.\n");
- }
+ // Adjust relative offset values (<0) to ROM address (>=0).
+ if (entries_offset < 0)
+ entries_offset += (int32_t)size;
+ if (bootblock_offset < 0)
+ bootblock_offset += (int32_t)size;
+ if (header_offset < 0)
+ header_offset += (int32_t) size;
- fwrite(((char *)thisfile)
- + ntohl(thisfile->offset), length, 1, outfile);
+ DEBUG("cbfs_create_image: (real offset) bootblock=0x%x, "
+ "header=0x%x, entries_offset=0x%x\n",
+ bootblock_offset, header_offset, entries_offset);
- fclose(outfile);
- printf("Successfully dumped the file.\n");
+ if (align == 0)
+ align = 64; // default align size.
- // We'll only dump one file.
- return 0;
+ // Prepare bootblock
+ if (bootblock_offset + bootblock->size > size) {
+ ERROR("Bootblock (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ bootblock_offset, bootblock->size, size);
+ return -1;
+ }
+ memcpy(image->buffer.data + bootblock_offset, bootblock->data,
+ bootblock->size);
+
+ // Prepare header
+ if (header_offset + sizeof(*header) > size) {
+ ERROR("Header (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ header_offset, sizeof(*header), size);
+ return -1;
}
- fprintf(stderr, "E: File %s not found.\n", payloadname);
- return 1;
+ header = (struct cbfs_header*)(image->buffer.data + header_offset);
+ image->header = header;
+ header->magic = htonl(CBFS_HEADER_MAGIC);
+ header->version = htonl(CBFS_HEADER_VERSION);
+ header->romsize = htonl(size);
+ header->bootblocksize = htonl(bootblock->size);
+ header->align = htonl(align);
+ header->offset = htonl(entries_offset);
+
+ // Prepare entries
+ if (align_up(entries_offset, align) != entries_offset) {
+ ERROR("Offset (0x%x) must be aligned to 0x%x.\n",
+ entries_offset, align);
+ return -1;
+ }
+ if (entries_offset + sizeof(*entry) > size) {
+ ERROR("Offset (0x%x+0x%zx) exceed ROM size(0x%zx)\n",
+ entries_offset, sizeof(*entry), size);
+ return -1;
+ }
+ entry = (struct cbfs_file*)(image->buffer.data + entries_offset);
+ // To calculate available length, find
+ // e = min(bootblock, header, size) where e > entries_offset.
+ cbfs_len = size;
+ if (bootblock_offset > entries_offset && bootblock_offset < cbfs_len)
+ cbfs_len = bootblock_offset;
+ if (header_offset > entries_offset && header_offset < cbfs_len)
+ cbfs_len = header_offset;
+ cbfs_len -= entries_offset + align;
+ cbfs_create_entry(image, entry, cbfs_len, "");
+ LOG("Created CBFS image (capacity = %d bytes)\n", cbfs_len);
+ return 0;
}
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location)
-{
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
-
- dprintf("at %x, %x bytes\n", current, length);
- /* Is this a free chunk? */
- if ((thisfile->type == CBFS_COMPONENT_DELETED)
- || (thisfile->type == CBFS_COMPONENT_NULL)) {
- dprintf("null||deleted at %x, %x bytes\n", current,
- length);
- /* if this is the right size, and if specified, the right location, use it */
- if ((contentsize <= length)
- && ((location == 0) || (current == location))) {
- if (contentsize < length) {
- dprintf
- ("this chunk is %x bytes, we need %x. create a new chunk at %x with %x bytes\n",
- length, contentsize,
- ALIGN(current + contentsize,
- align),
- length - contentsize);
- uint32_t start =
- ALIGN(current + contentsize, align);
- uint32_t size =
- current + ntohl(thisfile->offset)
- + length - start - 16 -
- sizeof(struct cbfs_file);
- cbfs_create_empty_file(start, size);
- }
- dprintf("copying data\n");
- memcpy(phys_to_virt(current), content,
- contentsize);
- return 0;
- }
- if (location != 0) {
- /* CBFS has the constraint that the chain always moves up in memory. so once
- we're past the place we seek, we don't need to look any further */
- if (current > location) {
- fprintf
- (stderr, "E: The requested space is not available\n");
- return 1;
- }
-
- /* Is the requested location inside the current chunk? */
- if ((current < location)
- && ((location + contentsize) <=
- (current + length))) {
- /* Split it up. In the next iteration the code will be at the right place. */
- dprintf("split up. new length: %x\n",
- location - current -
- ntohl(thisfile->offset));
- thisfile->len =
- htonl(location - current -
- ntohl(thisfile->offset));
- cbfs_create_empty_file(location,
- length -
- (location -
- current));
- }
- }
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename) {
+ if (buffer_from_file(&image->buffer, filename) != 0)
+ return -1;
+ DEBUG("read_cbfs_image: %s (%zd bytes)\n", image->buffer.name,
+ image->buffer.size);
+ image->header = cbfs_find_header(image->buffer.data,
+ image->buffer.size);
+ if (!image->header) {
+ ERROR("%s does not have CBFS master header.\n", filename);
+ cbfs_image_delete(image);
+ return -1;
}
- fprintf(stderr, "E: Could not add the file to CBFS, it's probably too big.\n");
- fprintf(stderr, "E: File size: %d bytes (%d KB).\n", contentsize, contentsize/1024);
- return 1;
+ return 0;
}
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename) {
+ assert(image && image->buffer.data);
+ return buffer_write_file(&image->buffer, filename);
+}
-static struct cbfs_file *merge_adjacent_files(struct cbfs_file *first,
- struct cbfs_file *second)
-{
- uint32_t new_length =
- ntohl(first->len) + ntohl(second->len) + ntohl(second->offset);
- first->len = htonl(new_length);
- first->checksum = 0; // FIXME?
- return first;
+int cbfs_image_delete(struct cbfs_image *image) {
+ buffer_delete(&image->buffer);
+ image->header = NULL;
+ return 0;
}
-static struct cbfs_file *next_file(struct cbfs_file *prev)
-{
- uint32_t pos = (prev == NULL) ? phys_start :
- ALIGN(virt_to_phys(prev) + ntohl(prev->len) + ntohl(prev->offset),
- align);
+static int cbfs_fix_legacy_size(struct cbfs_image *image) {
+ // A bug in old CBFStool may produce extra few bytes (by alignment) and
+ // cause cbfstool to overwrite things after free space -- which is
+ // usually CBFS header on x86. We need to workaround that.
- for (; pos < phys_end; pos += align) {
- if (cbfs_file_header(pos))
- return (struct cbfs_file *)phys_to_virt(pos);
+ struct cbfs_file *entry, *first = NULL, *last = NULL;
+ for (first = entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ last = entry;
}
- return NULL;
+ if ((char*)first < (char*)image->header &&
+ (char*)entry > (char*)image->header) {
+ WARN("CBFS image was created with old cbfstool with size bug. "
+ "Fixing size in last entry...\n");
+ last->len = htonl(ntohl(last->len) -
+ ntohl(image->header->align));
+ DEBUG("Last entry has been changed from 0x%x to 0x%x.\n",
+ cbfs_get_entry_addr(image, entry),
+ cbfs_get_entry_addr(image,
+ cbfs_find_next_entry(image, last)));
+ }
+ return 0;
}
+int cbfs_add_entry(struct cbfs_image *image, const char *name,
+ uint32_t type, struct buffer *buffer) {
+ uint32_t entry_type, entry_capacity;
+ uint32_t addr;
+ struct cbfs_file *entry, *next;
+ uint32_t need_size, new_size;
-int remove_file_from_cbfs(const char *filename)
-{
- struct cbfs_file *prev = NULL;
- struct cbfs_file *cur = next_file(prev);
- struct cbfs_file *next = next_file(cur);
- for (; cur; prev = cur, cur = next, next = next_file(next)) {
-
- /* Check if this is the file to remove. */
- char *name = (char *)cur + sizeof(*cur);
- if (strcmp(name, filename))
- continue;
+ need_size = (sizeof(*entry) + buffer->size +
+ align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN));
+ DEBUG("cbfs_add_entry('%s', %zd) => need_size = %u\n",
+ name, buffer->size, need_size);
+
+ cbfs_fix_legacy_size(image);
- /* Mark the file as free space and erase its name. */
- cur->type = CBFS_COMPONENT_NULL;
- name[0] = '\0';
+ // Merge empty entries.
+ DEBUG("(trying to merge empty entries...)\n");
+ cbfs_walk(image, cbfs_merge_empty_entry, NULL);
- /* Merge it with the previous file if possible. */
- if (prev && prev->type == CBFS_COMPONENT_NULL)
- cur = merge_adjacent_files(prev, cur);
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
- /* Merge it with the next file if possible. */
- if (next && next->type == CBFS_COMPONENT_NULL)
- merge_adjacent_files(cur, next);
+ entry_type = ntohl(entry->type);
+ if (entry_type != CBFS_COMPONENT_DELETED &&
+ entry_type != CBFS_COMPONENT_NULL)
+ continue;
+
+ addr = cbfs_get_entry_addr(image, entry);
+ next = cbfs_find_next_entry(image, entry);
+ entry_capacity = cbfs_get_entry_addr(image, next) - addr;
+ DEBUG("cbfs_add_entry: space %s at 0x%x, %d bytes\n",
+ get_cbfs_entry_type_name(entry_type), addr,
+ entry_capacity);
+ if (entry_capacity < need_size)
+ continue;
+ // TODO check if we want to put blob in particular address
+ // (baseaddress).
+
+ DEBUG("Filling new entry data (%zd bytes).\n", buffer->size);
+ cbfs_create_entry(image, entry, buffer->size, name);
+ entry->type = htonl(type);
+ memcpy(CBFS_SUBHEADER(entry), buffer->data, buffer->size);
+ if (verbose)
+ cbfs_print_entry_info(image, entry, NULL);
+
+ // setup new entry
+ DEBUG("Seting new empty entry.\n");
+ entry = cbfs_find_next_entry(image, entry);
+ new_size = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ new_size -= sizeof(*entry) + CBFS_FILENAME_ALIGN;
+ DEBUG("new size: %d\n", new_size);
+ cbfs_create_entry(image, entry, new_size, "");
+ if (verbose)
+ cbfs_print_entry_info(image, entry, NULL);
return 0;
}
- fprintf(stderr, "E: CBFS file %s not found.\n", filename);
- return 1;
+
+ ERROR("Could not add [%s, %zd bytes (%zd KB)]; probably too big?\n",
+ buffer->name, buffer->size, buffer->size / 1024);
+ return 0;
}
+int cbfs_remove_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry, *next;
+ size_t len;
+ entry = cbfs_get_entry(image, name);
+ if (!entry) {
+ ERROR("CBFS file %s not found.\n", name);
+ return -1;
+ }
+ next = cbfs_find_next_entry(image, entry);
+ assert(next);
+ DEBUG("cbfs_remove_entry: Removed %s @ 0x%x\n",
+ CBFS_NAME(entry), cbfs_get_entry_addr(image, entry));
+ entry->type = htonl(CBFS_COMPONENT_DELETED);
+ len = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ entry->offset = htonl(sizeof(*entry) + CBFS_FILENAME_ALIGN);
+ entry->len = htonl(len - ntohl(entry->offset));
+ memset(CBFS_NAME(entry), 0, CBFS_FILENAME_ALIGN);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE,
+ ntohl(entry->len));
+ return 0;
+}
-/* returns new data block with cbfs_file header, suitable to dump into the ROM. location returns
- the new location that points to the cbfs_file header */
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location)
-{
- uint32_t filename_len = ALIGN(strlen(filename) + 1, 16);
- uint32_t headersize = sizeof(struct cbfs_file) + filename_len;
- if ((location != 0) && (*location != 0)) {
- uint32_t offset = *location % align;
- /* If offset >= (headersize % align), we can stuff the header into the offset.
- Otherwise the header has to be aligned itself, and put before the offset data */
- if (offset >= (headersize % align)) {
- offset -= (headersize % align);
- } else {
- offset += align - (headersize % align);
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ if (strcmp(CBFS_NAME(entry), name) == 0) {
+ DEBUG("cbfs_get_entry: found %s\n", name);
+ return entry;
}
- headersize += offset;
- *location -= headersize;
- }
- void *newdata = malloc(*datasize + headersize);
- if (!newdata) {
- fprintf(stderr, "E: Could not get %d bytes for CBFS file.\n", *datasize +
- headersize);
- exit(1);
}
- memset(newdata, 0xff, *datasize + headersize);
- struct cbfs_file *nextfile = (struct cbfs_file *)newdata;
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(*datasize);
- nextfile->type = htonl(type);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(headersize);
- strcpy(newdata + sizeof(struct cbfs_file), filename);
- memcpy(newdata + headersize, data, *datasize);
- *datasize += headersize;
- return newdata;
-}
-
-int create_cbfs_image(const char *romfile, uint32_t _romsize,
- const char *bootblock, uint32_t align, uint32_t offs)
-{
- uint32_t bootblocksize = 0;
- struct cbfs_header *master_header;
- unsigned char *romarea, *bootblk;
-
- romsize = _romsize;
- romarea = malloc(romsize);
- if (!romarea) {
- fprintf(stderr, "E: Could not get %d bytes of memory"
- " for CBFS image.\n", romsize);
- exit(1);
+ return NULL;
+}
+
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename) {
+ struct cbfs_file *entry = cbfs_get_entry(image, entry_name);
+ struct buffer buffer;
+ if (!entry) {
+ ERROR("File not found: %s\n", entry_name);
+ return -1;
}
- memset(romarea, 0xff, romsize);
+ LOG("Found file %.30s at 0x%x, type %.12s, size %d\n",
+ entry_name, cbfs_get_entry_addr(image, entry),
+ get_cbfs_entry_type_name(ntohl(entry->type)),
+ ntohl(entry->len));
- if (align == 0)
- align = 64;
-
- bootblk = loadfile(bootblock, &bootblocksize,
- romarea + romsize, SEEK_END);
- if (!bootblk) {
- fprintf(stderr, "E: Could not load bootblock %s.\n",
- bootblock);
- free(romarea);
- return 1;
+ if (ntohl(entry->type) != CBFS_COMPONENT_RAW) {
+ WARN("Only 'raw' files are safe to extract.\n");
}
- // TODO(hungte) Replace magic numbers by named constants.
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- /* Set up physical/virtual mapping */
- offset = romarea;
-
- /*
- * The initial jump instruction and bootblock will be placed
- * before and after the master header, respectively. The
- * bootblock image must contain a blank, aligned region large
- * enough for the master header to fit.
- *
- * An anchor string must be left such that when cbfstool is run
- * we can find it and insert the master header at the next
- * aligned boundary.
- */
- loadfile(bootblock, &bootblocksize, romarea + offs, SEEK_SET);
-
- unsigned char *p = romarea + offs;
- while (1) {
- /* FIXME: assumes little endian... */
- if (*(uint32_t *)p == 0xdeadbeef)
- break;
- if (p >= (romarea + _romsize)) {
- fprintf(stderr, "E: Could not determine CBFS "
- "header location.\n", bootblock);
- return 1;
- }
- p += (sizeof(unsigned int));
- }
- unsigned int u = ALIGN((unsigned int)(p - romarea), align);
- master_header = (struct cbfs_header *)(romarea + u);
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(
- ALIGN((0x40 + bootblocksize), align));
- master_header->architecture = htonl(CBFS_ARCHITECTURE_ARMV7);
-
- ((uint32_t *) phys_to_virt(0x4 + offs))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file(
- offs + ALIGN((0x40 + bootblocksize), align),
- romsize - offs - sizeof(struct cbfs_file) -
- ALIGN((bootblocksize + 0x40), align));
- break;
-
- case CBFS_ARCHITECTURE_X86:
- // Set up physical/virtual mapping
- offset = romarea + romsize - 0x100000000ULL;
-
- loadfile(bootblock, &bootblocksize, romarea + romsize,
- SEEK_END);
- master_header = (struct cbfs_header *)(romarea + romsize -
- bootblocksize - sizeof(struct cbfs_header));
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(offs);
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
-
- ((uint32_t *) phys_to_virt(CBFS_HEADPTR_ADDR_X86))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff,
- romsize - offs - bootblocksize -
- sizeof(struct cbfs_header) -
- sizeof(struct cbfs_file) - 16);
- break;
-
- default:
- // Should not happen.
- fprintf(stderr, "E: You found a bug in cbfstool.\n");
- exit(1);
+ buffer.data = CBFS_SUBHEADER(entry);
+ buffer.size = ntohl(entry->len);
+ buffer.name = "(cbfs_export_entry)";
+ if (buffer_write_file(&buffer, filename) != 0) {
+ ERROR("Failed to write %s into %s.\n",
+ entry_name, filename);
+ return -1;
}
+ INFO("Successfully dumped the file to: %s\n", filename);
+ return 0;
+}
+
+/* basename(3) may modify buffer, so we want a tiny alternative. */
+static const char *simple_basename(const char *name) {
+ const char *slash = strrchr(name, '/');
+ if (slash)
+ return slash + 1;
+ else
+ return name;
+}
- writerom(romfile, romarea, romsize);
- free(romarea);
+int cbfs_print_header_info(struct cbfs_image *image) {
+ assert(image && image->header);
+ printf("%s: %zd kB, bootblocksize %d, romsize %d, offset 0x%x\n"
+ "alignment: %d bytes\n\n",
+ simple_basename(image->buffer.name),
+ image->buffer.size / 1024,
+ ntohl(image->header->bootblocksize),
+ ntohl(image->header->romsize),
+ ntohl(image->header->offset),
+ ntohl(image->header->align));
return 0;
}
-static int in_segment(int addr, int size, int gran)
-{
- return ((addr & ~(gran - 1)) == ((addr + size) & ~(gran - 1)));
+static int cbfs_print_stage_info(struct cbfs_stage *stage) {
+ printf(" %s compression, entry: 0x%" PRIx64 ", load: 0x%" PRIx64 ", "
+ "length: %d/%d\n",
+ stage->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
+ stage->entry,
+ stage->load,
+ stage->len,
+ stage->memlen);
+ return 0;
}
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t alignment)
+static int cbfs_print_payload_segment_info(struct cbfs_payload_segment *payload)
{
- void *rom;
- size_t filename_size, headersize, totalsize;
- int ret = 0;
- uint32_t current;
-
- rom = loadrom(romfile);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- romfile);
+ switch(payload->type) {
+ case PAYLOAD_SEGMENT_CODE:
+ case PAYLOAD_SEGMENT_DATA:
+ printf(" %s (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d)\n",
+ (payload->type == PAYLOAD_SEGMENT_CODE ?
+ "code " : "data"),
+ (payload->compression == CBFS_COMPRESS_LZMA ?
+ "LZMA" : "no"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len), ntohl(payload->mem_len));
+ break;
+
+ case PAYLOAD_SEGMENT_ENTRY:
+ printf(" entry (0x%" PRIx64 ")\n",
+ ntohll(payload->load_addr));
+ break;
+
+ case PAYLOAD_SEGMENT_BSS:
+ printf(" BSS (address 0x%016" PRIx64 ", "
+ "length 0x%x)\n",
+ ntohll(payload->load_addr),
+ ntohl(payload->len));
+ break;
+
+ case PAYLOAD_SEGMENT_PARAMS:
+ printf(" parameters\n");
+ break;
+
+ default:
+ printf(" %x (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d\n",
+ payload->type,
+ (payload->compression == CBFS_COMPRESS_LZMA ?
+ "LZMA" : "no"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len),
+ ntohl(payload->mem_len));
+ break;
+ }
+ return 0;
+}
+
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ const char *name = CBFS_NAME(entry);
+ struct cbfs_payload_segment *payload;
+ if (!cbfs_is_valid_entry(entry)) {
+ ERROR("cbfs_print_entry_info: Invalid entry at 0x%x\n",
+ cbfs_get_entry_addr(image, entry));
+ return -1;
+ }
+
+ printf("%-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));
+
+ if (!verbose)
return 0;
+
+ /* note the components of the subheader may be in host order ... */
+ switch (ntohl(entry->type)) {
+ case CBFS_COMPONENT_STAGE:
+ cbfs_print_stage_info((struct cbfs_stage*)
+ CBFS_SUBHEADER(entry));
+ break;
+
+ case CBFS_COMPONENT_PAYLOAD:
+ payload = (struct cbfs_payload_segment*)
+ CBFS_SUBHEADER(entry);
+ while (payload) {
+ cbfs_print_payload_segment_info(payload);
+ if (payload->type == PAYLOAD_SEGMENT_ENTRY)
+ break;
+ else
+ payload ++;
+ }
+ break;
+ default:
+ break;
}
+ return 0;
+}
- filename_size = strlen(filename);
- headersize = sizeof(struct cbfs_file) + ALIGN(filename_size + 1, 16) +
- sizeof(struct cbfs_stage);
- totalsize = headersize + filesize;
+int cbfs_print_directory(struct cbfs_image *image) {
+ cbfs_print_header_info(image);
+ printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
+ cbfs_walk(image, cbfs_print_entry_info, NULL);
+ return 0;
+}
- current = phys_start;
- while (current < phys_end) {
- uint32_t top;
- struct cbfs_file *thisfile;
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ struct cbfs_file *next, *last;
+ uint32_t type;
+ size_t newlen;
+ type = ntohl(entry->type);
+ if (type != CBFS_COMPONENT_NULL && type != CBFS_COMPONENT_DELETED)
+ return 0;
+ next = cbfs_find_next_entry(image, entry);
+ if (!next || !cbfs_is_valid_entry(next))
+ return -1;
+ last = cbfs_find_next_entry(image, next);
+ assert(last);
+ type = ntohl(next->type);
+ if (type != CBFS_COMPONENT_NULL && type != CBFS_COMPONENT_DELETED)
+ return 0;
+
+ // Now, we find two deleted/empty entries; try to merge now.
+ DEBUG("cbfs_join_empty_entry: combine 0x%x+0x%x and 0x%x+0x%x.\n",
+ cbfs_get_entry_addr(image, entry), ntohl(entry->len),
+ cbfs_get_entry_addr(image, next), ntohl(next->len));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ newlen = (cbfs_get_entry_addr(image, last) -
+ cbfs_get_entry_addr(image, entry) - ntohl(entry->offset));
+ entry->len = htonl(newlen);
+ DEBUG("new empty entry: length=0x%zx\n", newlen);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, newlen);
+ // TODO we should try again until no more entries are found...
+ return 0;
+}
+
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback,
+ void *arg) {
+ int count = 0;
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ count ++;
+ if (callback(image, entry, arg) != 0)
+ break;
+ }
+ return count;
+}
- if (!cbfs_file_header(current)) {
- current += align;
+struct cbfs_header *cbfs_find_header(char *data, size_t size) {
+ size_t offset;
+ int found = 0;
+ uint32_t x86sig;
+ struct cbfs_header *header, *result = NULL;
+
+ // Try x86 style (check signature in bottom) header first.
+ x86sig = *(uint32_t*)(data + size - sizeof(uint32_t));
+ offset = (x86sig + (uint32_t)size);
+ DEBUG("x86sig: 0x%x, offset: 0x%zx\n", x86sig, offset);
+ if (offset >= size - sizeof(*header) ||
+ ntohl(((struct cbfs_header*)(data + offset))->magic) !=
+ CBFS_HEADER_MAGIC)
+ offset = 0;
+
+ for (; offset + sizeof(*header) < size; offset++) {
+ header = (struct cbfs_header*)(data + offset);
+ if (ntohl(header->magic) !=(CBFS_HEADER_MAGIC))
+ continue;
+ if (ntohl(header->version) != CBFS_HEADER_VERSION1 &&
+ ntohl(header->version) != CBFS_HEADER_VERSION2) {
+ // Probably not a real CBFS header?
continue;
}
+ found++;
+ result = header;
+ }
+ if (found > 1) {
+ ERROR("multiple (%d) CBFS headers found!\n",
+ found);
+ result = NULL;
+ }
+ return result;
+}
- thisfile = (struct cbfs_file *)phys_to_virt(current);
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image) {
+ assert(image && image->header);
+ return (struct cbfs_file*)(image->buffer.data +
+ ntohl(image->header->offset));
+}
- top = current + ntohl(thisfile->len) + ntohl(thisfile->offset);
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry) {
+ uint32_t addr = cbfs_get_entry_addr(image, entry);
+ int align = ntohl(image->header->align);
+ assert(entry && cbfs_is_valid_entry(entry));
+ addr += ntohl(entry->offset) + ntohl(entry->len);
+ addr = align_up(addr, align);
+ return (struct cbfs_file*)(image->buffer.data + addr);
+}
- if (((ntohl(thisfile->type) == 0x0)
- || (ntohl(thisfile->type) == 0xffffffff))
- && (ntohl(thisfile->len) + ntohl(thisfile->offset) >=
- totalsize)) {
- if (in_segment
- (current + headersize, filesize, alignment)) {
- ret = current + headersize;
- break;
- }
- if ((ALIGN(current, alignment) + filesize < top)
- && (ALIGN(current, alignment) - headersize >
- current)
- && in_segment(ALIGN(current, alignment), filesize,
- alignment)) {
- ret = ALIGN(current, alignment);
- break;
- }
- if ((ALIGN(current, alignment) + alignment + filesize <
- top)
- && (ALIGN(current, alignment) + alignment -
- headersize > current)
- && in_segment(ALIGN(current, alignment) + alignment,
- filesize, alignment)) {
- ret = ALIGN(current, alignment) + alignment;
- break;
- }
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
- }
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry) {
+ assert(image && image->buffer.data && entry);
+ return (int32_t)((char*)entry - image->buffer.data);
+}
- free(rom);
- return ret;
+int cbfs_is_valid_entry(struct cbfs_file *entry) {
+ return (entry &&memcmp(entry->magic, CBFS_FILE_MAGIC,
+ sizeof(entry->magic)) == 0);
+}
+
+int cbfs_init_entry(struct cbfs_file *entry,
+ struct buffer *buffer) {
+ memset(entry, 0, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->len = htonl(buffer->size);
+ entry->offset = htonl(sizeof(*entry) + strlen(buffer->name) + 1);
+ return 0;
+}
+
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name) {
+ memset(entry, CBFS_CONTENT_DEFAULT_VALUE, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ entry->len = htonl(len);
+ entry->checksum = 0; // TODO Build a checksum algorithm.
+ entry->offset = htonl(sizeof(*entry) + align_up(strlen(name) + 1,
+ CBFS_FILENAME_ALIGN));
+ memset(CBFS_NAME(entry), 0, ntohl(entry->offset) - sizeof(*entry));
+ strcpy(CBFS_NAME(entry), name);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, len);
+ return 0;
}
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index 853e529..fff5596 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -2,6 +2,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,71 +22,170 @@
#define __CBFSTOOL_COMMON_H
#include <stdint.h>
+#include "cbfs.h"
+
+/* Message output */
+extern int verbose;
+#define ERROR(x...) { fprintf(stderr, "ERROR: " x); }
+#define WARN(x...) { fprintf(stderr, "WARN: " 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 ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+/* Endianess */
+#include <arpa/inet.h> // for ntohl, htonl
#include "swab.h"
-#ifndef __APPLE__
-#define ntohl(x) (host_bigendian?(x):swab32(x))
-#define htonl(x) (host_bigendian?(x):swab32(x))
-#endif
-#define ntohll(x) (host_bigendian?(x):swab64(x))
-#define htonll(x) (host_bigendian?(x):swab64(x))
+int is_big_endian(void);
+#define ntohll(x) (is_big_endian() ? (x) : swab64(x))
+#define htonll(x) (is_big_endian() ? (x) : swab64(x))
-extern void *offset;
-extern uint32_t romsize;
-extern int host_bigendian;
-extern uint32_t arch;
+/* Buffer and file I/O */
+struct buffer {
+ char *name;
+ char *data;
+ size_t size;
+};
-const char *arch_to_string(uint32_t a);
-uint32_t string_to_arch(const char *arch_string);
+/* Creates an empty memory buffer with given size.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_create(struct buffer *buffer, size_t size, const char *name);
-static inline void *phys_to_virt(uint32_t addr)
-{
- return offset + addr;
-}
+/* Loads a file into memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_from_file(struct buffer *buffer, const char *filename);
-static inline uint32_t virt_to_phys(void *addr)
-{
- return (unsigned long)(addr - offset) & 0xffffffff;
-}
+/* Writes memory buffer content into file.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_write_file(struct buffer *buffer, const char *filename);
-#define ALIGN(val, by) (((val) + (by)-1)&~((by)-1))
+/* Destroys a memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_delete(struct buffer *buffer);
-size_t getfilesize(const char *filename);
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place);
-void *loadrom(const char *filename);
-int writerom(const char *filename, void *start, uint32_t size);
-int iself(unsigned char *input);
+/* Type and format */
-typedef void (*comp_func_ptr) (char *, int, char *, int *);
-typedef enum { CBFS_COMPRESS_NONE = 0, CBFS_COMPRESS_LZMA = 1 } comp_algo;
+/* Returns 1 if input points to an ELF object, otherwise 0. */
+int is_elf_object(const void *input);
-comp_func_ptr compression_function(comp_algo algo);
+/* Returns CBFS entry type value for given name, or (uint32_t)-1 as unknown. */
+uint32_t get_cbfs_entry_type(const char *name);
+
+/* Gets the name of given CBFS entry type value, or "(unknown)". */
+const char *get_cbfs_entry_type_name(uint32_t type);
+
+/* Prints all known CBFS entry types. */
+void print_all_cbfs_entry_types();
+
+
+/* CBFS image processing */
+
+struct cbfs_image {
+ struct buffer buffer;
+ struct cbfs_header *header;
+};
+
+/* Creates an empty CBFS image by given size, and description to its content
+ * (bootblock, align, header location, starting offset of CBFS entries.
+ * The output image will contain a valid cbfs_header, with one cbfs_file
+ * entry with type CBFS_COMPONENT_NULL, with max available size.
+ * Returns 0 on success, otherwise none-zero. */
+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);
+
+
+/* Loads a CBFS image from file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename);
+
+/* Writes a CBFS image into file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename);
-uint64_t intfiletype(const char *name);
+/* Releases the CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_delete(struct cbfs_image *image);
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo);
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location);
+/* Adds an entry to CBFS image by given name and type.
+ * Returns 0 on success, otherwise non-zero. */
+int cbfs_add_entry(struct cbfs_image *image, const char *name,
+ uint32_t type, struct buffer *buffer);
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location);
+/* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_remove_entry(struct cbfs_image *image, const char *name);
-int create_cbfs_image(const char *romfile, uint32_t romsize,
- const char *bootblock, uint32_t align, uint32_t offs);
+/* Returns a pointer to entry by name, or NULL if name is not found. */
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name);
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location);
-int remove_file_from_cbfs(const char *filename);
-void print_cbfs_directory(const char *filename);
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath);
-int remove_file_from_cbfs(const char *filename);
+/* Exports an entry to external file.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename);
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t align);
+/* Initializes a new entry with size and name in CBFS image.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name);
-void print_supported_filetypes(void);
+/* Callback function used by cbfs_walk.
+ * Returns 0 on success, or non-zero to stop further iteration. */
+typedef int (*cbfs_entry_callback)(struct cbfs_image *image,
+ struct cbfs_file *file,
+ void *arg);
-#define ARRAY_SIZE(a) (int)(sizeof(a) / sizeof((a)[0]))
+/* Iterates through all entries in CBFS image, and invoke with callback.
+ * Stops if callback returns non-zero values.
+ * Returns number of entries invoked. */
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback, void *arg);
+
+/* Primitive CBFS utilities */
+
+/* Returns a pointer to the only valid CBFS header in give buffer, otherwise
+ * NULL (including when multiple headers were found). If there is a X86 ROM
+ * style signature (pointer at 0xfffffffc) found in ROM, it will be selected as
+ * the only header.*/
+struct cbfs_header *cbfs_find_header(char *data, size_t size);
+
+/* Returns the first cbfs_file entry in CBFS image by CBFS header (no matter if
+ * the entry has valid content or not), otherwise NULL. */
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image);
+
+/* Returns next cbfs_file entry (no matter if its content is valid or not), or
+ * NULL on failure. */
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry);
+
+/* Returns ROM address (offset) of entry.
+ * This is different from entry->offset (pointer to content). */
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry);
+
+int cbfs_print_directory(struct cbfs_image *image);
+int cbfs_print_header_info(struct cbfs_image *image);
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+
+/* Returns 1 if entry has valid data (by checking magic number), otherwise 0. */
+int cbfs_is_valid_entry(struct cbfs_file *entry);
+
+/* Utilities */
+
+/* compress.c */
+typedef void (*comp_func_ptr) (char *, int, char *, int *);
+typedef enum {
+ CBFS_COMPRESS_NONE = 0,
+ CBFS_COMPRESS_LZMA
+} comp_algo;
+comp_func_ptr compression_function(comp_algo algo);
+/* cbfs-mkpayload.c */
+int parse_elf_to_payload(char *input, char **output, comp_algo algo);
+int parse_flat_binary_to_payload(char *input, char **output,
+ uint32_t input_size, uint32_t loadaddress,
+ uint32_t entrypoint, comp_algo algo);
+/* cbfs-mkstage.c */
+int parse_elf_to_stage(char *input, char **output, comp_algo algo,
+ uint32_t location);
#endif
1
0
Patch set updated for coreboot: ab58fc2 Improve CBFS tool to support platform without top-aligned mapping.
by Hung-Te Lin 27 Jan '13
by Hung-Te Lin 27 Jan '13
27 Jan '13
Hung-Te Lin (hungte(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2194
-gerrit
commit ab58fc2634cf17176f6459a1da654c5bd9b49465
Author: Hung-Te Lin <hungte(a)chromium.org>
Date: Sat Jan 26 02:03:28 2013 +0800
Improve CBFS tool to support platform without top-aligned mapping.
CBFS tool was written with lots of dirty global variables and designed with
assumption based on x86 architecture. To support other platforms better, we
should rewrite using logical offset instead of top-aligned memory mapped
address.
Also fixed a calculation error in size of last entry (which will cause
overwriting header data when you really used every bits in CBFS) in old
CBFS tool.
Usage changes:
- "locate" is changed to "locate-stage" (which is the real behavior in old
cbfstool) and prefix output with "0x". The output is now platform
independent offset. To retrieve x86 top-aligned virtual address, add "-T".
"-a" for locate-stage is removed because it does not really work (and not
used by current x86 build process) even in old cbfstool usage.
- "create" takes two extra optional params:
"-A": bootblock offset. When omitted, put bootblock in end of ROM.
"-H": header offset. When omitted, put header right before bootblock,
and put a top-aligned virtual address reference in end of ROM.
- "architecture" (-m) is deprecated because it does not help.
- "-v" (verbose out) now really works.
- "-b" (base-address) was ignored for add-* commands. Need more testing to see
if that will break some platform.
Verified to work on ARM (google/snow) and X86 (qemu/x86).
Change-Id: I28c737c8f290e51332119188248ac9e28042024c
Signed-off-by: Hung-Te Lin <hungte(a)chromium.org>
---
src/arch/armv7/Makefile.inc | 13 +-
src/arch/x86/Makefile.inc | 8 +-
util/cbfstool/cbfs-mkpayload.c | 82 ++-
util/cbfstool/cbfs-mkstage.c | 39 +-
util/cbfstool/cbfs.h | 7 +-
util/cbfstool/cbfstool.c | 672 +++++++++++-----------
util/cbfstool/common.c | 1214 +++++++++++++++++++---------------------
util/cbfstool/common.h | 196 +++++--
8 files changed, 1118 insertions(+), 1113 deletions(-)
diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc
index 872365c..e889890 100644
--- a/src/arch/armv7/Makefile.inc
+++ b/src/arch/armv7/Makefile.inc
@@ -46,9 +46,12 @@ prebuild-files = \
$(if $(call extract_nth,4,$(file)),-b $(call extract_nth,4,$(file))) &&)
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
+# TODO(hungte) Change CBFS command to use per-board params. Also we don't need
+# to prefix 0x2000 bytes of zero in boot block anymore!
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
- $(CBFSTOOL) $@.tmp create -m armv7 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
- -B $(objcbfs)/bootblock.bin -a 64
+ $(CBFSTOOL) $@.tmp create -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
+ -B $(objcbfs)/bootblock.bin -a 64 -A 0x0000 -H 0x2040 \
+ -o 0x5000
$(prebuild-files) true
mv $@.tmp $@
else
@@ -314,11 +317,9 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas
$(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin
@printf " generating base_xip.txt\n"
rm -f $@
- $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
+ $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
|| { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; }
- sed -e 's/^/0x/g' $@.tmp > $@.tmp2
- rm $@.tmp
- mv $@.tmp2 $@
+ mv $@.tmp $@
$(objgenerated)/crt0.romstage.S: $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n"
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index ea86f8f..c71cb5e 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -65,7 +65,7 @@ prebuild-files = \
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
- $(CBFSTOOL) $@.tmp create -m x86 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
+ $(CBFSTOOL) $@.tmp create -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
-B $(objcbfs)/bootblock.bin -a 64 \
-o $$(( $(CONFIG_ROM_SIZE) - $(CONFIG_CBFS_SIZE) ))
$(prebuild-files) true
@@ -375,11 +375,9 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas
$(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin
rm -f $@
- $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
+ $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -T -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
|| { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; }
- sed -e 's/^/0x/g' $@.tmp > $@.tmp2
- rm $@.tmp
- mv $@.tmp2 $@
+ mv $@.tmp $@
$(objgenerated)/crt0.romstage.S: $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n"
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index 0d3986e..3c19d55 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -22,24 +22,18 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo)
+int parse_elf_to_payload(char *input, char **output, comp_algo algo)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
Elf32_Shdr *shdr;
char *header;
char *strtab;
- unsigned char *sptr;
+ char *sptr;
int headers;
int segments = 1;
int isize = 0, osize = 0;
@@ -47,21 +41,16 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
struct cbfs_payload_segment *segs;
int i;
- if(!iself(input)){
+ if(!is_elf_object(input)){
fprintf(stderr, "E: The payload file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The payload file has the wrong architecture\n");
- return -1;
- }
-
comp_func_ptr compress = compression_function(algo);
if (!compress)
return -1;
+ DEBUG("start: parse_elf_to_payload\n");
headers = ehdr->e_phnum;
header = (char *)ehdr;
@@ -156,9 +145,9 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
if (phdr[i].p_filesz == 0) {
segs[segments].type = PAYLOAD_SEGMENT_BSS;
segs[segments].load_addr =
- (uint64_t)htonll(phdr[i].p_paddr);
+ htonll(phdr[i].p_paddr);
segs[segments].mem_len =
- (uint32_t)htonl(phdr[i].p_memsz);
+ htonl(phdr[i].p_memsz);
segs[segments].offset = htonl(doffset);
segments++;
@@ -169,8 +158,8 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
segs[segments].type = PAYLOAD_SEGMENT_CODE;
else
segs[segments].type = PAYLOAD_SEGMENT_DATA;
- segs[segments].load_addr = (uint64_t)htonll(phdr[i].p_paddr);
- segs[segments].mem_len = (uint32_t)htonl(phdr[i].p_memsz);
+ segs[segments].load_addr = htonll(phdr[i].p_paddr);
+ segs[segments].mem_len = htonl(phdr[i].p_memsz);
segs[segments].compression = htonl(algo);
segs[segments].offset = htonl(doffset);
@@ -197,7 +186,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
}
segs[segments].type = PAYLOAD_SEGMENT_ENTRY;
- segs[segments++].load_addr = (uint64_t)htonll(ehdr->e_entry);
+ segs[segments++].load_addr = htonll(ehdr->e_entry);
*output = sptr;
@@ -206,3 +195,54 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
err:
return -1;
}
+
+int parse_flat_binary_to_payload(char *input,
+ char **output,
+ uint32_t input_size,
+ uint32_t loadaddress,
+ uint32_t entrypoint,
+ comp_algo algo)
+{
+ comp_func_ptr compress;
+ char *payload;
+ struct cbfs_payload_segment *segs;
+ int doffset, len = 0;
+
+ compress = compression_function(algo);
+ if (!compress)
+ return 1;
+
+ DEBUG("start: parse_flat_binary_to_payload\n");
+ /* FIXME compressed file size might be bigger than original file */
+ payload = calloc((2 * sizeof(*segs)) + input_size, 1);
+ if (payload == NULL) {
+ fprintf(stderr, "E: Could not allocate memory.\n");
+ return 1;
+ }
+
+ segs = (struct cbfs_payload_segment *)payload;
+ doffset = (2 * sizeof(*segs));
+
+ /* Prepare code segment */
+ segs[0].type = PAYLOAD_SEGMENT_CODE;
+ segs[0].load_addr = htonll(loadaddress);
+ segs[0].mem_len = htonl(input_size);
+ segs[0].offset = htonl(doffset);
+
+ compress(input, input_size, (char *)(payload + doffset), &len);
+ segs[0].compression = htonl(algo);
+ segs[0].len = htonl(len);
+
+ if ((unsigned int)len >= input_size) {
+ segs[0].compression = 0;
+ segs[0].len = htonl(input_size);
+ memcpy(payload + doffset, input, input_size);
+ }
+
+ /* prepare entry point segment */
+ segs[1].type = PAYLOAD_SEGMENT_ENTRY;
+ segs[1].load_addr = htonll(entrypoint);
+
+ *output = payload;
+ return doffset + ntohl(segs[0].len);
+}
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index 0541d4b..9e47047 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -23,14 +23,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
static unsigned int idemp(unsigned int x)
{
@@ -48,13 +43,13 @@ static unsigned int swap32(unsigned int x)
unsigned int (*elf32_to_native) (unsigned int) = idemp;
/* returns size of result, or -1 if error */
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location)
+int parse_elf_to_stage(char *input, char **output,
+ comp_algo algo, uint32_t location)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
char *header, *buffer;
- unsigned char *out;
+ char *out;
int headers;
int i;
@@ -67,21 +62,16 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
if (!compress)
return -1;
- if (!iself(input)) {
+ DEBUG("start: parse_elf_to_stage(location=0x%x)\n", location);
+ if (!is_elf_object(input)) {
fprintf(stderr, "E: The stage file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The stage file has the wrong architecture\n");
- return -1;
- }
-
if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
elf_bigendian = 1;
}
- if (elf_bigendian != host_bigendian) {
+ if (elf_bigendian != is_big_endian()) {
elf32_to_native = swap32;
}
@@ -125,8 +115,8 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
mem_end = mend;
}
- if (data_start < *location) {
- data_start = *location;
+ if (data_start < location) {
+ data_start = location;
}
if (data_end <= data_start) {
@@ -155,9 +145,9 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
continue;
l_start = elf32_to_native(phdr[i].p_paddr);
- if (l_start < *location) {
- l_offset = *location - l_start;
- l_start = *location;
+ if (l_start < location) {
+ l_offset = location - l_start;
+ l_start = location;
}
memcpy(buffer + (l_start - data_start),
@@ -184,10 +174,7 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
(char *)(out + sizeof(struct cbfs_stage)), (int *)&stage->len);
free(buffer);
-
*output = out;
- if (*location)
- *location -= sizeof(struct cbfs_stage);
- return sizeof(struct cbfs_stage) + stage->len;
+ return sizeof(*stage) + stage->len;
}
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 3dbeefd..26ab62f 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -25,7 +25,9 @@
#define CBFS_HEADPTR_ADDR_X86 0xFFFFFFFC
#define CBFS_HEADER_VERSION1 0x31313131
#define CBFS_HEADER_VERSION2 0x31313132
-#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION2
+// TODO(hungte) We probably don't need "architecture" anymore - remove in future
+// Right now, to make old cbfstool happy, declare version as 1.
+#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION1
struct cbfs_header {
uint32_t magic;
@@ -42,6 +44,8 @@ struct cbfs_header {
#define CBFS_ARCHITECTURE_X86 0x00000001
#define CBFS_ARCHITECTURE_ARMV7 0x00000010
+#define CBFS_FILE_MAGIC "LARCHIVE"
+
struct cbfs_file {
uint8_t magic[8];
uint32_t len;
@@ -106,6 +110,7 @@ struct cbfs_payload {
#define CBFS_COMPONENT_NULL 0xFFFFFFFF
int cbfs_file_header(unsigned long physaddr);
+#define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file))
#define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) )
struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size);
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 4202801..222d6ac 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,6 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -26,7 +28,8 @@
#include <unistd.h>
#include <getopt.h>
#include "common.h"
-#include "cbfs.h"
+
+int verbose = 0;
struct command {
const char *name;
@@ -34,438 +37,390 @@ struct command {
int (*function) (void);
};
-int verbose = 0;
-static char *cbfs_name = NULL;
-static char *rom_name = NULL;
-static char *rom_filename = NULL;
-static char *rom_bootblock = NULL;
-static uint32_t rom_type = 0;
-static uint32_t rom_baseaddress = 0;
-static uint32_t rom_loadaddress = 0;
-static uint32_t rom_entrypoint = 0;
-static uint32_t rom_size = 0;
-static uint32_t rom_alignment = 0;
-static uint32_t rom_offset = 0;
-static comp_algo rom_algo = CBFS_COMPRESS_NONE;
-
-static int cbfs_add(void)
-{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
-
- if (!rom_filename) {
+struct param {
+ char *cbfs_name;
+ char *name;
+ char *filename;
+ char *bootblock_file;
+ uint32_t type;
+ uint32_t base_address;
+ uint32_t load_address;
+ uint32_t bootblock_offset;
+ uint32_t bootblock_offset_assigned;
+ uint32_t header_offset;
+ uint32_t header_offset_assigned;
+ uint32_t entrypoint;
+ uint32_t size;
+ uint32_t alignment;
+ uint32_t offset;
+ uint32_t top_aligned;
+ comp_algo algo;
+} param;
+
+typedef int (*convert_buffer_t)(struct buffer *buffer);
+
+static int cbfs_add_file(const char *filename,
+ const char *name,
+ uint32_t type,
+ convert_buffer_t convert,
+ const char *cbfs_name) {
+ struct cbfs_image image;
+ struct buffer buffer;
+ int result = 1;
+
+ if (!filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (rom_type == 0) {
+ if (type == 0) {
fprintf(stderr, "E: You need to specify a valid -t/--type.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (cbfs_get_entry(&image, name)) {
+ fprintf(stderr, "E: '%s' already in ROM image.\n", name);
return 1;
}
- cbfsfile = create_cbfs_file(rom_name, filedata, &filesize,
- rom_type, &rom_baseaddress);
- free(filedata);
-
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding file '%s' failed.\n", rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (buffer_from_file(&buffer, filename) != 0) {
+ fprintf(stderr, "E: Could not load file '%s'.\n", filename);
+ cbfs_image_delete(&image);
return 1;
}
- free(cbfsfile);
- free(rom);
- return 0;
-}
+ do {
+ if (convert && convert(&buffer) != 0) {
+ fprintf(stderr, "E: Failed to parse file '%s'.\n",
+ filename);
+ break;
+ }
+ if (cbfs_add_entry(&image, name, type, &buffer) != 0)
+ break;
+ if (cbfs_image_write_file(&image, cbfs_name) != 0)
+ break;
-static int cbfs_add_payload(void)
-{
- int32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
+ result = 0;
+ } while (0);
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ return result;
+}
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
+static int cbfs_convert_mkstage(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_stage(buffer->data, &output, param.algo,
+ param.base_address);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
- }
+static int cbfs_convert_elf_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_payload(buffer->data, &output,
+ param.algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
- return 1;
- }
+static int cbfs_convert_flat_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result;
+ result = parse_flat_binary_to_payload(buffer->data, &output,
+ buffer->size,
+ param.load_address,
+ param.entrypoint,
+ param.algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- filesize = parse_elf_to_payload(filedata, &payload, rom_algo);
- if (filesize <= 0) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(rom);
- return 1;
- }
+static int cbfstool_add(void)
+{
+ // TODO where is rom_base_address?
+ return cbfs_add_file(param.filename,
+ param.name,
+ param.type,
+ NULL,
+ param.cbfs_name);
+}
- cbfsfile = create_cbfs_file(rom_name, payload, &filesize,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
- free(filedata);
- free(payload);
+static int cbfstool_add_payload(void)
+{
+ return cbfs_add_file(param.filename,
+ param.name,
+ CBFS_COMPONENT_PAYLOAD,
+ cbfs_convert_elf_mkpayload,
+ param.cbfs_name);
+}
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+static int cbfstool_add_stage(void)
+{
+ return cbfs_add_file(param.filename,
+ param.name,
+ CBFS_COMPONENT_STAGE,
+ cbfs_convert_mkstage,
+ param.cbfs_name);
+}
+
+static int cbfstool_add_flat_binary(void)
+{
+ if (param.load_address == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-l/--load-address.\n");
return 1;
}
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (param.entrypoint == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-e/--entry-point.\n");
return 1;
}
-
- free(cbfsfile);
- free(rom);
- return 0;
+ return cbfs_add_file(param.filename,
+ param.name,
+ CBFS_COMPONENT_PAYLOAD,
+ cbfs_convert_flat_mkpayload,
+ param.cbfs_name);
}
-static int cbfs_add_stage(void)
+static int cbfstool_remove(void)
{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *stage;
+ int result = 1;
+ struct cbfs_image image;
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
-
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
- return 1;
- }
-
- filesize = parse_elf_to_stage(filedata, &stage, rom_algo, &rom_baseaddress);
-
- cbfsfile = create_cbfs_file(rom_name, stage, &filesize,
- CBFS_COMPONENT_STAGE, &rom_baseaddress);
-
- free(filedata);
- free(stage);
-
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding stage '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
- return 1;
- }
+ do {
+ if (cbfs_remove_entry(&image, param.name) != 0) {
+ fprintf(stderr, "E: Removing file '%s' failed.\n",
+ param.name);
+ break;
+ }
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0)
+ break;
+ result = 0;
+ } while (0);
- free(cbfsfile);
- free(rom);
- return 0;
+ cbfs_image_delete(&image);
+ return result;
}
-static int cbfs_add_flat_binary(void)
+static int cbfstool_create(void)
{
- uint32_t filesize = 0;
- uint32_t final_size;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
- comp_func_ptr compress;
- struct cbfs_payload_segment *segs;
- int doffset, len = 0;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+ struct cbfs_image image;
+ struct buffer bootblock;
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
-
- if (rom_loadaddress == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-l/--load-address.\n");
- return 1;
- }
-
- if (rom_entrypoint == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-e/--entry-point.\n");
+ if (param.size == 0) {
+ fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
return 1;
}
- compress = compression_function(rom_algo);
- if (!compress)
- return 1;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ if (!param.bootblock_file) {
+ fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (buffer_from_file(&bootblock, param.bootblock_file) != 0) {
return 1;
}
- /* FIXME compressed file size might be bigger than original file */
- payload = calloc((2 * sizeof(struct cbfs_payload_segment)) + filesize, 1);
- if (payload == NULL) {
- fprintf(stderr, "E: Could not allocate memory.\n");
- free(filedata);
- free(rom);
- return 1;
+ // Setup default boot offset and header offset.
+ if (!param.bootblock_offset_assigned) {
+ // put boot block before end of ROM.
+ param.bootblock_offset = param.size - bootblock.size;
+ DEBUG("bootblock in end of ROM.\n");
}
-
- segs = (struct cbfs_payload_segment *)payload;
- doffset = (2 * sizeof(struct cbfs_payload_segment));
-
- /* Prepare code segment */
- segs[0].type = PAYLOAD_SEGMENT_CODE;
- segs[0].load_addr = (uint64_t)htonll(rom_loadaddress);
- segs[0].mem_len = (uint32_t)htonl(filesize);
- segs[0].offset = (uint32_t)htonl(doffset);
-
- compress(filedata, filesize, (char *)(payload + doffset), &len);
- segs[0].compression = htonl(rom_algo);
- segs[0].len = htonl(len);
-
- if ((unsigned int)len >= filesize) {
- segs[0].compression = 0;
- segs[0].len = htonl(filesize);
- memcpy((char *)(payload + doffset), filedata, filesize);
+ if (!param.header_offset_assigned) {
+ // Put header before bootblock, and make a reference in end of
+ // bootblock.
+ param.header_offset = (
+ param.bootblock_offset -
+ sizeof(struct cbfs_header));
+ if (bootblock.size >= sizeof(uint32_t)) {
+ // TODO this only works for 32b top-aligned system now...
+ uint32_t ptr = param.header_offset - param.size;
+ uint32_t *sig = (uint32_t*)(bootblock.data +
+ bootblock.size -
+ sizeof(ptr));
+ *sig = ptr;
+ DEBUG("CBFS header reference in end of bootblock.\n");
+ }
}
- /* prepare entry point segment */
- segs[1].type = PAYLOAD_SEGMENT_ENTRY;
- segs[1].load_addr = (uint64_t)htonll(rom_entrypoint);
-
- final_size = doffset + ntohl(segs[0].len);
- cbfsfile =
- create_cbfs_file(rom_name, payload, &final_size,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
-
- free(filedata);
- free(payload);
-
- if (add_file_to_cbfs(cbfsfile, final_size, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_create(&image,
+ param.size,
+ param.alignment,
+ &bootblock,
+ param.bootblock_offset,
+ param.header_offset,
+ param.offset) != 0) {
+ fprintf(stderr, "E: Failed to create %s.\n", param.cbfs_name);
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to write %s.\n", param.cbfs_name);
return 1;
}
-
- free(cbfsfile);
- free(rom);
+ cbfs_image_delete(&image);
return 0;
+
}
-static int cbfs_remove(void)
+static int cbfstool_locate_stage(void)
{
- void *rom;
+ struct cbfs_image image;
+ struct cbfs_file *entry;
+ struct buffer buffer;
+ size_t stage_size;
+ uint32_t address;
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ if (!param.filename) {
+ fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (remove_file_from_cbfs(rom_name)) {
- fprintf(stderr, "E: Removing file '%s' failed.\n",
- rom_name);
- free(rom);
+ if (!param.name) {
+ fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
- free(rom);
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to load %s.\n", param.cbfs_name);
return 1;
}
- free(rom);
- return 0;
-}
-
-static int cbfs_create(void)
-{
- if (rom_size == 0) {
- fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
+ if (buffer_from_file(&buffer, param.filename) != 0) {
+ fprintf(stderr, "E: Cannot load %s.\n", param.filename);
+ cbfs_image_delete(&image);
return 1;
}
- if (!rom_bootblock) {
- fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
- return 1;
- }
+ // Increase buffer for cbfs_stage header.
+ stage_size = buffer.size + sizeof(struct cbfs_stage);
+ buffer_delete(&buffer);
+ buffer_create(&buffer, stage_size, param.name);
- if (arch == CBFS_ARCHITECTURE_UNKNOWN) {
- fprintf(stderr, "E: You need to specify -m/--machine arch\n");
+ if (cbfs_get_entry(&image, param.name)) {
+ fprintf(stderr, "E: '%s' already in CBFS.\n", param.name);
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
- return create_cbfs_image(cbfs_name, rom_size, rom_bootblock,
- rom_alignment, rom_offset);
-}
-
-static int cbfs_locate(void)
-{
- uint32_t filesize, location;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
+ if (cbfs_add_entry(&image, param.name, CBFS_COMPONENT_STAGE,
+ &buffer) != 0) {
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
+ entry = cbfs_get_entry(&image, param.name);
+ assert(entry);
+ assert(cbfs_is_valid_entry(entry));
+ address = (cbfs_get_entry_addr(&image, entry) + ntohl(entry->offset) +
+ sizeof(struct cbfs_stage));
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
+ if (param.top_aligned) {
+ address = address - ntohl(image.header->romsize);
}
-
- filesize = getfilesize(rom_filename);
-
- location = cbfs_find_location(cbfs_name, filesize,
- rom_name, rom_alignment);
-
- printf("%x\n", location);
- return location == 0 ? 1 : 0;
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ printf("0x%x\n", address);
+ return 0;
}
-static int cbfs_print(void)
+static int cbfstool_print(void)
{
- void *rom;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ struct cbfs_image image;
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
-
- print_cbfs_directory(cbfs_name);
-
- free(rom);
+ cbfs_print_directory(&image);
+ cbfs_image_delete(&image);
return 0;
}
-static int cbfs_extract(void)
+static int cbfstool_extract(void)
{
- void *rom;
- int ret;
+ int result = 0;
+ struct cbfs_image image;
- if (!rom_filename) {
+ if (!param.filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
+ param.cbfs_name);
+ result = 1;
+ } else if (cbfs_export_entry(&image, param.name,
+ param.filename) != 0) {
+ result = 1;
}
- ret = extract_file_from_cbfs(cbfs_name, rom_name, rom_filename);
-
- free(rom);
- return ret;
+ cbfs_image_delete(&image);
+ return result;
}
static const struct command commands[] = {
- {"add", "f:n:t:b:h?", cbfs_add},
- {"add-payload", "f:n:t:c:b:h?", cbfs_add_payload},
- {"add-stage", "f:n:t:c:b:h?", cbfs_add_stage},
- {"add-flat-binary", "f:n:l:e:c:b:h?", cbfs_add_flat_binary},
- {"remove", "n:h?", cbfs_remove},
- {"create", "s:B:a:o:m:h?", cbfs_create},
- {"locate", "f:n:a:h?", cbfs_locate},
- {"print", "h?", cbfs_print},
- {"extract", "n:f:h?", cbfs_extract},
+ {"add", "vf:n:t:b:h?", cbfstool_add},
+ {"add-payload", "vf:n:t:c:b:h?", cbfstool_add_payload},
+ {"add-stage", "vf:n:t:c:b:h?", cbfstool_add_stage},
+ {"add-flat-binary", "vf:n:l:e:c:b:h?", cbfstool_add_flat_binary},
+ {"remove", "vn:h?", cbfstool_remove},
+ {"create", "vs:B:A:H:a:o:m:h?", cbfstool_create},
+ {"locate-stage", "vTf:n:h?", cbfstool_locate_stage},
+ {"print", "vh?", cbfstool_print},
+ {"extract", "vn:f:h?", cbfstool_extract},
};
static struct option long_options[] = {
@@ -477,10 +432,13 @@ static struct option long_options[] = {
{"entry-point", required_argument, 0, 'e' },
{"size", required_argument, 0, 's' },
{"bootblock", required_argument, 0, 'B' },
+ {"bootblock-offset", required_argument, 0, 'A' },
+ {"header-offset",required_argument,0, 'H' },
{"alignment", required_argument, 0, 'a' },
{"offset", required_argument, 0, 'o' },
{"file", required_argument, 0, 'f' },
{"arch", required_argument, 0, 'm' },
+ {"top-aligned", no_argument, 0, 'T' },
{"verbose", no_argument, 0, 'v' },
{"help", no_argument, 0, 'h' },
{NULL, 0, 0, 0 }
@@ -491,8 +449,10 @@ static void usage(char *name)
printf
("cbfstool: Management utility for CBFS formatted ROM images\n\n"
"USAGE:\n" " %s [-h]\n"
- " %s FILE COMMAND [PARAMETERS]...\n\n" "OPTIONs:\n"
- " -h Display this help message\n\n"
+ " %s FILE COMMAND [-v] [PARAMETERS]...\n\n" "OPTIONs:\n"
+ " -h Display this help message\n\n"
+ " -T Display top-aligned address instead of offset\n"
+ " -v Verbose output\n"
"COMMANDs:\n"
" add -f FILE -n NAME -t TYPE [-b base-address] "
"Add a component\n"
@@ -505,10 +465,11 @@ static void usage(char *name)
"Add a 32bit flat mode binary\n"
" remove -n NAME "
"Remove a component\n"
- " create -s size -B bootblock -m ARCH [-a align] [-o offset] "
+ " create -s size -B bootblock [-A bootblock-offset] \\\n"
+ " [-H header-offset] [-a align] [-o offset] "
"Create a ROM file\n"
- " locate -f FILE -n NAME -a align "
- "Find a place for a file of that size\n"
+ " locate-stage -f FILE -n NAME [-T] "
+ "Find the entry if the stage component is added\n"
" print "
"Show the contents of the ROM\n"
" extract -n NAME -f FILE "
@@ -518,19 +479,7 @@ static void usage(char *name)
" armv7, x86\n"
"TYPEs:\n", name, name
);
- print_supported_filetypes();
-}
-
-/* Small, OS/libc independent runtime check for endianess */
-int host_bigendian = 0;
-
-static void which_endian(void)
-{
- static const uint32_t inttest = 0x12345678;
- uint8_t inttest_lsb = *(uint8_t *)&inttest;
- if (inttest_lsb == 0x12) {
- host_bigendian = 1;
- }
+ print_all_cbfs_entry_types();
}
int main(int argc, char **argv)
@@ -543,9 +492,7 @@ int main(int argc, char **argv)
return 1;
}
- which_endian();
-
- cbfs_name = argv[1];
+ param.cbfs_name = argv[1];
char *cmd = argv[2];
optind += 2;
@@ -572,61 +519,74 @@ int main(int argc, char **argv)
switch(c) {
case 'n':
- rom_name = optarg;
+ param.name = optarg;
break;
case 't':
- if (intfiletype(optarg) != ((uint64_t) - 1))
- rom_type = intfiletype(optarg);
- else
- rom_type = strtoul(optarg, NULL, 0);
- if (rom_type == 0)
+ param.type = get_cbfs_entry_type(optarg);
+ if (param.type == (uint32_t)-1)
+ param.type = strtoul(optarg, NULL,
+ 0);
+ if (param.type == 0)
printf("W: Unknown type '%s' ignored\n",
- optarg);
+ optarg);
break;
case 'c':
if (!strncasecmp(optarg, "lzma", 5))
- rom_algo = CBFS_COMPRESS_LZMA;
+ param.algo = CBFS_COMPRESS_LZMA;
else if (!strncasecmp(optarg, "none", 5))
- rom_algo = CBFS_COMPRESS_NONE;
+ param.algo = CBFS_COMPRESS_NONE;
else
printf("W: Unknown compression '%s'"
- " ignored.\n", optarg);
+ " ignored.\n", optarg);
break;
case 'b':
- rom_baseaddress = strtoul(optarg, NULL, 0);
+ param.base_address = strtoul(optarg, NULL, 0);
break;
case 'l':
- rom_loadaddress = strtoul(optarg, NULL, 0);
+ param.load_address = strtoul(optarg, NULL, 0);
break;
case 'e':
- rom_entrypoint = strtoul(optarg, NULL, 0);
+ param.entrypoint = strtoul(optarg, NULL, 0);
break;
case 's':
- rom_size = strtoul(optarg, &suffix, 0);
+ param.size = strtoul(optarg, &suffix, 0);
if (tolower(suffix[0])=='k') {
- rom_size *= 1024;
+ param.size *= 1024;
}
if (tolower(suffix[0])=='m') {
- rom_size *= 1024 * 1024;
+ param.size *= 1024 * 1024;
}
case 'B':
- rom_bootblock = optarg;
+ param.bootblock_file = optarg;
+ break;
+ case 'A':
+ param.bootblock_offset = strtoul(
+ optarg, NULL, 0);
+ param.bootblock_offset_assigned = 1;
+ break;
+ case 'H':
+ param.header_offset = strtoul(
+ optarg, NULL, 0);
+ param.header_offset_assigned = 1;
break;
case 'a':
- rom_alignment = strtoul(optarg, NULL, 0);
+ param.alignment = strtoul(optarg, NULL, 0);
break;
case 'o':
- rom_offset = strtoul(optarg, NULL, 0);
+ param.offset = strtoul(optarg, NULL, 0);
break;
case 'f':
- rom_filename = optarg;
+ param.filename = optarg;
+ break;
+ case 'T':
+ param.top_aligned = 1;
break;
case 'v':
verbose++;
break;
case 'm':
- arch = string_to_arch(optarg);
+ INFO("Architecture (-m) is deprecated.\n");
break;
case 'h':
case '?':
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 97bf168..4dab244 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,215 +20,105 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <assert.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <libgen.h>
+
#include "common.h"
-#include "cbfs.h"
#include "elf.h"
-#define dprintf(x...)
+/* Utilities */
-size_t getfilesize(const char *filename)
+/* Small, OS/libc independent runtime check for endianess */
+int is_big_endian(void)
{
- size_t size;
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return -1;
-
- fseek(file, 0, SEEK_END);
- size = ftell(file);
- fclose(file);
- return size;
-}
-
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place)
-{
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return NULL;
-
- fseek(file, 0, SEEK_END);
- *romsize_p = ftell(file);
- fseek(file, 0, SEEK_SET);
- if (!content) {
- content = malloc(*romsize_p);
- if (!content) {
- fprintf(stderr, "E: Could not get %d bytes for file %s\n",
- *romsize_p, filename);
- exit(1);
- }
- } else if (place == SEEK_END)
- content -= *romsize_p;
-
- if (!fread(content, *romsize_p, 1, file)) {
- fprintf(stderr, "E: Failed to read %s\n", filename);
- return NULL;
+ static const uint32_t inttest = 0x12345678;
+ uint8_t inttest_lsb = *(uint8_t *)&inttest;
+ if (inttest_lsb == 0x12) {
+ return 1;
}
- fclose(file);
- return content;
+ return 0;
}
-static struct cbfs_header *master_header;
-static uint32_t phys_start, phys_end, align;
-uint32_t romsize;
-void *offset;
-uint32_t arch = CBFS_ARCHITECTURE_UNKNOWN;
-
-static struct {
- uint32_t arch;
- const char *name;
-} arch_names[] = {
- { CBFS_ARCHITECTURE_ARMV7, "armv7" },
- { CBFS_ARCHITECTURE_X86, "x86" },
- { CBFS_ARCHITECTURE_UNKNOWN, "unknown" }
-};
-
-uint32_t string_to_arch(const char *arch_string)
-{
- int i;
- uint32_t ret = CBFS_ARCHITECTURE_UNKNOWN;
-
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (!strcasecmp(arch_string, arch_names[i].name)) {
- ret = arch_names[i].arch;
- break;
- }
- }
-
- return ret;
+uint32_t align_up(uint32_t value, uint32_t align) {
+ if (value % align)
+ value += align - (value % align);
+ return value;
}
-const char *arch_to_string(uint32_t a)
-{
- int i;
- const char *ret = NULL;
-
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (a == arch_names[i].arch) {
- ret = arch_names[i].name;
- break;
- }
- }
-
- return ret;
+/* Buffer and file I/O */
+int buffer_create(struct buffer *buffer, size_t size, const char *name) {
+ buffer->name = strdup(name);
+ buffer->size = size;
+ buffer->data = (char*)malloc(buffer->size);
+ return (buffer->data == NULL);
}
-int find_master_header(void *romarea, size_t size)
-{
- size_t offset;
-
- if (master_header)
- return 0;
-
- for (offset = 0; offset < size - sizeof(struct cbfs_header); offset++) {
- struct cbfs_header *tmp = romarea + offset;
-
- if (tmp->magic == ntohl(CBFS_HEADER_MAGIC)) {
- master_header = tmp;
- break;
- }
+int buffer_from_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "rb");
+ if (!fp) {
+ perror(filename);
+ return -1;
}
-
- return master_header ? 0 : 1;
-}
-
-void recalculate_rom_geometry(void *romarea)
-{
- if (find_master_header(romarea, romsize)) {
- fprintf(stderr, "E: Cannot find master header\n");
- exit(1);
+ fseek(fp, 0, SEEK_END);
+ buffer->size = ftell(fp);
+ buffer->name = strdup(filename);
+ rewind(fp);
+ buffer->data = (char*)malloc(buffer->size);
+ assert(buffer->data);
+ if (fread(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete read: %s\n", filename);
+ fclose(fp);
+ return -1;
}
+ fclose(fp);
+ return 0;
+}
- /* Update old headers */
- if (master_header->version == CBFS_HEADER_VERSION1 &&
- ntohl(master_header->architecture) == CBFS_ARCHITECTURE_UNKNOWN) {
- dprintf("Updating CBFS master header to version 2\n");
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
+int buffer_write_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "wb");
+ if (!fp) {
+ perror(filename);
+ return -1;
}
-
- arch = ntohl(master_header->architecture);
-
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- offset = romarea;
- phys_start = (0 + ntohl(master_header->offset)) & 0xffffffff;
- phys_end = romsize & 0xffffffff;
- break;
- case CBFS_ARCHITECTURE_X86:
- offset = romarea + romsize - 0x100000000ULL;
- phys_start = (0 - romsize + ntohl(master_header->offset)) &
- 0xffffffff;
- phys_end = (0 - ntohl(master_header->bootblocksize) -
- sizeof(struct cbfs_header)) & 0xffffffff;
- break;
- default:
- fprintf(stderr, "E: Unknown architecture\n");
- exit(1);
+ assert(buffer && buffer->data);
+ if (fwrite(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete write: %s\n", filename);
+ fclose(fp);
+ return -1;
}
-
- align = ntohl(master_header->align);
-}
-
-void *loadrom(const char *filename)
-{
- void *romarea = loadfile(filename, &romsize, 0, SEEK_SET);
- if (romarea == NULL)
- return NULL;
- recalculate_rom_geometry(romarea);
- return romarea;
+ fclose(fp);
+ return 0;
}
-int writerom(const char *filename, void *start, uint32_t size)
-{
- FILE *file = fopen(filename, "wb");
- if (!file) {
- fprintf(stderr, "Could not open '%s' for writing: ", filename);
- perror("");
- return 1;
+int buffer_delete(struct buffer *buffer) {
+ assert(buffer);
+ if (buffer->name) {
+ free(buffer->name);
+ buffer->name = NULL;
}
-
- if (fwrite(start, size, 1, file) != 1) {
- fprintf(stderr, "Could not write to '%s': ", filename);
- perror("");
- return 1;
+ if (buffer->data) {
+ free(buffer->data);
+ buffer->data = NULL;
}
-
- fclose(file);
+ buffer->size = 0;
return 0;
}
-int cbfs_file_header(unsigned long physaddr)
-{
- /* maybe improve this test */
- return (strncmp(phys_to_virt(physaddr), "LARCHIVE", 8) == 0);
-}
-
-struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size)
-{
- struct cbfs_file *nextfile = (struct cbfs_file *)phys_to_virt(physaddr);
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(size);
- nextfile->type = htonl(0xffffffff);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(sizeof(struct cbfs_file) + 16);
- memset(((void *)nextfile) + sizeof(struct cbfs_file), 0, 16);
- return nextfile;
-}
+/* Type and format */
-int iself(unsigned char *input)
-{
- Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
+int is_elf_object(const void *input) {
+ Elf32_Ehdr *ehdr = (Elf32_Ehdr *)input;
return !memcmp(ehdr->e_ident, ELFMAG, 4);
}
static struct filetypes_t {
uint32_t type;
const char *name;
-} filetypes[] = {
+} cbfs_filetypes[] = {
{CBFS_COMPONENT_STAGE, "stage"},
{CBFS_COMPONENT_PAYLOAD, "payload"},
{CBFS_COMPONENT_OPTIONROM, "optionrom"},
@@ -236,550 +127,573 @@ static struct filetypes_t {
{CBFS_COMPONENT_VSA, "vsa"},
{CBFS_COMPONENT_MBI, "mbi"},
{CBFS_COMPONENT_MICROCODE, "microcode"},
- {CBFS_COMPONENT_CMOS_DEFAULT, "cmos default"},
- {CBFS_COMPONENT_CMOS_LAYOUT, "cmos layout"},
+ {CBFS_COMPONENT_CMOS_DEFAULT, "cmos_default"},
+ {CBFS_COMPONENT_CMOS_LAYOUT, "cmos_layout"},
{CBFS_COMPONENT_DELETED, "deleted"},
{CBFS_COMPONENT_NULL, "null"}
};
-void print_supported_filetypes(void)
-{
- int i, number = ARRAY_SIZE(filetypes);
-
- for (i=0; i<number; i++) {
- printf(" %s%c", filetypes[i].name, (i==(number-1))?'\n':',');
- if ((i%8) == 7)
- printf("\n");
- }
-}
-
-const char *strfiletype(uint32_t number)
-{
+uint32_t get_cbfs_entry_type(const char *name) {
size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (filetypes[i].type == number)
- return filetypes[i].name;
- return "unknown";
+ for (i = 0; i < ARRAY_SIZE(cbfs_filetypes); i++)
+ if (strcmp(cbfs_filetypes[i].name, name) == 0)
+ return cbfs_filetypes[i].type;
+ return -1;
}
-uint64_t intfiletype(const char *name)
-{
+const char * get_cbfs_entry_type_name(uint32_t type) {
size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (strcmp(filetypes[i].name, name) == 0)
- return filetypes[i].type;
- return -1;
+ for (i = 0; i < ARRAY_SIZE(cbfs_filetypes); i++)
+ if (cbfs_filetypes[i].type == type)
+ return cbfs_filetypes[i].name;
+ return "(unknown)";
}
-void print_cbfs_directory(const char *filename)
-{
- printf
- ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n"
- "alignment: %d bytes, architecture: %s\n\n",
- basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize),
- romsize, ntohl(master_header->offset), align, arch_to_string(arch));
- printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
- if (strlen(fname) == 0)
- fname = "(empty)";
-
- printf("%-30s 0x%-8x %-12s %d\n", fname,
- current - phys_start + ntohl(master_header->offset),
- strfiletype(ntohl(thisfile->type)), length);
-
- /* note the components of the subheader are in host order ... */
- switch (ntohl(thisfile->type)) {
- case CBFS_COMPONENT_STAGE:
- {
- struct cbfs_stage *stage = CBFS_SUBHEADER(thisfile);
- dprintf(" %s compression, entry: 0x%llx, load: 0x%llx, length: %d/%d\n",
- stage->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- (unsigned long long)stage->entry,
- (unsigned long long)stage->load,
- stage->len,
- stage->memlen);
- break;
- }
- case CBFS_COMPONENT_PAYLOAD:
- {
- struct cbfs_payload_segment *payload = CBFS_SUBHEADER(thisfile);
- while(payload) {
- switch(payload->type) {
- case PAYLOAD_SEGMENT_CODE:
- case PAYLOAD_SEGMENT_DATA:
- dprintf(" %s (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d)\n",
- payload->type == PAYLOAD_SEGMENT_CODE ? "code " : "data" ,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len), ntohl(payload->mem_len));
- break;
- case PAYLOAD_SEGMENT_ENTRY:
- dprintf(" entry (0x%llx)\n", (unsigned long long)ntohll(payload->load_addr));
- break;
- case PAYLOAD_SEGMENT_BSS:
- dprintf(" BSS (address 0x%016llx, length 0x%x)\n", (unsigned long long)ntohll(payload->load_addr), ntohl(payload->len));
- break;
- case PAYLOAD_SEGMENT_PARAMS:
- dprintf(" parameters\n");
- break;
- default:
- dprintf(" %x (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d\n",
- payload->type,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len),
- ntohl(payload->mem_len));
- break;
- }
+void print_all_cbfs_entry_types(void) {
+ size_t i, total = ARRAY_SIZE(cbfs_filetypes);
- if(payload->type == PAYLOAD_SEGMENT_ENTRY)
- payload=NULL;
- else
- payload++;
- }
- break;
- }
- default:
- break;
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
+ for (i = 0; i < total; i++) {
+ printf(" %s%c", cbfs_filetypes[i].name,
+ (i + 1 == total) ? '\n' : ',');
+ if ((i + 1) % 8 == 0)
+ printf("\n");
}
}
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath)
+/* CBFS image processing */
+
+/* The file name align is not defined in CBFS spec -- only a preference by
+ * (old) cbfstool. */
+#define CBFS_FILENAME_ALIGN (16)
+
+/* To make CBFS more friendly to ROM, fill -1 (0xFF) instead of zero. */
+#define CBFS_CONTENT_DEFAULT_VALUE (-1)
+
+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)
{
- FILE *outfile = NULL;
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
+ struct cbfs_header *header;
+ struct cbfs_file *entry;
+ uint32_t cbfs_len;
- // Locate the file start struct
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- // And its length
- uint32_t length = ntohl(thisfile->len);
- // Locate the file name
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
-
- // It's not the file we are looking for..
- if (strcmp(fname, payloadname) != 0)
- {
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
- continue;
- }
+ DEBUG("cbfs_create_image: bootblock=0x%x+0x%zx, "
+ "header=0x%x+0x%zx, entries_offset=0x%x\n",
+ bootblock_offset, bootblock->size,
+ header_offset, sizeof(*header), entries_offset);
- // Else, it's our file.
- printf("Found file %.30s at 0x%x, type %.12s, size %d\n", fname,
- current - phys_start, strfiletype(ntohl(thisfile->type)),
- length);
-
- // If we are not dumping to stdout, open the out file.
- outfile = fopen(outpath, "wb");
- if (!outfile)
- {
- fprintf(stderr, "E: Could not open the file %s for writing.\n", outpath);
- return 1;
- }
+ if (buffer_create(&image->buffer, size, "(new)") != 0) {
+ ERROR("Cannot allocate memory for %zd bytes.\n", size);
+ return -1;
+ }
+ image->header = NULL;
+ memset(image->buffer.data, CBFS_CONTENT_DEFAULT_VALUE, size);
- if (ntohl(thisfile->type) != CBFS_COMPONENT_RAW)
- {
- fprintf(stderr, "W: Only 'raw' files are safe to extract.\n");
- }
+ // Adjust relative offset values (<0) to ROM address (>=0).
+ if (entries_offset < 0)
+ entries_offset += (int32_t)size;
+ if (bootblock_offset < 0)
+ bootblock_offset += (int32_t)size;
+ if (header_offset < 0)
+ header_offset += (int32_t) size;
- fwrite(((char *)thisfile)
- + ntohl(thisfile->offset), length, 1, outfile);
+ DEBUG("cbfs_create_image: (real offset) bootblock=0x%x, "
+ "header=0x%x, entries_offset=0x%x\n",
+ bootblock_offset, header_offset, entries_offset);
- fclose(outfile);
- printf("Successfully dumped the file.\n");
+ if (align == 0)
+ align = 64; // default align size.
- // We'll only dump one file.
- return 0;
+ // Prepare bootblock
+ if (bootblock_offset + bootblock->size > size) {
+ ERROR("Bootblock (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ bootblock_offset, bootblock->size, size);
+ return -1;
+ }
+ memcpy(image->buffer.data + bootblock_offset, bootblock->data,
+ bootblock->size);
+
+ // Prepare header
+ if (header_offset + sizeof(*header) > size) {
+ ERROR("Header (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ header_offset, sizeof(*header), size);
+ return -1;
}
- fprintf(stderr, "E: File %s not found.\n", payloadname);
- return 1;
+ header = (struct cbfs_header*)(image->buffer.data + header_offset);
+ image->header = header;
+ header->magic = htonl(CBFS_HEADER_MAGIC);
+ header->version = htonl(CBFS_HEADER_VERSION);
+ header->romsize = htonl(size);
+ header->bootblocksize = htonl(bootblock->size);
+ header->align = htonl(align);
+ header->offset = htonl(entries_offset);
+
+ // Prepare entries
+ if (align_up(entries_offset, align) != entries_offset) {
+ ERROR("Offset (0x%x) must be aligned to 0x%x.\n",
+ entries_offset, align);
+ return -1;
+ }
+ if (entries_offset + sizeof(*entry) > size) {
+ ERROR("Offset (0x%x+0x%zx) exceed ROM size(0x%zx)\n",
+ entries_offset, sizeof(*entry), size);
+ return -1;
+ }
+ entry = (struct cbfs_file*)(image->buffer.data + entries_offset);
+ // To calculate available length, find
+ // e = min(bootblock, header, size) where e > entries_offset.
+ cbfs_len = size;
+ if (bootblock_offset > entries_offset && bootblock_offset < cbfs_len)
+ cbfs_len = bootblock_offset;
+ if (header_offset > entries_offset && header_offset < cbfs_len)
+ cbfs_len = header_offset;
+ cbfs_len -= entries_offset + align;
+ cbfs_create_entry(image, entry, cbfs_len, "");
+ LOG("Created CBFS image (capacity = %d bytes)\n", cbfs_len);
+ return 0;
}
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location)
-{
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
-
- dprintf("at %x, %x bytes\n", current, length);
- /* Is this a free chunk? */
- if ((thisfile->type == CBFS_COMPONENT_DELETED)
- || (thisfile->type == CBFS_COMPONENT_NULL)) {
- dprintf("null||deleted at %x, %x bytes\n", current,
- length);
- /* if this is the right size, and if specified, the right location, use it */
- if ((contentsize <= length)
- && ((location == 0) || (current == location))) {
- if (contentsize < length) {
- dprintf
- ("this chunk is %x bytes, we need %x. create a new chunk at %x with %x bytes\n",
- length, contentsize,
- ALIGN(current + contentsize,
- align),
- length - contentsize);
- uint32_t start =
- ALIGN(current + contentsize, align);
- uint32_t size =
- current + ntohl(thisfile->offset)
- + length - start - 16 -
- sizeof(struct cbfs_file);
- cbfs_create_empty_file(start, size);
- }
- dprintf("copying data\n");
- memcpy(phys_to_virt(current), content,
- contentsize);
- return 0;
- }
- if (location != 0) {
- /* CBFS has the constraint that the chain always moves up in memory. so once
- we're past the place we seek, we don't need to look any further */
- if (current > location) {
- fprintf
- (stderr, "E: The requested space is not available\n");
- return 1;
- }
-
- /* Is the requested location inside the current chunk? */
- if ((current < location)
- && ((location + contentsize) <=
- (current + length))) {
- /* Split it up. In the next iteration the code will be at the right place. */
- dprintf("split up. new length: %x\n",
- location - current -
- ntohl(thisfile->offset));
- thisfile->len =
- htonl(location - current -
- ntohl(thisfile->offset));
- cbfs_create_empty_file(location,
- length -
- (location -
- current));
- }
- }
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename) {
+ if (buffer_from_file(&image->buffer, filename) != 0)
+ return -1;
+ DEBUG("read_cbfs_image: %s (%zd bytes)\n", image->buffer.name,
+ image->buffer.size);
+ image->header = cbfs_find_header(image->buffer.data,
+ image->buffer.size);
+ if (!image->header) {
+ ERROR("%s does not have CBFS master header.\n", filename);
+ cbfs_image_delete(image);
+ return -1;
}
- fprintf(stderr, "E: Could not add the file to CBFS, it's probably too big.\n");
- fprintf(stderr, "E: File size: %d bytes (%d KB).\n", contentsize, contentsize/1024);
- return 1;
+ return 0;
}
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename) {
+ assert(image && image->buffer.data);
+ return buffer_write_file(&image->buffer, filename);
+}
-static struct cbfs_file *merge_adjacent_files(struct cbfs_file *first,
- struct cbfs_file *second)
-{
- uint32_t new_length =
- ntohl(first->len) + ntohl(second->len) + ntohl(second->offset);
- first->len = htonl(new_length);
- first->checksum = 0; // FIXME?
- return first;
+int cbfs_image_delete(struct cbfs_image *image) {
+ buffer_delete(&image->buffer);
+ image->header = NULL;
+ return 0;
}
-static struct cbfs_file *next_file(struct cbfs_file *prev)
-{
- uint32_t pos = (prev == NULL) ? phys_start :
- ALIGN(virt_to_phys(prev) + ntohl(prev->len) + ntohl(prev->offset),
- align);
+static int cbfs_fix_legacy_size(struct cbfs_image *image) {
+ // A bug in old CBFStool may produce extra few bytes (by alignment) and
+ // cause cbfstool to overwrite things after free space -- which is
+ // usually CBFS header on x86. We need to workaround that.
- for (; pos < phys_end; pos += align) {
- if (cbfs_file_header(pos))
- return (struct cbfs_file *)phys_to_virt(pos);
+ struct cbfs_file *entry, *first = NULL, *last = NULL;
+ for (first = entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ last = entry;
}
- return NULL;
+ if ((char*)first < (char*)image->header &&
+ (char*)entry > (char*)image->header) {
+ WARN("CBFS image was created with old cbfstool with size bug. "
+ "Fixing size in last entry...\n");
+ last->len = htonl(ntohl(last->len) -
+ ntohl(image->header->align));
+ DEBUG("Last entry has been changed from 0x%x to 0x%x.\n",
+ cbfs_get_entry_addr(image, entry),
+ cbfs_get_entry_addr(image,
+ cbfs_find_next_entry(image, last)));
+ }
+ return 0;
}
+int cbfs_add_entry(struct cbfs_image *image, const char *name,
+ uint32_t type, struct buffer *buffer) {
+ uint32_t entry_type, entry_capacity;
+ uint32_t addr;
+ struct cbfs_file *entry, *next;
+ uint32_t need_size, new_size;
-int remove_file_from_cbfs(const char *filename)
-{
- struct cbfs_file *prev = NULL;
- struct cbfs_file *cur = next_file(prev);
- struct cbfs_file *next = next_file(cur);
- for (; cur; prev = cur, cur = next, next = next_file(next)) {
-
- /* Check if this is the file to remove. */
- char *name = (char *)cur + sizeof(*cur);
- if (strcmp(name, filename))
- continue;
+ need_size = (sizeof(*entry) + buffer->size +
+ align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN));
+ DEBUG("cbfs_add_entry('%s', %zd) => need_size = %u\n",
+ name, buffer->size, need_size);
+
+ cbfs_fix_legacy_size(image);
- /* Mark the file as free space and erase its name. */
- cur->type = CBFS_COMPONENT_NULL;
- name[0] = '\0';
+ // Merge empty entries.
+ DEBUG("(trying to merge empty entries...)\n");
+ cbfs_walk(image, cbfs_merge_empty_entry, NULL);
- /* Merge it with the previous file if possible. */
- if (prev && prev->type == CBFS_COMPONENT_NULL)
- cur = merge_adjacent_files(prev, cur);
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
- /* Merge it with the next file if possible. */
- if (next && next->type == CBFS_COMPONENT_NULL)
- merge_adjacent_files(cur, next);
+ entry_type = ntohl(entry->type);
+ if (entry_type != CBFS_COMPONENT_DELETED &&
+ entry_type != CBFS_COMPONENT_NULL)
+ continue;
+
+ addr = cbfs_get_entry_addr(image, entry);
+ next = cbfs_find_next_entry(image, entry);
+ entry_capacity = cbfs_get_entry_addr(image, next) - addr;
+ DEBUG("cbfs_add_entry: space %s at 0x%x, %d bytes\n",
+ get_cbfs_entry_type_name(entry_type), addr,
+ entry_capacity);
+ if (entry_capacity < need_size)
+ continue;
+ // TODO check if we want to put blob in particular address
+ // (baseaddress).
+
+ DEBUG("Filling new entry data (%zd bytes).\n", buffer->size);
+ cbfs_create_entry(image, entry, buffer->size, name);
+ entry->type = htonl(type);
+ memcpy(CBFS_SUBHEADER(entry), buffer->data, buffer->size);
+ if (verbose)
+ cbfs_print_entry_info(image, entry, NULL);
+
+ // setup new entry
+ DEBUG("Seting new empty entry.\n");
+ entry = cbfs_find_next_entry(image, entry);
+ new_size = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ new_size -= sizeof(*entry) + CBFS_FILENAME_ALIGN;
+ DEBUG("new size: %d\n", new_size);
+ cbfs_create_entry(image, entry, new_size, "");
+ if (verbose)
+ cbfs_print_entry_info(image, entry, NULL);
return 0;
}
- fprintf(stderr, "E: CBFS file %s not found.\n", filename);
- return 1;
+
+ ERROR("Could not add [%s, %zd bytes (%zd KB)]; probably too big?\n",
+ buffer->name, buffer->size, buffer->size / 1024);
+ return 0;
}
+int cbfs_remove_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry, *next;
+ size_t len;
+ entry = cbfs_get_entry(image, name);
+ if (!entry) {
+ ERROR("CBFS file %s not found.\n", name);
+ return -1;
+ }
+ next = cbfs_find_next_entry(image, entry);
+ assert(next);
+ DEBUG("cbfs_remove_entry: Removed %s @ 0x%x\n",
+ CBFS_NAME(entry), cbfs_get_entry_addr(image, entry));
+ entry->type = htonl(CBFS_COMPONENT_DELETED);
+ len = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ entry->offset = htonl(sizeof(*entry) + CBFS_FILENAME_ALIGN);
+ entry->len = htonl(len - ntohl(entry->offset));
+ memset(CBFS_NAME(entry), 0, CBFS_FILENAME_ALIGN);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE,
+ ntohl(entry->len));
+ return 0;
+}
-/* returns new data block with cbfs_file header, suitable to dump into the ROM. location returns
- the new location that points to the cbfs_file header */
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location)
-{
- uint32_t filename_len = ALIGN(strlen(filename) + 1, 16);
- uint32_t headersize = sizeof(struct cbfs_file) + filename_len;
- if ((location != 0) && (*location != 0)) {
- uint32_t offset = *location % align;
- /* If offset >= (headersize % align), we can stuff the header into the offset.
- Otherwise the header has to be aligned itself, and put before the offset data */
- if (offset >= (headersize % align)) {
- offset -= (headersize % align);
- } else {
- offset += align - (headersize % align);
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ if (strcmp(CBFS_NAME(entry), name) == 0) {
+ DEBUG("cbfs_get_entry: found %s\n", name);
+ return entry;
}
- headersize += offset;
- *location -= headersize;
- }
- void *newdata = malloc(*datasize + headersize);
- if (!newdata) {
- fprintf(stderr, "E: Could not get %d bytes for CBFS file.\n", *datasize +
- headersize);
- exit(1);
}
- memset(newdata, 0xff, *datasize + headersize);
- struct cbfs_file *nextfile = (struct cbfs_file *)newdata;
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(*datasize);
- nextfile->type = htonl(type);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(headersize);
- strcpy(newdata + sizeof(struct cbfs_file), filename);
- memcpy(newdata + headersize, data, *datasize);
- *datasize += headersize;
- return newdata;
-}
-
-int create_cbfs_image(const char *romfile, uint32_t _romsize,
- const char *bootblock, uint32_t align, uint32_t offs)
-{
- uint32_t bootblocksize = 0;
- struct cbfs_header *master_header;
- unsigned char *romarea, *bootblk;
-
- romsize = _romsize;
- romarea = malloc(romsize);
- if (!romarea) {
- fprintf(stderr, "E: Could not get %d bytes of memory"
- " for CBFS image.\n", romsize);
- exit(1);
+ return NULL;
+}
+
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename) {
+ struct cbfs_file *entry = cbfs_get_entry(image, entry_name);
+ struct buffer buffer;
+ if (!entry) {
+ ERROR("File not found: %s\n", entry_name);
+ return -1;
}
- memset(romarea, 0xff, romsize);
+ LOG("Found file %.30s at 0x%x, type %.12s, size %d\n",
+ entry_name, cbfs_get_entry_addr(image, entry),
+ get_cbfs_entry_type_name(ntohl(entry->type)),
+ ntohl(entry->len));
- if (align == 0)
- align = 64;
-
- bootblk = loadfile(bootblock, &bootblocksize,
- romarea + romsize, SEEK_END);
- if (!bootblk) {
- fprintf(stderr, "E: Could not load bootblock %s.\n",
- bootblock);
- free(romarea);
- return 1;
+ if (ntohl(entry->type) != CBFS_COMPONENT_RAW) {
+ WARN("Only 'raw' files are safe to extract.\n");
}
- // TODO(hungte) Replace magic numbers by named constants.
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- /* Set up physical/virtual mapping */
- offset = romarea;
-
- /*
- * The initial jump instruction and bootblock will be placed
- * before and after the master header, respectively. The
- * bootblock image must contain a blank, aligned region large
- * enough for the master header to fit.
- *
- * An anchor string must be left such that when cbfstool is run
- * we can find it and insert the master header at the next
- * aligned boundary.
- */
- loadfile(bootblock, &bootblocksize, romarea + offs, SEEK_SET);
-
- unsigned char *p = romarea + offs;
- while (1) {
- /* FIXME: assumes little endian... */
- if (*(uint32_t *)p == 0xdeadbeef)
- break;
- if (p >= (romarea + _romsize)) {
- fprintf(stderr, "E: Could not determine CBFS "
- "header location.\n", bootblock);
- return 1;
- }
- p += (sizeof(unsigned int));
- }
- unsigned int u = ALIGN((unsigned int)(p - romarea), align);
- master_header = (struct cbfs_header *)(romarea + u);
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(
- ALIGN((0x40 + bootblocksize), align));
- master_header->architecture = htonl(CBFS_ARCHITECTURE_ARMV7);
-
- ((uint32_t *) phys_to_virt(0x4 + offs))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file(
- offs + ALIGN((0x40 + bootblocksize), align),
- romsize - offs - sizeof(struct cbfs_file) -
- ALIGN((bootblocksize + 0x40), align));
- break;
-
- case CBFS_ARCHITECTURE_X86:
- // Set up physical/virtual mapping
- offset = romarea + romsize - 0x100000000ULL;
-
- loadfile(bootblock, &bootblocksize, romarea + romsize,
- SEEK_END);
- master_header = (struct cbfs_header *)(romarea + romsize -
- bootblocksize - sizeof(struct cbfs_header));
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(offs);
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
-
- ((uint32_t *) phys_to_virt(CBFS_HEADPTR_ADDR_X86))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff,
- romsize - offs - bootblocksize -
- sizeof(struct cbfs_header) -
- sizeof(struct cbfs_file) - 16);
- break;
-
- default:
- // Should not happen.
- fprintf(stderr, "E: You found a bug in cbfstool.\n");
- exit(1);
+ buffer.data = CBFS_SUBHEADER(entry);
+ buffer.size = ntohl(entry->len);
+ buffer.name = "(cbfs_export_entry)";
+ if (buffer_write_file(&buffer, filename) != 0) {
+ ERROR("Failed to write %s into %s.\n",
+ entry_name, filename);
+ return -1;
}
+ INFO("Successfully dumped the file to: %s\n", filename);
+ return 0;
+}
+
+/* basename(3) may modify buffer, so we want a tiny alternative. */
+static const char *simple_basename(const char *name) {
+ const char *slash = strrchr(name, '/');
+ if (slash)
+ return slash + 1;
+ else
+ return name;
+}
- writerom(romfile, romarea, romsize);
- free(romarea);
+int cbfs_print_header_info(struct cbfs_image *image) {
+ assert(image && image->header);
+ printf("%s: %zd kB, bootblocksize %d, romsize %d, offset 0x%x\n"
+ "alignment: %d bytes\n\n",
+ simple_basename(image->buffer.name),
+ image->buffer.size / 1024,
+ ntohl(image->header->bootblocksize),
+ ntohl(image->header->romsize),
+ ntohl(image->header->offset),
+ ntohl(image->header->align));
return 0;
}
-static int in_segment(int addr, int size, int gran)
-{
- return ((addr & ~(gran - 1)) == ((addr + size) & ~(gran - 1)));
+static int cbfs_print_stage_info(struct cbfs_stage *stage) {
+ printf(" %s compression, entry: 0x%" PRIx64 ", load: 0x%" PRIx64 ", "
+ "length: %d/%d\n",
+ stage->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
+ stage->entry,
+ stage->load,
+ stage->len,
+ stage->memlen);
+ return 0;
}
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t alignment)
+static int cbfs_print_payload_segment_info(struct cbfs_payload_segment *payload)
{
- void *rom;
- size_t filename_size, headersize, totalsize;
- int ret = 0;
- uint32_t current;
-
- rom = loadrom(romfile);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- romfile);
+ switch(payload->type) {
+ case PAYLOAD_SEGMENT_CODE:
+ case PAYLOAD_SEGMENT_DATA:
+ printf(" %s (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d)\n",
+ (payload->type == PAYLOAD_SEGMENT_CODE ?
+ "code " : "data"),
+ (payload->compression == CBFS_COMPRESS_LZMA ?
+ "LZMA" : "no"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len), ntohl(payload->mem_len));
+ break;
+
+ case PAYLOAD_SEGMENT_ENTRY:
+ printf(" entry (0x%" PRIx64 ")\n",
+ ntohll(payload->load_addr));
+ break;
+
+ case PAYLOAD_SEGMENT_BSS:
+ printf(" BSS (address 0x%016" PRIx64 ", "
+ "length 0x%x)\n",
+ ntohll(payload->load_addr),
+ ntohl(payload->len));
+ break;
+
+ case PAYLOAD_SEGMENT_PARAMS:
+ printf(" parameters\n");
+ break;
+
+ default:
+ printf(" %x (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d\n",
+ payload->type,
+ (payload->compression == CBFS_COMPRESS_LZMA ?
+ "LZMA" : "no"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len),
+ ntohl(payload->mem_len));
+ break;
+ }
+ return 0;
+}
+
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ const char *name = CBFS_NAME(entry);
+ struct cbfs_payload_segment *payload;
+ if (!cbfs_is_valid_entry(entry)) {
+ ERROR("cbfs_print_entry_info: Invalid entry at 0x%x\n",
+ cbfs_get_entry_addr(image, entry));
+ return -1;
+ }
+
+ printf("%-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));
+
+ if (!verbose)
return 0;
+
+ /* note the components of the subheader may be in host order ... */
+ switch (ntohl(entry->type)) {
+ case CBFS_COMPONENT_STAGE:
+ cbfs_print_stage_info((struct cbfs_stage*)
+ CBFS_SUBHEADER(entry));
+ break;
+
+ case CBFS_COMPONENT_PAYLOAD:
+ payload = (struct cbfs_payload_segment*)
+ CBFS_SUBHEADER(entry);
+ while (payload) {
+ cbfs_print_payload_segment_info(payload);
+ if (payload->type == PAYLOAD_SEGMENT_ENTRY)
+ break;
+ else
+ payload ++;
+ }
+ break;
+ default:
+ break;
}
+ return 0;
+}
- filename_size = strlen(filename);
- headersize = sizeof(struct cbfs_file) + ALIGN(filename_size + 1, 16) +
- sizeof(struct cbfs_stage);
- totalsize = headersize + filesize;
+int cbfs_print_directory(struct cbfs_image *image) {
+ cbfs_print_header_info(image);
+ printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
+ cbfs_walk(image, cbfs_print_entry_info, NULL);
+ return 0;
+}
- current = phys_start;
- while (current < phys_end) {
- uint32_t top;
- struct cbfs_file *thisfile;
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ struct cbfs_file *next, *last;
+ uint32_t type;
+ size_t newlen;
+ type = ntohl(entry->type);
+ if (type != CBFS_COMPONENT_NULL && type != CBFS_COMPONENT_DELETED)
+ return 0;
+ next = cbfs_find_next_entry(image, entry);
+ if (!next || !cbfs_is_valid_entry(next))
+ return -1;
+ last = cbfs_find_next_entry(image, next);
+ assert(last);
+ type = ntohl(next->type);
+ if (type != CBFS_COMPONENT_NULL && type != CBFS_COMPONENT_DELETED)
+ return 0;
+
+ // Now, we find two deleted/empty entries; try to merge now.
+ DEBUG("cbfs_join_empty_entry: combine 0x%x+0x%x and 0x%x+0x%x.\n",
+ cbfs_get_entry_addr(image, entry), ntohl(entry->len),
+ cbfs_get_entry_addr(image, next), ntohl(next->len));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ newlen = (cbfs_get_entry_addr(image, last) -
+ cbfs_get_entry_addr(image, entry) - ntohl(entry->offset));
+ entry->len = htonl(newlen);
+ DEBUG("new empty entry: length=0x%zx\n", newlen);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, newlen);
+ // TODO we should try again until no more entries are found...
+ return 0;
+}
+
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback,
+ void *arg) {
+ int count = 0;
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ count ++;
+ if (callback(image, entry, arg) != 0)
+ break;
+ }
+ return count;
+}
- if (!cbfs_file_header(current)) {
- current += align;
+struct cbfs_header *cbfs_find_header(char *data, size_t size) {
+ size_t offset;
+ int found = 0;
+ uint32_t x86sig;
+ struct cbfs_header *header, *result = NULL;
+
+ // Try x86 style (check signature in bottom) header first.
+ x86sig = *(uint32_t*)(data + size - sizeof(uint32_t));
+ offset = (x86sig + (uint32_t)size);
+ DEBUG("x86sig: 0x%x, offset: 0x%zx\n", x86sig, offset);
+ if (offset >= size - sizeof(*header) ||
+ ntohl(((struct cbfs_header*)(data + offset))->magic) !=
+ CBFS_HEADER_MAGIC)
+ offset = 0;
+
+ for (; offset + sizeof(*header) < size; offset++) {
+ header = (struct cbfs_header*)(data + offset);
+ if (ntohl(header->magic) !=(CBFS_HEADER_MAGIC))
+ continue;
+ if (ntohl(header->version) != CBFS_HEADER_VERSION1 &&
+ ntohl(header->version) != CBFS_HEADER_VERSION2) {
+ // Probably not a real CBFS header?
continue;
}
+ found++;
+ result = header;
+ }
+ if (found > 1) {
+ ERROR("multiple (%d) CBFS headers found!\n",
+ found);
+ result = NULL;
+ }
+ return result;
+}
- thisfile = (struct cbfs_file *)phys_to_virt(current);
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image) {
+ assert(image && image->header);
+ return (struct cbfs_file*)(image->buffer.data +
+ ntohl(image->header->offset));
+}
- top = current + ntohl(thisfile->len) + ntohl(thisfile->offset);
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry) {
+ uint32_t addr = cbfs_get_entry_addr(image, entry);
+ int align = ntohl(image->header->align);
+ assert(entry && cbfs_is_valid_entry(entry));
+ addr += ntohl(entry->offset) + ntohl(entry->len);
+ addr = align_up(addr, align);
+ return (struct cbfs_file*)(image->buffer.data + addr);
+}
- if (((ntohl(thisfile->type) == 0x0)
- || (ntohl(thisfile->type) == 0xffffffff))
- && (ntohl(thisfile->len) + ntohl(thisfile->offset) >=
- totalsize)) {
- if (in_segment
- (current + headersize, filesize, alignment)) {
- ret = current + headersize;
- break;
- }
- if ((ALIGN(current, alignment) + filesize < top)
- && (ALIGN(current, alignment) - headersize >
- current)
- && in_segment(ALIGN(current, alignment), filesize,
- alignment)) {
- ret = ALIGN(current, alignment);
- break;
- }
- if ((ALIGN(current, alignment) + alignment + filesize <
- top)
- && (ALIGN(current, alignment) + alignment -
- headersize > current)
- && in_segment(ALIGN(current, alignment) + alignment,
- filesize, alignment)) {
- ret = ALIGN(current, alignment) + alignment;
- break;
- }
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
- }
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry) {
+ assert(image && image->buffer.data && entry);
+ return (int32_t)((char*)entry - image->buffer.data);
+}
- free(rom);
- return ret;
+int cbfs_is_valid_entry(struct cbfs_file *entry) {
+ return (entry &&memcmp(entry->magic, CBFS_FILE_MAGIC,
+ sizeof(entry->magic)) == 0);
+}
+
+int cbfs_init_entry(struct cbfs_file *entry,
+ struct buffer *buffer) {
+ memset(entry, 0, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->len = htonl(buffer->size);
+ entry->offset = htonl(sizeof(*entry) + strlen(buffer->name) + 1);
+ return 0;
+}
+
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name) {
+ memset(entry, CBFS_CONTENT_DEFAULT_VALUE, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ entry->len = htonl(len);
+ entry->checksum = 0; // TODO Build a checksum algorithm.
+ entry->offset = htonl(sizeof(*entry) + align_up(strlen(name) + 1,
+ CBFS_FILENAME_ALIGN));
+ memset(CBFS_NAME(entry), 0, ntohl(entry->offset) - sizeof(*entry));
+ strcpy(CBFS_NAME(entry), name);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, len);
+ return 0;
}
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index 853e529..fff5596 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -2,6 +2,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,71 +22,170 @@
#define __CBFSTOOL_COMMON_H
#include <stdint.h>
+#include "cbfs.h"
+
+/* Message output */
+extern int verbose;
+#define ERROR(x...) { fprintf(stderr, "ERROR: " x); }
+#define WARN(x...) { fprintf(stderr, "WARN: " 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 ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+/* Endianess */
+#include <arpa/inet.h> // for ntohl, htonl
#include "swab.h"
-#ifndef __APPLE__
-#define ntohl(x) (host_bigendian?(x):swab32(x))
-#define htonl(x) (host_bigendian?(x):swab32(x))
-#endif
-#define ntohll(x) (host_bigendian?(x):swab64(x))
-#define htonll(x) (host_bigendian?(x):swab64(x))
+int is_big_endian(void);
+#define ntohll(x) (is_big_endian() ? (x) : swab64(x))
+#define htonll(x) (is_big_endian() ? (x) : swab64(x))
-extern void *offset;
-extern uint32_t romsize;
-extern int host_bigendian;
-extern uint32_t arch;
+/* Buffer and file I/O */
+struct buffer {
+ char *name;
+ char *data;
+ size_t size;
+};
-const char *arch_to_string(uint32_t a);
-uint32_t string_to_arch(const char *arch_string);
+/* Creates an empty memory buffer with given size.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_create(struct buffer *buffer, size_t size, const char *name);
-static inline void *phys_to_virt(uint32_t addr)
-{
- return offset + addr;
-}
+/* Loads a file into memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_from_file(struct buffer *buffer, const char *filename);
-static inline uint32_t virt_to_phys(void *addr)
-{
- return (unsigned long)(addr - offset) & 0xffffffff;
-}
+/* Writes memory buffer content into file.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_write_file(struct buffer *buffer, const char *filename);
-#define ALIGN(val, by) (((val) + (by)-1)&~((by)-1))
+/* Destroys a memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_delete(struct buffer *buffer);
-size_t getfilesize(const char *filename);
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place);
-void *loadrom(const char *filename);
-int writerom(const char *filename, void *start, uint32_t size);
-int iself(unsigned char *input);
+/* Type and format */
-typedef void (*comp_func_ptr) (char *, int, char *, int *);
-typedef enum { CBFS_COMPRESS_NONE = 0, CBFS_COMPRESS_LZMA = 1 } comp_algo;
+/* Returns 1 if input points to an ELF object, otherwise 0. */
+int is_elf_object(const void *input);
-comp_func_ptr compression_function(comp_algo algo);
+/* Returns CBFS entry type value for given name, or (uint32_t)-1 as unknown. */
+uint32_t get_cbfs_entry_type(const char *name);
+
+/* Gets the name of given CBFS entry type value, or "(unknown)". */
+const char *get_cbfs_entry_type_name(uint32_t type);
+
+/* Prints all known CBFS entry types. */
+void print_all_cbfs_entry_types();
+
+
+/* CBFS image processing */
+
+struct cbfs_image {
+ struct buffer buffer;
+ struct cbfs_header *header;
+};
+
+/* Creates an empty CBFS image by given size, and description to its content
+ * (bootblock, align, header location, starting offset of CBFS entries.
+ * The output image will contain a valid cbfs_header, with one cbfs_file
+ * entry with type CBFS_COMPONENT_NULL, with max available size.
+ * Returns 0 on success, otherwise none-zero. */
+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);
+
+
+/* Loads a CBFS image from file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename);
+
+/* Writes a CBFS image into file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename);
-uint64_t intfiletype(const char *name);
+/* Releases the CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_delete(struct cbfs_image *image);
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo);
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location);
+/* Adds an entry to CBFS image by given name and type.
+ * Returns 0 on success, otherwise non-zero. */
+int cbfs_add_entry(struct cbfs_image *image, const char *name,
+ uint32_t type, struct buffer *buffer);
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location);
+/* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_remove_entry(struct cbfs_image *image, const char *name);
-int create_cbfs_image(const char *romfile, uint32_t romsize,
- const char *bootblock, uint32_t align, uint32_t offs);
+/* Returns a pointer to entry by name, or NULL if name is not found. */
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name);
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location);
-int remove_file_from_cbfs(const char *filename);
-void print_cbfs_directory(const char *filename);
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath);
-int remove_file_from_cbfs(const char *filename);
+/* Exports an entry to external file.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename);
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t align);
+/* Initializes a new entry with size and name in CBFS image.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name);
-void print_supported_filetypes(void);
+/* Callback function used by cbfs_walk.
+ * Returns 0 on success, or non-zero to stop further iteration. */
+typedef int (*cbfs_entry_callback)(struct cbfs_image *image,
+ struct cbfs_file *file,
+ void *arg);
-#define ARRAY_SIZE(a) (int)(sizeof(a) / sizeof((a)[0]))
+/* Iterates through all entries in CBFS image, and invoke with callback.
+ * Stops if callback returns non-zero values.
+ * Returns number of entries invoked. */
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback, void *arg);
+
+/* Primitive CBFS utilities */
+
+/* Returns a pointer to the only valid CBFS header in give buffer, otherwise
+ * NULL (including when multiple headers were found). If there is a X86 ROM
+ * style signature (pointer at 0xfffffffc) found in ROM, it will be selected as
+ * the only header.*/
+struct cbfs_header *cbfs_find_header(char *data, size_t size);
+
+/* Returns the first cbfs_file entry in CBFS image by CBFS header (no matter if
+ * the entry has valid content or not), otherwise NULL. */
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image);
+
+/* Returns next cbfs_file entry (no matter if its content is valid or not), or
+ * NULL on failure. */
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry);
+
+/* Returns ROM address (offset) of entry.
+ * This is different from entry->offset (pointer to content). */
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry);
+
+int cbfs_print_directory(struct cbfs_image *image);
+int cbfs_print_header_info(struct cbfs_image *image);
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+
+/* Returns 1 if entry has valid data (by checking magic number), otherwise 0. */
+int cbfs_is_valid_entry(struct cbfs_file *entry);
+
+/* Utilities */
+
+/* compress.c */
+typedef void (*comp_func_ptr) (char *, int, char *, int *);
+typedef enum {
+ CBFS_COMPRESS_NONE = 0,
+ CBFS_COMPRESS_LZMA
+} comp_algo;
+comp_func_ptr compression_function(comp_algo algo);
+/* cbfs-mkpayload.c */
+int parse_elf_to_payload(char *input, char **output, comp_algo algo);
+int parse_flat_binary_to_payload(char *input, char **output,
+ uint32_t input_size, uint32_t loadaddress,
+ uint32_t entrypoint, comp_algo algo);
+/* cbfs-mkstage.c */
+int parse_elf_to_stage(char *input, char **output, comp_algo algo,
+ uint32_t location);
#endif
1
0
Patch set updated for coreboot: d72e594 Improve CBFS tool to support platform without top-aligned mapping.
by Hung-Te Lin 27 Jan '13
by Hung-Te Lin 27 Jan '13
27 Jan '13
Hung-Te Lin (hungte(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2194
-gerrit
commit d72e5941e80e289be16bfdc981410f992ecb995c
Author: Hung-Te Lin <hungte(a)chromium.org>
Date: Sat Jan 26 02:03:28 2013 +0800
Improve CBFS tool to support platform without top-aligned mapping.
CBFS tool was written with lots of global variables and implemented with
assumption based on x86 architecture. To support other platforms better, we
should rewrite using logical offset.
Also fixed free size calculation error (which will cause overwriting header data
when you really used every bits in CBFS) in old CBFStool.
Usage changes:
- "locate" is changed to "locate-stage" (which is the real behavior in old
cbfstool) and prefix output with "0x". The output is now platform
independent offset. To retrieve x86 top-aligned virtual address, add "-T".
- "create" takes two extra optional params:
"-A": bootblock offset. When omitted, put bootblock in end of ROM.
"-H": header offset. When omitted, put header right before bootblock,
and put a top-aligned virtual address reference in end of ROM.
Verified to work on ARM (google/snow) and X86 (qemu/x86).
Change-Id: I28c737c8f290e51332119188248ac9e28042024c
Signed-off-by: Hung-Te Lin <hungte(a)chromium.org>
---
src/arch/armv7/Makefile.inc | 10 +-
src/arch/x86/Makefile.inc | 6 +-
util/cbfstool/cbfs-mkpayload.c | 82 ++-
util/cbfstool/cbfs-mkstage.c | 39 +-
util/cbfstool/cbfs.h | 3 +
util/cbfstool/cbfstool.c | 672 +++++++++++-----------
util/cbfstool/common.c | 1215 +++++++++++++++++++---------------------
util/cbfstool/common.h | 196 +++++--
8 files changed, 1113 insertions(+), 1110 deletions(-)
diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc
index 872365c..6e316ae 100644
--- a/src/arch/armv7/Makefile.inc
+++ b/src/arch/armv7/Makefile.inc
@@ -46,9 +46,11 @@ prebuild-files = \
$(if $(call extract_nth,4,$(file)),-b $(call extract_nth,4,$(file))) &&)
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
+# TODO(hungte) Change CBFS command to use per-board params.
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
$(CBFSTOOL) $@.tmp create -m armv7 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
- -B $(objcbfs)/bootblock.bin -a 64
+ -B $(objcbfs)/bootblock.bin -a 64 -A 0x0000 -H 0x2040 \
+ -o 0x5000
$(prebuild-files) true
mv $@.tmp $@
else
@@ -314,11 +316,9 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas
$(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin
@printf " generating base_xip.txt\n"
rm -f $@
- $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
+ $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
|| { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; }
- sed -e 's/^/0x/g' $@.tmp > $@.tmp2
- rm $@.tmp
- mv $@.tmp2 $@
+ mv $@.tmp $@
$(objgenerated)/crt0.romstage.S: $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n"
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index ea86f8f..cb446bb 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -375,11 +375,9 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas
$(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin
rm -f $@
- $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
+ $(CBFSTOOL) $(obj)/coreboot.pre1 locate-stage -T -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \
|| { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; }
- sed -e 's/^/0x/g' $@.tmp > $@.tmp2
- rm $@.tmp
- mv $@.tmp2 $@
+ mv $@.tmp $@
$(objgenerated)/crt0.romstage.S: $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n"
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index 0d3986e..3c19d55 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -22,24 +22,18 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo)
+int parse_elf_to_payload(char *input, char **output, comp_algo algo)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
Elf32_Shdr *shdr;
char *header;
char *strtab;
- unsigned char *sptr;
+ char *sptr;
int headers;
int segments = 1;
int isize = 0, osize = 0;
@@ -47,21 +41,16 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
struct cbfs_payload_segment *segs;
int i;
- if(!iself(input)){
+ if(!is_elf_object(input)){
fprintf(stderr, "E: The payload file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The payload file has the wrong architecture\n");
- return -1;
- }
-
comp_func_ptr compress = compression_function(algo);
if (!compress)
return -1;
+ DEBUG("start: parse_elf_to_payload\n");
headers = ehdr->e_phnum;
header = (char *)ehdr;
@@ -156,9 +145,9 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
if (phdr[i].p_filesz == 0) {
segs[segments].type = PAYLOAD_SEGMENT_BSS;
segs[segments].load_addr =
- (uint64_t)htonll(phdr[i].p_paddr);
+ htonll(phdr[i].p_paddr);
segs[segments].mem_len =
- (uint32_t)htonl(phdr[i].p_memsz);
+ htonl(phdr[i].p_memsz);
segs[segments].offset = htonl(doffset);
segments++;
@@ -169,8 +158,8 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
segs[segments].type = PAYLOAD_SEGMENT_CODE;
else
segs[segments].type = PAYLOAD_SEGMENT_DATA;
- segs[segments].load_addr = (uint64_t)htonll(phdr[i].p_paddr);
- segs[segments].mem_len = (uint32_t)htonl(phdr[i].p_memsz);
+ segs[segments].load_addr = htonll(phdr[i].p_paddr);
+ segs[segments].mem_len = htonl(phdr[i].p_memsz);
segs[segments].compression = htonl(algo);
segs[segments].offset = htonl(doffset);
@@ -197,7 +186,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
}
segs[segments].type = PAYLOAD_SEGMENT_ENTRY;
- segs[segments++].load_addr = (uint64_t)htonll(ehdr->e_entry);
+ segs[segments++].load_addr = htonll(ehdr->e_entry);
*output = sptr;
@@ -206,3 +195,54 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
err:
return -1;
}
+
+int parse_flat_binary_to_payload(char *input,
+ char **output,
+ uint32_t input_size,
+ uint32_t loadaddress,
+ uint32_t entrypoint,
+ comp_algo algo)
+{
+ comp_func_ptr compress;
+ char *payload;
+ struct cbfs_payload_segment *segs;
+ int doffset, len = 0;
+
+ compress = compression_function(algo);
+ if (!compress)
+ return 1;
+
+ DEBUG("start: parse_flat_binary_to_payload\n");
+ /* FIXME compressed file size might be bigger than original file */
+ payload = calloc((2 * sizeof(*segs)) + input_size, 1);
+ if (payload == NULL) {
+ fprintf(stderr, "E: Could not allocate memory.\n");
+ return 1;
+ }
+
+ segs = (struct cbfs_payload_segment *)payload;
+ doffset = (2 * sizeof(*segs));
+
+ /* Prepare code segment */
+ segs[0].type = PAYLOAD_SEGMENT_CODE;
+ segs[0].load_addr = htonll(loadaddress);
+ segs[0].mem_len = htonl(input_size);
+ segs[0].offset = htonl(doffset);
+
+ compress(input, input_size, (char *)(payload + doffset), &len);
+ segs[0].compression = htonl(algo);
+ segs[0].len = htonl(len);
+
+ if ((unsigned int)len >= input_size) {
+ segs[0].compression = 0;
+ segs[0].len = htonl(input_size);
+ memcpy(payload + doffset, input, input_size);
+ }
+
+ /* prepare entry point segment */
+ segs[1].type = PAYLOAD_SEGMENT_ENTRY;
+ segs[1].load_addr = htonll(entrypoint);
+
+ *output = payload;
+ return doffset + ntohl(segs[0].len);
+}
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index 0541d4b..9e47047 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -23,14 +23,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
static unsigned int idemp(unsigned int x)
{
@@ -48,13 +43,13 @@ static unsigned int swap32(unsigned int x)
unsigned int (*elf32_to_native) (unsigned int) = idemp;
/* returns size of result, or -1 if error */
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location)
+int parse_elf_to_stage(char *input, char **output,
+ comp_algo algo, uint32_t location)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
char *header, *buffer;
- unsigned char *out;
+ char *out;
int headers;
int i;
@@ -67,21 +62,16 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
if (!compress)
return -1;
- if (!iself(input)) {
+ DEBUG("start: parse_elf_to_stage(location=0x%x)\n", location);
+ if (!is_elf_object(input)) {
fprintf(stderr, "E: The stage file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The stage file has the wrong architecture\n");
- return -1;
- }
-
if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
elf_bigendian = 1;
}
- if (elf_bigendian != host_bigendian) {
+ if (elf_bigendian != is_big_endian()) {
elf32_to_native = swap32;
}
@@ -125,8 +115,8 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
mem_end = mend;
}
- if (data_start < *location) {
- data_start = *location;
+ if (data_start < location) {
+ data_start = location;
}
if (data_end <= data_start) {
@@ -155,9 +145,9 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
continue;
l_start = elf32_to_native(phdr[i].p_paddr);
- if (l_start < *location) {
- l_offset = *location - l_start;
- l_start = *location;
+ if (l_start < location) {
+ l_offset = location - l_start;
+ l_start = location;
}
memcpy(buffer + (l_start - data_start),
@@ -184,10 +174,7 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
(char *)(out + sizeof(struct cbfs_stage)), (int *)&stage->len);
free(buffer);
-
*output = out;
- if (*location)
- *location -= sizeof(struct cbfs_stage);
- return sizeof(struct cbfs_stage) + stage->len;
+ return sizeof(*stage) + stage->len;
}
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 3dbeefd..35d0670 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -42,6 +42,8 @@ struct cbfs_header {
#define CBFS_ARCHITECTURE_X86 0x00000001
#define CBFS_ARCHITECTURE_ARMV7 0x00000010
+#define CBFS_FILE_MAGIC "LARCHIVE"
+
struct cbfs_file {
uint8_t magic[8];
uint32_t len;
@@ -106,6 +108,7 @@ struct cbfs_payload {
#define CBFS_COMPONENT_NULL 0xFFFFFFFF
int cbfs_file_header(unsigned long physaddr);
+#define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file))
#define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) )
struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size);
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 4202801..4643e56 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,6 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -26,7 +28,8 @@
#include <unistd.h>
#include <getopt.h>
#include "common.h"
-#include "cbfs.h"
+
+int verbose = 0;
struct command {
const char *name;
@@ -34,438 +37,390 @@ struct command {
int (*function) (void);
};
-int verbose = 0;
-static char *cbfs_name = NULL;
-static char *rom_name = NULL;
-static char *rom_filename = NULL;
-static char *rom_bootblock = NULL;
-static uint32_t rom_type = 0;
-static uint32_t rom_baseaddress = 0;
-static uint32_t rom_loadaddress = 0;
-static uint32_t rom_entrypoint = 0;
-static uint32_t rom_size = 0;
-static uint32_t rom_alignment = 0;
-static uint32_t rom_offset = 0;
-static comp_algo rom_algo = CBFS_COMPRESS_NONE;
-
-static int cbfs_add(void)
-{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
-
- if (!rom_filename) {
+struct param {
+ char *cbfs_name;
+ char *name;
+ char *filename;
+ char *bootblock_file;
+ uint32_t type;
+ uint32_t base_address;
+ uint32_t load_address;
+ uint32_t bootblock_offset;
+ uint32_t bootblock_offset_assigned;
+ uint32_t header_offset;
+ uint32_t header_offset_assigned;
+ uint32_t entrypoint;
+ uint32_t size;
+ uint32_t alignment;
+ uint32_t offset;
+ uint32_t top_aligned;
+ comp_algo algo;
+} param;
+
+typedef int (*convert_buffer_t)(struct buffer *buffer);
+
+static int cbfs_add_file(const char *filename,
+ const char *name,
+ uint32_t type,
+ convert_buffer_t convert,
+ const char *cbfs_name) {
+ struct cbfs_image image;
+ struct buffer buffer;
+ int result = 1;
+
+ if (!filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (rom_type == 0) {
+ if (type == 0) {
fprintf(stderr, "E: You need to specify a valid -t/--type.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (cbfs_get_entry(&image, name)) {
+ fprintf(stderr, "E: '%s' already in ROM image.\n", name);
return 1;
}
- cbfsfile = create_cbfs_file(rom_name, filedata, &filesize,
- rom_type, &rom_baseaddress);
- free(filedata);
-
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding file '%s' failed.\n", rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (buffer_from_file(&buffer, filename) != 0) {
+ fprintf(stderr, "E: Could not load file '%s'.\n", filename);
+ cbfs_image_delete(&image);
return 1;
}
- free(cbfsfile);
- free(rom);
- return 0;
-}
+ do {
+ if (convert && convert(&buffer) != 0) {
+ fprintf(stderr, "E: Failed to parse file '%s'.\n",
+ filename);
+ break;
+ }
+ if (cbfs_add_entry(&image, name, type, &buffer) != 0)
+ break;
+ if (cbfs_image_write_file(&image, cbfs_name) != 0)
+ break;
-static int cbfs_add_payload(void)
-{
- int32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
+ result = 0;
+ } while (0);
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ return result;
+}
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
+static int cbfs_convert_mkstage(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_stage(buffer->data, &output, param.algo,
+ param.base_address);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
- }
+static int cbfs_convert_elf_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_payload(buffer->data, &output,
+ param.algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
- return 1;
- }
+static int cbfs_convert_flat_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result;
+ result = parse_flat_binary_to_payload(buffer->data, &output,
+ buffer->size,
+ param.load_address,
+ param.entrypoint,
+ param.algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- filesize = parse_elf_to_payload(filedata, &payload, rom_algo);
- if (filesize <= 0) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(rom);
- return 1;
- }
+static int cbfstool_add(void)
+{
+ // TODO where is rom_base_address?
+ return cbfs_add_file(param.filename,
+ param.name,
+ param.type,
+ NULL,
+ param.cbfs_name);
+}
- cbfsfile = create_cbfs_file(rom_name, payload, &filesize,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
- free(filedata);
- free(payload);
+static int cbfstool_add_payload(void)
+{
+ return cbfs_add_file(param.filename,
+ param.name,
+ CBFS_COMPONENT_PAYLOAD,
+ cbfs_convert_elf_mkpayload,
+ param.cbfs_name);
+}
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+static int cbfstool_add_stage(void)
+{
+ return cbfs_add_file(param.filename,
+ param.name,
+ CBFS_COMPONENT_STAGE,
+ cbfs_convert_mkstage,
+ param.cbfs_name);
+}
+
+static int cbfstool_add_flat_binary(void)
+{
+ if (param.load_address == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-l/--load-address.\n");
return 1;
}
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (param.entrypoint == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-e/--entry-point.\n");
return 1;
}
-
- free(cbfsfile);
- free(rom);
- return 0;
+ return cbfs_add_file(param.filename,
+ param.name,
+ CBFS_COMPONENT_PAYLOAD,
+ cbfs_convert_flat_mkpayload,
+ param.cbfs_name);
}
-static int cbfs_add_stage(void)
+static int cbfstool_remove(void)
{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *stage;
+ int result = 1;
+ struct cbfs_image image;
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
-
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
- return 1;
- }
-
- filesize = parse_elf_to_stage(filedata, &stage, rom_algo, &rom_baseaddress);
-
- cbfsfile = create_cbfs_file(rom_name, stage, &filesize,
- CBFS_COMPONENT_STAGE, &rom_baseaddress);
-
- free(filedata);
- free(stage);
-
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding stage '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
- return 1;
- }
+ do {
+ if (cbfs_remove_entry(&image, param.name) != 0) {
+ fprintf(stderr, "E: Removing file '%s' failed.\n",
+ param.name);
+ break;
+ }
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0)
+ break;
+ result = 0;
+ } while (0);
- free(cbfsfile);
- free(rom);
- return 0;
+ cbfs_image_delete(&image);
+ return result;
}
-static int cbfs_add_flat_binary(void)
+static int cbfstool_create(void)
{
- uint32_t filesize = 0;
- uint32_t final_size;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
- comp_func_ptr compress;
- struct cbfs_payload_segment *segs;
- int doffset, len = 0;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+ struct cbfs_image image;
+ struct buffer bootblock;
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
-
- if (rom_loadaddress == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-l/--load-address.\n");
- return 1;
- }
-
- if (rom_entrypoint == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-e/--entry-point.\n");
+ if (param.size == 0) {
+ fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
return 1;
}
- compress = compression_function(rom_algo);
- if (!compress)
- return 1;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ if (!param.bootblock_file) {
+ fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (buffer_from_file(&bootblock, param.bootblock_file) != 0) {
return 1;
}
- /* FIXME compressed file size might be bigger than original file */
- payload = calloc((2 * sizeof(struct cbfs_payload_segment)) + filesize, 1);
- if (payload == NULL) {
- fprintf(stderr, "E: Could not allocate memory.\n");
- free(filedata);
- free(rom);
- return 1;
+ // Setup default boot offset and header offset.
+ if (!param.bootblock_offset_assigned) {
+ // put boot block before end of ROM.
+ param.bootblock_offset = param.size - bootblock.size;
+ DEBUG("bootblock in end of ROM.\n");
}
-
- segs = (struct cbfs_payload_segment *)payload;
- doffset = (2 * sizeof(struct cbfs_payload_segment));
-
- /* Prepare code segment */
- segs[0].type = PAYLOAD_SEGMENT_CODE;
- segs[0].load_addr = (uint64_t)htonll(rom_loadaddress);
- segs[0].mem_len = (uint32_t)htonl(filesize);
- segs[0].offset = (uint32_t)htonl(doffset);
-
- compress(filedata, filesize, (char *)(payload + doffset), &len);
- segs[0].compression = htonl(rom_algo);
- segs[0].len = htonl(len);
-
- if ((unsigned int)len >= filesize) {
- segs[0].compression = 0;
- segs[0].len = htonl(filesize);
- memcpy((char *)(payload + doffset), filedata, filesize);
+ if (!param.header_offset_assigned) {
+ // Put header before bootblock, and make a reference in end of
+ // bootblock.
+ param.header_offset = (
+ param.bootblock_offset -
+ sizeof(struct cbfs_header));
+ if (bootblock.size >= sizeof(uint32_t)) {
+ // TODO this only works for 32b top-aligned system now...
+ uint32_t ptr = param.header_offset - param.size;
+ uint32_t *sig = (uint32_t*)(bootblock.data +
+ bootblock.size -
+ sizeof(ptr));
+ *sig = ptr;
+ DEBUG("CBFS header reference in end of bootblock.\n");
+ }
}
- /* prepare entry point segment */
- segs[1].type = PAYLOAD_SEGMENT_ENTRY;
- segs[1].load_addr = (uint64_t)htonll(rom_entrypoint);
-
- final_size = doffset + ntohl(segs[0].len);
- cbfsfile =
- create_cbfs_file(rom_name, payload, &final_size,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
-
- free(filedata);
- free(payload);
-
- if (add_file_to_cbfs(cbfsfile, final_size, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_create(&image,
+ param.size,
+ param.alignment,
+ &bootblock,
+ param.bootblock_offset,
+ param.header_offset,
+ param.offset) != 0) {
+ fprintf(stderr, "E: Failed to create %s.\n", param.cbfs_name);
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to write %s.\n", param.cbfs_name);
return 1;
}
-
- free(cbfsfile);
- free(rom);
+ cbfs_image_delete(&image);
return 0;
+
}
-static int cbfs_remove(void)
+static int cbfstool_locate_stage(void)
{
- void *rom;
+ struct cbfs_image image;
+ struct cbfs_file *entry;
+ struct buffer buffer;
+ size_t stage_size;
+ uint32_t address;
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ if (!param.filename) {
+ fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (remove_file_from_cbfs(rom_name)) {
- fprintf(stderr, "E: Removing file '%s' failed.\n",
- rom_name);
- free(rom);
+ if (!param.name) {
+ fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
- free(rom);
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to load %s.\n", param.cbfs_name);
return 1;
}
- free(rom);
- return 0;
-}
-
-static int cbfs_create(void)
-{
- if (rom_size == 0) {
- fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
+ if (buffer_from_file(&buffer, param.filename) != 0) {
+ fprintf(stderr, "E: Cannot load %s.\n", param.filename);
+ cbfs_image_delete(&image);
return 1;
}
- if (!rom_bootblock) {
- fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
- return 1;
- }
+ // Increase buffer for cbfs_stage header.
+ stage_size = buffer.size + sizeof(struct cbfs_stage);
+ buffer_delete(&buffer);
+ buffer_create(&buffer, stage_size, param.name);
- if (arch == CBFS_ARCHITECTURE_UNKNOWN) {
- fprintf(stderr, "E: You need to specify -m/--machine arch\n");
+ if (cbfs_get_entry(&image, param.name)) {
+ fprintf(stderr, "E: '%s' already in CBFS.\n", param.name);
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
- return create_cbfs_image(cbfs_name, rom_size, rom_bootblock,
- rom_alignment, rom_offset);
-}
-
-static int cbfs_locate(void)
-{
- uint32_t filesize, location;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
+ if (cbfs_add_entry(&image, param.name, CBFS_COMPONENT_STAGE,
+ &buffer) != 0) {
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
+ entry = cbfs_get_entry(&image, param.name);
+ assert(entry);
+ assert(cbfs_is_valid_entry(entry));
+ address = (cbfs_get_entry_addr(&image, entry) + ntohl(entry->offset) +
+ sizeof(struct cbfs_stage));
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
+ if (param.top_aligned) {
+ address = address - ntohl(image.header->romsize);
}
-
- filesize = getfilesize(rom_filename);
-
- location = cbfs_find_location(cbfs_name, filesize,
- rom_name, rom_alignment);
-
- printf("%x\n", location);
- return location == 0 ? 1 : 0;
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ printf("0x%x\n", address);
+ return 0;
}
-static int cbfs_print(void)
+static int cbfstool_print(void)
{
- void *rom;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ struct cbfs_image image;
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
-
- print_cbfs_directory(cbfs_name);
-
- free(rom);
+ cbfs_print_directory(&image);
+ cbfs_image_delete(&image);
return 0;
}
-static int cbfs_extract(void)
+static int cbfstool_extract(void)
{
- void *rom;
- int ret;
+ int result = 0;
+ struct cbfs_image image;
- if (!rom_filename) {
+ if (!param.filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
+ param.cbfs_name);
+ result = 1;
+ } else if (cbfs_export_entry(&image, param.name,
+ param.filename) != 0) {
+ result = 1;
}
- ret = extract_file_from_cbfs(cbfs_name, rom_name, rom_filename);
-
- free(rom);
- return ret;
+ cbfs_image_delete(&image);
+ return result;
}
static const struct command commands[] = {
- {"add", "f:n:t:b:h?", cbfs_add},
- {"add-payload", "f:n:t:c:b:h?", cbfs_add_payload},
- {"add-stage", "f:n:t:c:b:h?", cbfs_add_stage},
- {"add-flat-binary", "f:n:l:e:c:b:h?", cbfs_add_flat_binary},
- {"remove", "n:h?", cbfs_remove},
- {"create", "s:B:a:o:m:h?", cbfs_create},
- {"locate", "f:n:a:h?", cbfs_locate},
- {"print", "h?", cbfs_print},
- {"extract", "n:f:h?", cbfs_extract},
+ {"add", "vf:n:t:b:h?", cbfstool_add},
+ {"add-payload", "vf:n:t:c:b:h?", cbfstool_add_payload},
+ {"add-stage", "vf:n:t:c:b:h?", cbfstool_add_stage},
+ {"add-flat-binary", "vf:n:l:e:c:b:h?", cbfstool_add_flat_binary},
+ {"remove", "vn:h?", cbfstool_remove},
+ {"create", "vs:B:A:H:a:o:m:h?", cbfstool_create},
+ {"locate-stage", "vTf:n:a:h?", cbfstool_locate_stage},
+ {"print", "vh?", cbfstool_print},
+ {"extract", "vn:f:h?", cbfstool_extract},
};
static struct option long_options[] = {
@@ -477,10 +432,13 @@ static struct option long_options[] = {
{"entry-point", required_argument, 0, 'e' },
{"size", required_argument, 0, 's' },
{"bootblock", required_argument, 0, 'B' },
+ {"bootblock-offset", required_argument, 0, 'A' },
+ {"header-offset",required_argument,0, 'H' },
{"alignment", required_argument, 0, 'a' },
{"offset", required_argument, 0, 'o' },
{"file", required_argument, 0, 'f' },
{"arch", required_argument, 0, 'm' },
+ {"top-aligned", no_argument, 0, 'T' },
{"verbose", no_argument, 0, 'v' },
{"help", no_argument, 0, 'h' },
{NULL, 0, 0, 0 }
@@ -491,8 +449,10 @@ static void usage(char *name)
printf
("cbfstool: Management utility for CBFS formatted ROM images\n\n"
"USAGE:\n" " %s [-h]\n"
- " %s FILE COMMAND [PARAMETERS]...\n\n" "OPTIONs:\n"
- " -h Display this help message\n\n"
+ " %s FILE COMMAND [-v] [PARAMETERS]...\n\n" "OPTIONs:\n"
+ " -h Display this help message\n\n"
+ " -T Display top-aligned address instead of offset\n"
+ " -v Verbose output\n"
"COMMANDs:\n"
" add -f FILE -n NAME -t TYPE [-b base-address] "
"Add a component\n"
@@ -505,10 +465,11 @@ static void usage(char *name)
"Add a 32bit flat mode binary\n"
" remove -n NAME "
"Remove a component\n"
- " create -s size -B bootblock -m ARCH [-a align] [-o offset] "
+ " create -s size -B bootblock [-A bootblock-offset] \\\n"
+ " [-H header-offset] -m ARCH [-a align] [-o offset] "
"Create a ROM file\n"
- " locate -f FILE -n NAME -a align "
- "Find a place for a file of that size\n"
+ " locate-stage -f FILE -n NAME [-T] "
+ "Find the entry if the stage component is added\n"
" print "
"Show the contents of the ROM\n"
" extract -n NAME -f FILE "
@@ -518,19 +479,7 @@ static void usage(char *name)
" armv7, x86\n"
"TYPEs:\n", name, name
);
- print_supported_filetypes();
-}
-
-/* Small, OS/libc independent runtime check for endianess */
-int host_bigendian = 0;
-
-static void which_endian(void)
-{
- static const uint32_t inttest = 0x12345678;
- uint8_t inttest_lsb = *(uint8_t *)&inttest;
- if (inttest_lsb == 0x12) {
- host_bigendian = 1;
- }
+ print_all_cbfs_entry_types();
}
int main(int argc, char **argv)
@@ -543,9 +492,7 @@ int main(int argc, char **argv)
return 1;
}
- which_endian();
-
- cbfs_name = argv[1];
+ param.cbfs_name = argv[1];
char *cmd = argv[2];
optind += 2;
@@ -572,61 +519,74 @@ int main(int argc, char **argv)
switch(c) {
case 'n':
- rom_name = optarg;
+ param.name = optarg;
break;
case 't':
- if (intfiletype(optarg) != ((uint64_t) - 1))
- rom_type = intfiletype(optarg);
- else
- rom_type = strtoul(optarg, NULL, 0);
- if (rom_type == 0)
+ param.type = get_cbfs_entry_type(optarg);
+ if (param.type == (uint32_t)-1)
+ param.type = strtoul(optarg, NULL,
+ 0);
+ if (param.type == 0)
printf("W: Unknown type '%s' ignored\n",
- optarg);
+ optarg);
break;
case 'c':
if (!strncasecmp(optarg, "lzma", 5))
- rom_algo = CBFS_COMPRESS_LZMA;
+ param.algo = CBFS_COMPRESS_LZMA;
else if (!strncasecmp(optarg, "none", 5))
- rom_algo = CBFS_COMPRESS_NONE;
+ param.algo = CBFS_COMPRESS_NONE;
else
printf("W: Unknown compression '%s'"
- " ignored.\n", optarg);
+ " ignored.\n", optarg);
break;
case 'b':
- rom_baseaddress = strtoul(optarg, NULL, 0);
+ param.base_address = strtoul(optarg, NULL, 0);
break;
case 'l':
- rom_loadaddress = strtoul(optarg, NULL, 0);
+ param.load_address = strtoul(optarg, NULL, 0);
break;
case 'e':
- rom_entrypoint = strtoul(optarg, NULL, 0);
+ param.entrypoint = strtoul(optarg, NULL, 0);
break;
case 's':
- rom_size = strtoul(optarg, &suffix, 0);
+ param.size = strtoul(optarg, &suffix, 0);
if (tolower(suffix[0])=='k') {
- rom_size *= 1024;
+ param.size *= 1024;
}
if (tolower(suffix[0])=='m') {
- rom_size *= 1024 * 1024;
+ param.size *= 1024 * 1024;
}
case 'B':
- rom_bootblock = optarg;
+ param.bootblock_file = optarg;
+ break;
+ case 'A':
+ param.bootblock_offset = strtoul(
+ optarg, NULL, 0);
+ param.bootblock_offset_assigned = 1;
+ break;
+ case 'H':
+ param.header_offset = strtoul(
+ optarg, NULL, 0);
+ param.header_offset_assigned = 1;
break;
case 'a':
- rom_alignment = strtoul(optarg, NULL, 0);
+ param.alignment = strtoul(optarg, NULL, 0);
break;
case 'o':
- rom_offset = strtoul(optarg, NULL, 0);
+ param.offset = strtoul(optarg, NULL, 0);
break;
case 'f':
- rom_filename = optarg;
+ param.filename = optarg;
+ break;
+ case 'T':
+ param.top_aligned = 1;
break;
case 'v':
verbose++;
break;
case 'm':
- arch = string_to_arch(optarg);
+ // arch = string_to_arch(optarg);
break;
case 'h':
case '?':
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 97bf168..af03f1a 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,215 +20,105 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <assert.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <libgen.h>
+
#include "common.h"
-#include "cbfs.h"
#include "elf.h"
-#define dprintf(x...)
+/* Utilities */
-size_t getfilesize(const char *filename)
+/* Small, OS/libc independent runtime check for endianess */
+int is_big_endian(void)
{
- size_t size;
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return -1;
-
- fseek(file, 0, SEEK_END);
- size = ftell(file);
- fclose(file);
- return size;
-}
-
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place)
-{
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return NULL;
-
- fseek(file, 0, SEEK_END);
- *romsize_p = ftell(file);
- fseek(file, 0, SEEK_SET);
- if (!content) {
- content = malloc(*romsize_p);
- if (!content) {
- fprintf(stderr, "E: Could not get %d bytes for file %s\n",
- *romsize_p, filename);
- exit(1);
- }
- } else if (place == SEEK_END)
- content -= *romsize_p;
-
- if (!fread(content, *romsize_p, 1, file)) {
- fprintf(stderr, "E: Failed to read %s\n", filename);
- return NULL;
+ static const uint32_t inttest = 0x12345678;
+ uint8_t inttest_lsb = *(uint8_t *)&inttest;
+ if (inttest_lsb == 0x12) {
+ return 1;
}
- fclose(file);
- return content;
+ return 0;
}
-static struct cbfs_header *master_header;
-static uint32_t phys_start, phys_end, align;
-uint32_t romsize;
-void *offset;
-uint32_t arch = CBFS_ARCHITECTURE_UNKNOWN;
-
-static struct {
- uint32_t arch;
- const char *name;
-} arch_names[] = {
- { CBFS_ARCHITECTURE_ARMV7, "armv7" },
- { CBFS_ARCHITECTURE_X86, "x86" },
- { CBFS_ARCHITECTURE_UNKNOWN, "unknown" }
-};
-
-uint32_t string_to_arch(const char *arch_string)
-{
- int i;
- uint32_t ret = CBFS_ARCHITECTURE_UNKNOWN;
-
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (!strcasecmp(arch_string, arch_names[i].name)) {
- ret = arch_names[i].arch;
- break;
- }
- }
-
- return ret;
+uint32_t align_up(uint32_t value, uint32_t align) {
+ if (value % align)
+ value += align - (value % align);
+ return value;
}
-const char *arch_to_string(uint32_t a)
-{
- int i;
- const char *ret = NULL;
-
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (a == arch_names[i].arch) {
- ret = arch_names[i].name;
- break;
- }
- }
-
- return ret;
+/* Buffer and file I/O */
+int buffer_create(struct buffer *buffer, size_t size, const char *name) {
+ buffer->name = strdup(name);
+ buffer->size = size;
+ buffer->data = (char*)malloc(buffer->size);
+ return (buffer->data == NULL);
}
-int find_master_header(void *romarea, size_t size)
-{
- size_t offset;
-
- if (master_header)
- return 0;
-
- for (offset = 0; offset < size - sizeof(struct cbfs_header); offset++) {
- struct cbfs_header *tmp = romarea + offset;
-
- if (tmp->magic == ntohl(CBFS_HEADER_MAGIC)) {
- master_header = tmp;
- break;
- }
+int buffer_from_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "rb");
+ if (!fp) {
+ perror(filename);
+ return -1;
}
-
- return master_header ? 0 : 1;
-}
-
-void recalculate_rom_geometry(void *romarea)
-{
- if (find_master_header(romarea, romsize)) {
- fprintf(stderr, "E: Cannot find master header\n");
- exit(1);
+ fseek(fp, 0, SEEK_END);
+ buffer->size = ftell(fp);
+ buffer->name = strdup(filename);
+ rewind(fp);
+ buffer->data = (char*)malloc(buffer->size);
+ assert(buffer->data);
+ if (fread(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete read: %s\n", filename);
+ fclose(fp);
+ return -1;
}
+ fclose(fp);
+ return 0;
+}
- /* Update old headers */
- if (master_header->version == CBFS_HEADER_VERSION1 &&
- ntohl(master_header->architecture) == CBFS_ARCHITECTURE_UNKNOWN) {
- dprintf("Updating CBFS master header to version 2\n");
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
+int buffer_write_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "wb");
+ if (!fp) {
+ perror(filename);
+ return -1;
}
-
- arch = ntohl(master_header->architecture);
-
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- offset = romarea;
- phys_start = (0 + ntohl(master_header->offset)) & 0xffffffff;
- phys_end = romsize & 0xffffffff;
- break;
- case CBFS_ARCHITECTURE_X86:
- offset = romarea + romsize - 0x100000000ULL;
- phys_start = (0 - romsize + ntohl(master_header->offset)) &
- 0xffffffff;
- phys_end = (0 - ntohl(master_header->bootblocksize) -
- sizeof(struct cbfs_header)) & 0xffffffff;
- break;
- default:
- fprintf(stderr, "E: Unknown architecture\n");
- exit(1);
+ assert(buffer && buffer->data);
+ if (fwrite(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete write: %s\n", filename);
+ fclose(fp);
+ return -1;
}
-
- align = ntohl(master_header->align);
-}
-
-void *loadrom(const char *filename)
-{
- void *romarea = loadfile(filename, &romsize, 0, SEEK_SET);
- if (romarea == NULL)
- return NULL;
- recalculate_rom_geometry(romarea);
- return romarea;
+ fclose(fp);
+ return 0;
}
-int writerom(const char *filename, void *start, uint32_t size)
-{
- FILE *file = fopen(filename, "wb");
- if (!file) {
- fprintf(stderr, "Could not open '%s' for writing: ", filename);
- perror("");
- return 1;
+int buffer_delete(struct buffer *buffer) {
+ assert(buffer);
+ if (buffer->name) {
+ free(buffer->name);
+ buffer->name = NULL;
}
-
- if (fwrite(start, size, 1, file) != 1) {
- fprintf(stderr, "Could not write to '%s': ", filename);
- perror("");
- return 1;
+ if (buffer->data) {
+ free(buffer->data);
+ buffer->data = NULL;
}
-
- fclose(file);
+ buffer->size = 0;
return 0;
}
-int cbfs_file_header(unsigned long physaddr)
-{
- /* maybe improve this test */
- return (strncmp(phys_to_virt(physaddr), "LARCHIVE", 8) == 0);
-}
-
-struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size)
-{
- struct cbfs_file *nextfile = (struct cbfs_file *)phys_to_virt(physaddr);
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(size);
- nextfile->type = htonl(0xffffffff);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(sizeof(struct cbfs_file) + 16);
- memset(((void *)nextfile) + sizeof(struct cbfs_file), 0, 16);
- return nextfile;
-}
+/* Type and format */
-int iself(unsigned char *input)
-{
- Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
+int is_elf_object(const void *input) {
+ Elf32_Ehdr *ehdr = (Elf32_Ehdr *)input;
return !memcmp(ehdr->e_ident, ELFMAG, 4);
}
static struct filetypes_t {
uint32_t type;
const char *name;
-} filetypes[] = {
+} cbfs_filetypes[] = {
{CBFS_COMPONENT_STAGE, "stage"},
{CBFS_COMPONENT_PAYLOAD, "payload"},
{CBFS_COMPONENT_OPTIONROM, "optionrom"},
@@ -236,550 +127,574 @@ static struct filetypes_t {
{CBFS_COMPONENT_VSA, "vsa"},
{CBFS_COMPONENT_MBI, "mbi"},
{CBFS_COMPONENT_MICROCODE, "microcode"},
- {CBFS_COMPONENT_CMOS_DEFAULT, "cmos default"},
- {CBFS_COMPONENT_CMOS_LAYOUT, "cmos layout"},
+ {CBFS_COMPONENT_CMOS_DEFAULT, "cmos_default"},
+ {CBFS_COMPONENT_CMOS_LAYOUT, "cmos_layout"},
{CBFS_COMPONENT_DELETED, "deleted"},
{CBFS_COMPONENT_NULL, "null"}
};
-void print_supported_filetypes(void)
-{
- int i, number = ARRAY_SIZE(filetypes);
-
- for (i=0; i<number; i++) {
- printf(" %s%c", filetypes[i].name, (i==(number-1))?'\n':',');
- if ((i%8) == 7)
- printf("\n");
- }
-}
-
-const char *strfiletype(uint32_t number)
-{
+uint32_t get_cbfs_entry_type(const char *name) {
size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (filetypes[i].type == number)
- return filetypes[i].name;
- return "unknown";
+ for (i = 0; i < ARRAY_SIZE(cbfs_filetypes); i++)
+ if (strcmp(cbfs_filetypes[i].name, name) == 0)
+ return cbfs_filetypes[i].type;
+ return -1;
}
-uint64_t intfiletype(const char *name)
-{
+const char * get_cbfs_entry_type_name(uint32_t type) {
size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (strcmp(filetypes[i].name, name) == 0)
- return filetypes[i].type;
- return -1;
+ for (i = 0; i < ARRAY_SIZE(cbfs_filetypes); i++)
+ if (cbfs_filetypes[i].type == type)
+ return cbfs_filetypes[i].name;
+ return "(unknown)";
}
-void print_cbfs_directory(const char *filename)
-{
- printf
- ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n"
- "alignment: %d bytes, architecture: %s\n\n",
- basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize),
- romsize, ntohl(master_header->offset), align, arch_to_string(arch));
- printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
- if (strlen(fname) == 0)
- fname = "(empty)";
-
- printf("%-30s 0x%-8x %-12s %d\n", fname,
- current - phys_start + ntohl(master_header->offset),
- strfiletype(ntohl(thisfile->type)), length);
-
- /* note the components of the subheader are in host order ... */
- switch (ntohl(thisfile->type)) {
- case CBFS_COMPONENT_STAGE:
- {
- struct cbfs_stage *stage = CBFS_SUBHEADER(thisfile);
- dprintf(" %s compression, entry: 0x%llx, load: 0x%llx, length: %d/%d\n",
- stage->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- (unsigned long long)stage->entry,
- (unsigned long long)stage->load,
- stage->len,
- stage->memlen);
- break;
- }
- case CBFS_COMPONENT_PAYLOAD:
- {
- struct cbfs_payload_segment *payload = CBFS_SUBHEADER(thisfile);
- while(payload) {
- switch(payload->type) {
- case PAYLOAD_SEGMENT_CODE:
- case PAYLOAD_SEGMENT_DATA:
- dprintf(" %s (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d)\n",
- payload->type == PAYLOAD_SEGMENT_CODE ? "code " : "data" ,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len), ntohl(payload->mem_len));
- break;
- case PAYLOAD_SEGMENT_ENTRY:
- dprintf(" entry (0x%llx)\n", (unsigned long long)ntohll(payload->load_addr));
- break;
- case PAYLOAD_SEGMENT_BSS:
- dprintf(" BSS (address 0x%016llx, length 0x%x)\n", (unsigned long long)ntohll(payload->load_addr), ntohl(payload->len));
- break;
- case PAYLOAD_SEGMENT_PARAMS:
- dprintf(" parameters\n");
- break;
- default:
- dprintf(" %x (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d\n",
- payload->type,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len),
- ntohl(payload->mem_len));
- break;
- }
+void print_all_cbfs_entry_types(void) {
+ size_t i, total = ARRAY_SIZE(cbfs_filetypes);
- if(payload->type == PAYLOAD_SEGMENT_ENTRY)
- payload=NULL;
- else
- payload++;
- }
- break;
- }
- default:
- break;
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
+ for (i = 0; i < total; i++) {
+ printf(" %s%c", cbfs_filetypes[i].name,
+ (i + 1 == total) ? '\n' : ',');
+ if ((i + 1) % 8 == 0)
+ printf("\n");
}
}
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath)
+/* CBFS image processing */
+
+/* The file name align is not defined in CBFS spec -- only a preference by
+ * (old) cbfstool. */
+#define CBFS_FILENAME_ALIGN (16)
+
+/* To make CBFS more friendly to ROM, fill -1 (0xFF) instead of zero. */
+#define CBFS_CONTENT_DEFAULT_VALUE (-1)
+
+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)
{
- FILE *outfile = NULL;
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
+ struct cbfs_header *header;
+ struct cbfs_file *entry;
+ uint32_t cbfs_len;
- // Locate the file start struct
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- // And its length
- uint32_t length = ntohl(thisfile->len);
- // Locate the file name
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
-
- // It's not the file we are looking for..
- if (strcmp(fname, payloadname) != 0)
- {
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
- continue;
- }
+ DEBUG("cbfs_create_image: bootblock=0x%x+0x%zx, "
+ "header=0x%x+0x%zx, entries_offset=0x%x\n",
+ bootblock_offset, bootblock->size,
+ header_offset, sizeof(*header), entries_offset);
- // Else, it's our file.
- printf("Found file %.30s at 0x%x, type %.12s, size %d\n", fname,
- current - phys_start, strfiletype(ntohl(thisfile->type)),
- length);
-
- // If we are not dumping to stdout, open the out file.
- outfile = fopen(outpath, "wb");
- if (!outfile)
- {
- fprintf(stderr, "E: Could not open the file %s for writing.\n", outpath);
- return 1;
- }
+ if (buffer_create(&image->buffer, size, "(new)") != 0) {
+ ERROR("Cannot allocate memory for %zd bytes.\n", size);
+ return -1;
+ }
+ image->header = NULL;
+ memset(image->buffer.data, CBFS_CONTENT_DEFAULT_VALUE, size);
- if (ntohl(thisfile->type) != CBFS_COMPONENT_RAW)
- {
- fprintf(stderr, "W: Only 'raw' files are safe to extract.\n");
- }
+ // Adjust relative offset values (<0) to ROM address (>=0).
+ if (entries_offset < 0)
+ entries_offset += (int32_t)size;
+ if (bootblock_offset < 0)
+ bootblock_offset += (int32_t)size;
+ if (header_offset < 0)
+ header_offset += (int32_t) size;
- fwrite(((char *)thisfile)
- + ntohl(thisfile->offset), length, 1, outfile);
+ DEBUG("cbfs_create_image: (real offset) bootblock=0x%x, "
+ "header=0x%x, entries_offset=0x%x\n",
+ bootblock_offset, header_offset, entries_offset);
- fclose(outfile);
- printf("Successfully dumped the file.\n");
+ if (align == 0)
+ align = 64; // default align size.
- // We'll only dump one file.
- return 0;
+ // Prepare bootblock
+ if (bootblock_offset + bootblock->size > size) {
+ ERROR("Bootblock (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ bootblock_offset, bootblock->size, size);
+ return -1;
+ }
+ memcpy(image->buffer.data + bootblock_offset, bootblock->data,
+ bootblock->size);
+
+ // Prepare header
+ if (header_offset + sizeof(*header) > size) {
+ ERROR("Header (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ header_offset, sizeof(*header), size);
+ return -1;
}
- fprintf(stderr, "E: File %s not found.\n", payloadname);
- return 1;
+ header = (struct cbfs_header*)(image->buffer.data + header_offset);
+ image->header = header;
+ header->magic = htonl(CBFS_HEADER_MAGIC);
+ header->version = htonl(CBFS_HEADER_VERSION);
+ header->romsize = htonl(size);
+ header->bootblocksize = htonl(bootblock->size);
+ header->align = htonl(align);
+ header->offset = htonl(entries_offset);
+ header->architecture = ntohl(CBFS_ARCHITECTURE_ARMV7);
+
+ // Prepare entries
+ if (align_up(entries_offset, align) != entries_offset) {
+ ERROR("Offset (0x%x) must be aligned to 0x%x.\n",
+ entries_offset, align);
+ return -1;
+ }
+ if (entries_offset + sizeof(*entry) > size) {
+ ERROR("Offset (0x%x+0x%zx) exceed ROM size(0x%zx)\n",
+ entries_offset, sizeof(*entry), size);
+ return -1;
+ }
+ entry = (struct cbfs_file*)(image->buffer.data + entries_offset);
+ // To calculate available length, find
+ // e = min(bootblock, header, size) where e > entries_offset.
+ cbfs_len = size;
+ if (bootblock_offset > entries_offset && bootblock_offset < cbfs_len)
+ cbfs_len = bootblock_offset;
+ if (header_offset > entries_offset && header_offset < cbfs_len)
+ cbfs_len = header_offset;
+ cbfs_len -= entries_offset + align;
+ cbfs_create_entry(image, entry, cbfs_len, "");
+ LOG("Created CBFS image (capacity = %d bytes)\n", cbfs_len);
+ return 0;
}
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location)
-{
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
-
- dprintf("at %x, %x bytes\n", current, length);
- /* Is this a free chunk? */
- if ((thisfile->type == CBFS_COMPONENT_DELETED)
- || (thisfile->type == CBFS_COMPONENT_NULL)) {
- dprintf("null||deleted at %x, %x bytes\n", current,
- length);
- /* if this is the right size, and if specified, the right location, use it */
- if ((contentsize <= length)
- && ((location == 0) || (current == location))) {
- if (contentsize < length) {
- dprintf
- ("this chunk is %x bytes, we need %x. create a new chunk at %x with %x bytes\n",
- length, contentsize,
- ALIGN(current + contentsize,
- align),
- length - contentsize);
- uint32_t start =
- ALIGN(current + contentsize, align);
- uint32_t size =
- current + ntohl(thisfile->offset)
- + length - start - 16 -
- sizeof(struct cbfs_file);
- cbfs_create_empty_file(start, size);
- }
- dprintf("copying data\n");
- memcpy(phys_to_virt(current), content,
- contentsize);
- return 0;
- }
- if (location != 0) {
- /* CBFS has the constraint that the chain always moves up in memory. so once
- we're past the place we seek, we don't need to look any further */
- if (current > location) {
- fprintf
- (stderr, "E: The requested space is not available\n");
- return 1;
- }
-
- /* Is the requested location inside the current chunk? */
- if ((current < location)
- && ((location + contentsize) <=
- (current + length))) {
- /* Split it up. In the next iteration the code will be at the right place. */
- dprintf("split up. new length: %x\n",
- location - current -
- ntohl(thisfile->offset));
- thisfile->len =
- htonl(location - current -
- ntohl(thisfile->offset));
- cbfs_create_empty_file(location,
- length -
- (location -
- current));
- }
- }
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename) {
+ if (buffer_from_file(&image->buffer, filename) != 0)
+ return -1;
+ DEBUG("read_cbfs_image: %s (%zd bytes)\n", image->buffer.name,
+ image->buffer.size);
+ image->header = cbfs_find_header(image->buffer.data,
+ image->buffer.size);
+ if (!image->header) {
+ ERROR("%s does not have CBFS master header.\n", filename);
+ cbfs_image_delete(image);
+ return -1;
}
- fprintf(stderr, "E: Could not add the file to CBFS, it's probably too big.\n");
- fprintf(stderr, "E: File size: %d bytes (%d KB).\n", contentsize, contentsize/1024);
- return 1;
+ return 0;
}
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename) {
+ assert(image && image->buffer.data);
+ return buffer_write_file(&image->buffer, filename);
+}
-static struct cbfs_file *merge_adjacent_files(struct cbfs_file *first,
- struct cbfs_file *second)
-{
- uint32_t new_length =
- ntohl(first->len) + ntohl(second->len) + ntohl(second->offset);
- first->len = htonl(new_length);
- first->checksum = 0; // FIXME?
- return first;
+int cbfs_image_delete(struct cbfs_image *image) {
+ buffer_delete(&image->buffer);
+ image->header = NULL;
+ return 0;
}
-static struct cbfs_file *next_file(struct cbfs_file *prev)
-{
- uint32_t pos = (prev == NULL) ? phys_start :
- ALIGN(virt_to_phys(prev) + ntohl(prev->len) + ntohl(prev->offset),
- align);
+static int cbfs_fix_legacy_size(struct cbfs_image *image) {
+ // A bug in old CBFStool may produce extra few bytes (by alignment) and
+ // cause cbfstool to overwrite things after free space -- which is
+ // usually CBFS header on x86. We need to workaround that.
- for (; pos < phys_end; pos += align) {
- if (cbfs_file_header(pos))
- return (struct cbfs_file *)phys_to_virt(pos);
+ struct cbfs_file *entry, *first = NULL, *last = NULL;
+ for (first = entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ last = entry;
}
- return NULL;
+ if ((char*)first < (char*)image->header &&
+ (char*)entry > (char*)image->header) {
+ WARN("CBFS image was created with old cbfstool with size bug. "
+ "Fixing size in last entry...\n");
+ last->len = htonl(ntohl(last->len) -
+ ntohl(image->header->align));
+ DEBUG("Last entry has been changed from 0x%x to 0x%x.\n",
+ cbfs_get_entry_addr(image, entry),
+ cbfs_get_entry_addr(image,
+ cbfs_find_next_entry(image, last)));
+ }
+ return 0;
}
+int cbfs_add_entry(struct cbfs_image *image, const char *name,
+ uint32_t type, struct buffer *buffer) {
+ uint32_t entry_type, entry_capacity;
+ uint32_t addr;
+ struct cbfs_file *entry, *next;
+ uint32_t need_size, new_size;
-int remove_file_from_cbfs(const char *filename)
-{
- struct cbfs_file *prev = NULL;
- struct cbfs_file *cur = next_file(prev);
- struct cbfs_file *next = next_file(cur);
- for (; cur; prev = cur, cur = next, next = next_file(next)) {
-
- /* Check if this is the file to remove. */
- char *name = (char *)cur + sizeof(*cur);
- if (strcmp(name, filename))
- continue;
+ need_size = (sizeof(*entry) + buffer->size +
+ align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN));
+ DEBUG("cbfs_add_entry('%s', %zd) => need_size = %u\n",
+ name, buffer->size, need_size);
+
+ cbfs_fix_legacy_size(image);
- /* Mark the file as free space and erase its name. */
- cur->type = CBFS_COMPONENT_NULL;
- name[0] = '\0';
+ // Merge empty entries.
+ DEBUG("(trying to merge empty entries...)\n");
+ cbfs_walk(image, cbfs_merge_empty_entry, NULL);
- /* Merge it with the previous file if possible. */
- if (prev && prev->type == CBFS_COMPONENT_NULL)
- cur = merge_adjacent_files(prev, cur);
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
- /* Merge it with the next file if possible. */
- if (next && next->type == CBFS_COMPONENT_NULL)
- merge_adjacent_files(cur, next);
+ entry_type = ntohl(entry->type);
+ if (entry_type != CBFS_COMPONENT_DELETED &&
+ entry_type != CBFS_COMPONENT_NULL)
+ continue;
+
+ addr = cbfs_get_entry_addr(image, entry);
+ next = cbfs_find_next_entry(image, entry);
+ entry_capacity = cbfs_get_entry_addr(image, next) - addr;
+ DEBUG("cbfs_add_entry: space %s at 0x%x, %d bytes\n",
+ get_cbfs_entry_type_name(entry_type), addr,
+ entry_capacity);
+ if (entry_capacity < need_size)
+ continue;
+ // TODO check if we want to put blob in particular address
+ // (baseaddress).
+
+ DEBUG("Filling new entry data (%zd bytes).\n", buffer->size);
+ cbfs_create_entry(image, entry, buffer->size, name);
+ entry->type = htonl(type);
+ memcpy(CBFS_SUBHEADER(entry), buffer->data, buffer->size);
+ if (verbose)
+ cbfs_print_entry_info(image, entry, NULL);
+
+ // setup new entry
+ DEBUG("Seting new empty entry.\n");
+ entry = cbfs_find_next_entry(image, entry);
+ new_size = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ new_size -= sizeof(*entry) + CBFS_FILENAME_ALIGN;
+ DEBUG("new size: %d\n", new_size);
+ cbfs_create_entry(image, entry, new_size, "");
+ if (verbose)
+ cbfs_print_entry_info(image, entry, NULL);
return 0;
}
- fprintf(stderr, "E: CBFS file %s not found.\n", filename);
- return 1;
+
+ ERROR("Could not add [%s, %zd bytes (%zd KB)]; probably too big?\n",
+ buffer->name, buffer->size, buffer->size / 1024);
+ return 0;
}
+int cbfs_remove_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry, *next;
+ size_t len;
+ entry = cbfs_get_entry(image, name);
+ if (!entry) {
+ ERROR("CBFS file %s not found.\n", name);
+ return -1;
+ }
+ next = cbfs_find_next_entry(image, entry);
+ assert(next);
+ DEBUG("cbfs_remove_entry: Removed %s @ 0x%x\n",
+ CBFS_NAME(entry), cbfs_get_entry_addr(image, entry));
+ entry->type = htonl(CBFS_COMPONENT_DELETED);
+ len = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ entry->offset = htonl(sizeof(*entry) + CBFS_FILENAME_ALIGN);
+ entry->len = htonl(len - ntohl(entry->offset));
+ memset(CBFS_NAME(entry), 0, CBFS_FILENAME_ALIGN);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE,
+ ntohl(entry->len));
+ return 0;
+}
-/* returns new data block with cbfs_file header, suitable to dump into the ROM. location returns
- the new location that points to the cbfs_file header */
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location)
-{
- uint32_t filename_len = ALIGN(strlen(filename) + 1, 16);
- uint32_t headersize = sizeof(struct cbfs_file) + filename_len;
- if ((location != 0) && (*location != 0)) {
- uint32_t offset = *location % align;
- /* If offset >= (headersize % align), we can stuff the header into the offset.
- Otherwise the header has to be aligned itself, and put before the offset data */
- if (offset >= (headersize % align)) {
- offset -= (headersize % align);
- } else {
- offset += align - (headersize % align);
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ if (strcmp(CBFS_NAME(entry), name) == 0) {
+ DEBUG("cbfs_get_entry: found %s\n", name);
+ return entry;
}
- headersize += offset;
- *location -= headersize;
- }
- void *newdata = malloc(*datasize + headersize);
- if (!newdata) {
- fprintf(stderr, "E: Could not get %d bytes for CBFS file.\n", *datasize +
- headersize);
- exit(1);
}
- memset(newdata, 0xff, *datasize + headersize);
- struct cbfs_file *nextfile = (struct cbfs_file *)newdata;
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(*datasize);
- nextfile->type = htonl(type);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(headersize);
- strcpy(newdata + sizeof(struct cbfs_file), filename);
- memcpy(newdata + headersize, data, *datasize);
- *datasize += headersize;
- return newdata;
-}
-
-int create_cbfs_image(const char *romfile, uint32_t _romsize,
- const char *bootblock, uint32_t align, uint32_t offs)
-{
- uint32_t bootblocksize = 0;
- struct cbfs_header *master_header;
- unsigned char *romarea, *bootblk;
-
- romsize = _romsize;
- romarea = malloc(romsize);
- if (!romarea) {
- fprintf(stderr, "E: Could not get %d bytes of memory"
- " for CBFS image.\n", romsize);
- exit(1);
+ return NULL;
+}
+
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename) {
+ struct cbfs_file *entry = cbfs_get_entry(image, entry_name);
+ struct buffer buffer;
+ if (!entry) {
+ ERROR("File not found: %s\n", entry_name);
+ return -1;
}
- memset(romarea, 0xff, romsize);
+ LOG("Found file %.30s at 0x%x, type %.12s, size %d\n",
+ entry_name, cbfs_get_entry_addr(image, entry),
+ get_cbfs_entry_type_name(ntohl(entry->type)),
+ ntohl(entry->len));
- if (align == 0)
- align = 64;
-
- bootblk = loadfile(bootblock, &bootblocksize,
- romarea + romsize, SEEK_END);
- if (!bootblk) {
- fprintf(stderr, "E: Could not load bootblock %s.\n",
- bootblock);
- free(romarea);
- return 1;
+ if (ntohl(entry->type) != CBFS_COMPONENT_RAW) {
+ WARN("Only 'raw' files are safe to extract.\n");
}
- // TODO(hungte) Replace magic numbers by named constants.
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- /* Set up physical/virtual mapping */
- offset = romarea;
-
- /*
- * The initial jump instruction and bootblock will be placed
- * before and after the master header, respectively. The
- * bootblock image must contain a blank, aligned region large
- * enough for the master header to fit.
- *
- * An anchor string must be left such that when cbfstool is run
- * we can find it and insert the master header at the next
- * aligned boundary.
- */
- loadfile(bootblock, &bootblocksize, romarea + offs, SEEK_SET);
-
- unsigned char *p = romarea + offs;
- while (1) {
- /* FIXME: assumes little endian... */
- if (*(uint32_t *)p == 0xdeadbeef)
- break;
- if (p >= (romarea + _romsize)) {
- fprintf(stderr, "E: Could not determine CBFS "
- "header location.\n", bootblock);
- return 1;
- }
- p += (sizeof(unsigned int));
- }
- unsigned int u = ALIGN((unsigned int)(p - romarea), align);
- master_header = (struct cbfs_header *)(romarea + u);
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(
- ALIGN((0x40 + bootblocksize), align));
- master_header->architecture = htonl(CBFS_ARCHITECTURE_ARMV7);
-
- ((uint32_t *) phys_to_virt(0x4 + offs))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file(
- offs + ALIGN((0x40 + bootblocksize), align),
- romsize - offs - sizeof(struct cbfs_file) -
- ALIGN((bootblocksize + 0x40), align));
- break;
-
- case CBFS_ARCHITECTURE_X86:
- // Set up physical/virtual mapping
- offset = romarea + romsize - 0x100000000ULL;
-
- loadfile(bootblock, &bootblocksize, romarea + romsize,
- SEEK_END);
- master_header = (struct cbfs_header *)(romarea + romsize -
- bootblocksize - sizeof(struct cbfs_header));
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(offs);
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
-
- ((uint32_t *) phys_to_virt(CBFS_HEADPTR_ADDR_X86))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff,
- romsize - offs - bootblocksize -
- sizeof(struct cbfs_header) -
- sizeof(struct cbfs_file) - 16);
- break;
-
- default:
- // Should not happen.
- fprintf(stderr, "E: You found a bug in cbfstool.\n");
- exit(1);
+ buffer.data = CBFS_SUBHEADER(entry);
+ buffer.size = ntohl(entry->len);
+ buffer.name = "(cbfs_export_entry)";
+ if (buffer_write_file(&buffer, filename) != 0) {
+ ERROR("Failed to write %s into %s.\n",
+ entry_name, filename);
+ return -1;
}
+ INFO("Successfully dumped the file to: %s\n", filename);
+ return 0;
+}
+
+/* basename(3) may modify buffer, so we want a tiny alternative. */
+static const char *simple_basename(const char *name) {
+ const char *slash = strrchr(name, '/');
+ if (slash)
+ return slash + 1;
+ else
+ return name;
+}
- writerom(romfile, romarea, romsize);
- free(romarea);
+int cbfs_print_header_info(struct cbfs_image *image) {
+ assert(image && image->header);
+ printf("%s: %zd kB, bootblocksize %d, romsize %d, offset 0x%x\n"
+ "alignment: %d bytes\n\n",
+ simple_basename(image->buffer.name),
+ image->buffer.size / 1024,
+ ntohl(image->header->bootblocksize),
+ ntohl(image->header->romsize),
+ ntohl(image->header->offset),
+ ntohl(image->header->align));
return 0;
}
-static int in_segment(int addr, int size, int gran)
-{
- return ((addr & ~(gran - 1)) == ((addr + size) & ~(gran - 1)));
+static int cbfs_print_stage_info(struct cbfs_stage *stage) {
+ printf(" %s compression, entry: 0x%" PRIx64 ", load: 0x%" PRIx64 ", "
+ "length: %d/%d\n",
+ stage->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
+ stage->entry,
+ stage->load,
+ stage->len,
+ stage->memlen);
+ return 0;
}
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t alignment)
+static int cbfs_print_payload_segment_info(struct cbfs_payload_segment *payload)
{
- void *rom;
- size_t filename_size, headersize, totalsize;
- int ret = 0;
- uint32_t current;
-
- rom = loadrom(romfile);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- romfile);
+ switch(payload->type) {
+ case PAYLOAD_SEGMENT_CODE:
+ case PAYLOAD_SEGMENT_DATA:
+ printf(" %s (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d)\n",
+ (payload->type == PAYLOAD_SEGMENT_CODE ?
+ "code " : "data"),
+ (payload->compression == CBFS_COMPRESS_LZMA ?
+ "LZMA" : "no"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len), ntohl(payload->mem_len));
+ break;
+
+ case PAYLOAD_SEGMENT_ENTRY:
+ printf(" entry (0x%" PRIx64 ")\n",
+ ntohll(payload->load_addr));
+ break;
+
+ case PAYLOAD_SEGMENT_BSS:
+ printf(" BSS (address 0x%016" PRIx64 ", "
+ "length 0x%x)\n",
+ ntohll(payload->load_addr),
+ ntohl(payload->len));
+ break;
+
+ case PAYLOAD_SEGMENT_PARAMS:
+ printf(" parameters\n");
+ break;
+
+ default:
+ printf(" %x (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d\n",
+ payload->type,
+ (payload->compression == CBFS_COMPRESS_LZMA ?
+ "LZMA" : "no"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len),
+ ntohl(payload->mem_len));
+ break;
+ }
+ return 0;
+}
+
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ const char *name = CBFS_NAME(entry);
+ struct cbfs_payload_segment *payload;
+ if (!cbfs_is_valid_entry(entry)) {
+ ERROR("cbfs_print_entry_info: Invalid entry at 0x%x\n",
+ cbfs_get_entry_addr(image, entry));
+ return -1;
+ }
+
+ printf("%-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));
+
+ if (!verbose)
return 0;
+
+ /* note the components of the subheader may be in host order ... */
+ switch (ntohl(entry->type)) {
+ case CBFS_COMPONENT_STAGE:
+ cbfs_print_stage_info((struct cbfs_stage*)
+ CBFS_SUBHEADER(entry));
+ break;
+
+ case CBFS_COMPONENT_PAYLOAD:
+ payload = (struct cbfs_payload_segment*)
+ CBFS_SUBHEADER(entry);
+ while (payload) {
+ cbfs_print_payload_segment_info(payload);
+ if (payload->type == PAYLOAD_SEGMENT_ENTRY)
+ break;
+ else
+ payload ++;
+ }
+ break;
+ default:
+ break;
}
+ return 0;
+}
- filename_size = strlen(filename);
- headersize = sizeof(struct cbfs_file) + ALIGN(filename_size + 1, 16) +
- sizeof(struct cbfs_stage);
- totalsize = headersize + filesize;
+int cbfs_print_directory(struct cbfs_image *image) {
+ cbfs_print_header_info(image);
+ printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
+ cbfs_walk(image, cbfs_print_entry_info, NULL);
+ return 0;
+}
- current = phys_start;
- while (current < phys_end) {
- uint32_t top;
- struct cbfs_file *thisfile;
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ struct cbfs_file *next, *last;
+ uint32_t type;
+ size_t newlen;
+ type = ntohl(entry->type);
+ if (type != CBFS_COMPONENT_NULL && type != CBFS_COMPONENT_DELETED)
+ return 0;
+ next = cbfs_find_next_entry(image, entry);
+ if (!next || !cbfs_is_valid_entry(next))
+ return -1;
+ last = cbfs_find_next_entry(image, next);
+ assert(last);
+ type = ntohl(next->type);
+ if (type != CBFS_COMPONENT_NULL && type != CBFS_COMPONENT_DELETED)
+ return 0;
+
+ // Now, we find two deleted/empty entries; try to merge now.
+ DEBUG("cbfs_join_empty_entry: combine 0x%x+0x%x and 0x%x+0x%x.\n",
+ cbfs_get_entry_addr(image, entry), ntohl(entry->len),
+ cbfs_get_entry_addr(image, next), ntohl(next->len));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ newlen = (cbfs_get_entry_addr(image, last) -
+ cbfs_get_entry_addr(image, entry) - ntohl(entry->offset));
+ entry->len = htonl(newlen);
+ DEBUG("new empty entry: length=0x%zx\n", newlen);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, newlen);
+ // TODO we should try again until no more entries are found...
+ return 0;
+}
+
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback,
+ void *arg) {
+ int count = 0;
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ count ++;
+ if (callback(image, entry, arg) != 0)
+ break;
+ }
+ return count;
+}
- if (!cbfs_file_header(current)) {
- current += align;
+struct cbfs_header *cbfs_find_header(char *data, size_t size) {
+ size_t offset;
+ int found = 0;
+ uint32_t x86sig;
+ struct cbfs_header *header, *result = NULL;
+
+ // Try x86 style (check signature in bottom) header first.
+ x86sig = *(uint32_t*)(data + size - sizeof(uint32_t));
+ offset = (x86sig + (uint32_t)size);
+ DEBUG("x86sig: 0x%x, offset: 0x%zx\n", x86sig, offset);
+ if (offset >= size - sizeof(*header) ||
+ ntohl(((struct cbfs_header*)(data + offset))->magic) !=
+ CBFS_HEADER_MAGIC)
+ offset = 0;
+
+ for (; offset + sizeof(*header) < size; offset++) {
+ header = (struct cbfs_header*)(data + offset);
+ if (ntohl(header->magic) !=(CBFS_HEADER_MAGIC))
+ continue;
+ if (ntohl(header->version) != CBFS_HEADER_VERSION1 &&
+ ntohl(header->version) != CBFS_HEADER_VERSION2) {
+ // Probably not a real CBFS header?
continue;
}
+ found++;
+ result = header;
+ }
+ if (found > 1) {
+ ERROR("multiple (%d) CBFS headers found!\n",
+ found);
+ result = NULL;
+ }
+ return result;
+}
- thisfile = (struct cbfs_file *)phys_to_virt(current);
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image) {
+ assert(image && image->header);
+ return (struct cbfs_file*)(image->buffer.data +
+ ntohl(image->header->offset));
+}
- top = current + ntohl(thisfile->len) + ntohl(thisfile->offset);
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry) {
+ uint32_t addr = cbfs_get_entry_addr(image, entry);
+ int align = ntohl(image->header->align);
+ assert(entry && cbfs_is_valid_entry(entry));
+ addr += ntohl(entry->offset) + ntohl(entry->len);
+ addr = align_up(addr, align);
+ return (struct cbfs_file*)(image->buffer.data + addr);
+}
- if (((ntohl(thisfile->type) == 0x0)
- || (ntohl(thisfile->type) == 0xffffffff))
- && (ntohl(thisfile->len) + ntohl(thisfile->offset) >=
- totalsize)) {
- if (in_segment
- (current + headersize, filesize, alignment)) {
- ret = current + headersize;
- break;
- }
- if ((ALIGN(current, alignment) + filesize < top)
- && (ALIGN(current, alignment) - headersize >
- current)
- && in_segment(ALIGN(current, alignment), filesize,
- alignment)) {
- ret = ALIGN(current, alignment);
- break;
- }
- if ((ALIGN(current, alignment) + alignment + filesize <
- top)
- && (ALIGN(current, alignment) + alignment -
- headersize > current)
- && in_segment(ALIGN(current, alignment) + alignment,
- filesize, alignment)) {
- ret = ALIGN(current, alignment) + alignment;
- break;
- }
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
- }
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry) {
+ assert(image && image->buffer.data && entry);
+ return (int32_t)((char*)entry - image->buffer.data);
+}
- free(rom);
- return ret;
+int cbfs_is_valid_entry(struct cbfs_file *entry) {
+ return (entry &&memcmp(entry->magic, CBFS_FILE_MAGIC,
+ sizeof(entry->magic)) == 0);
+}
+
+int cbfs_init_entry(struct cbfs_file *entry,
+ struct buffer *buffer) {
+ memset(entry, 0, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->len = htonl(buffer->size);
+ entry->offset = htonl(sizeof(*entry) + strlen(buffer->name) + 1);
+ return 0;
+}
+
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name) {
+ memset(entry, CBFS_CONTENT_DEFAULT_VALUE, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ entry->len = htonl(len);
+ entry->checksum = 0; // TODO Build a checksum algorithm.
+ entry->offset = htonl(sizeof(*entry) + align_up(strlen(name) + 1,
+ CBFS_FILENAME_ALIGN));
+ memset(CBFS_NAME(entry), 0, ntohl(entry->offset) - sizeof(*entry));
+ strcpy(CBFS_NAME(entry), name);
+ memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, len);
+ return 0;
}
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index 853e529..fff5596 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -2,6 +2,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,71 +22,170 @@
#define __CBFSTOOL_COMMON_H
#include <stdint.h>
+#include "cbfs.h"
+
+/* Message output */
+extern int verbose;
+#define ERROR(x...) { fprintf(stderr, "ERROR: " x); }
+#define WARN(x...) { fprintf(stderr, "WARN: " 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 ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+/* Endianess */
+#include <arpa/inet.h> // for ntohl, htonl
#include "swab.h"
-#ifndef __APPLE__
-#define ntohl(x) (host_bigendian?(x):swab32(x))
-#define htonl(x) (host_bigendian?(x):swab32(x))
-#endif
-#define ntohll(x) (host_bigendian?(x):swab64(x))
-#define htonll(x) (host_bigendian?(x):swab64(x))
+int is_big_endian(void);
+#define ntohll(x) (is_big_endian() ? (x) : swab64(x))
+#define htonll(x) (is_big_endian() ? (x) : swab64(x))
-extern void *offset;
-extern uint32_t romsize;
-extern int host_bigendian;
-extern uint32_t arch;
+/* Buffer and file I/O */
+struct buffer {
+ char *name;
+ char *data;
+ size_t size;
+};
-const char *arch_to_string(uint32_t a);
-uint32_t string_to_arch(const char *arch_string);
+/* Creates an empty memory buffer with given size.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_create(struct buffer *buffer, size_t size, const char *name);
-static inline void *phys_to_virt(uint32_t addr)
-{
- return offset + addr;
-}
+/* Loads a file into memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_from_file(struct buffer *buffer, const char *filename);
-static inline uint32_t virt_to_phys(void *addr)
-{
- return (unsigned long)(addr - offset) & 0xffffffff;
-}
+/* Writes memory buffer content into file.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_write_file(struct buffer *buffer, const char *filename);
-#define ALIGN(val, by) (((val) + (by)-1)&~((by)-1))
+/* Destroys a memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_delete(struct buffer *buffer);
-size_t getfilesize(const char *filename);
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place);
-void *loadrom(const char *filename);
-int writerom(const char *filename, void *start, uint32_t size);
-int iself(unsigned char *input);
+/* Type and format */
-typedef void (*comp_func_ptr) (char *, int, char *, int *);
-typedef enum { CBFS_COMPRESS_NONE = 0, CBFS_COMPRESS_LZMA = 1 } comp_algo;
+/* Returns 1 if input points to an ELF object, otherwise 0. */
+int is_elf_object(const void *input);
-comp_func_ptr compression_function(comp_algo algo);
+/* Returns CBFS entry type value for given name, or (uint32_t)-1 as unknown. */
+uint32_t get_cbfs_entry_type(const char *name);
+
+/* Gets the name of given CBFS entry type value, or "(unknown)". */
+const char *get_cbfs_entry_type_name(uint32_t type);
+
+/* Prints all known CBFS entry types. */
+void print_all_cbfs_entry_types();
+
+
+/* CBFS image processing */
+
+struct cbfs_image {
+ struct buffer buffer;
+ struct cbfs_header *header;
+};
+
+/* Creates an empty CBFS image by given size, and description to its content
+ * (bootblock, align, header location, starting offset of CBFS entries.
+ * The output image will contain a valid cbfs_header, with one cbfs_file
+ * entry with type CBFS_COMPONENT_NULL, with max available size.
+ * Returns 0 on success, otherwise none-zero. */
+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);
+
+
+/* Loads a CBFS image from file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename);
+
+/* Writes a CBFS image into file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename);
-uint64_t intfiletype(const char *name);
+/* Releases the CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_delete(struct cbfs_image *image);
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo);
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location);
+/* Adds an entry to CBFS image by given name and type.
+ * Returns 0 on success, otherwise non-zero. */
+int cbfs_add_entry(struct cbfs_image *image, const char *name,
+ uint32_t type, struct buffer *buffer);
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location);
+/* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_remove_entry(struct cbfs_image *image, const char *name);
-int create_cbfs_image(const char *romfile, uint32_t romsize,
- const char *bootblock, uint32_t align, uint32_t offs);
+/* Returns a pointer to entry by name, or NULL if name is not found. */
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name);
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location);
-int remove_file_from_cbfs(const char *filename);
-void print_cbfs_directory(const char *filename);
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath);
-int remove_file_from_cbfs(const char *filename);
+/* Exports an entry to external file.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename);
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t align);
+/* Initializes a new entry with size and name in CBFS image.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name);
-void print_supported_filetypes(void);
+/* Callback function used by cbfs_walk.
+ * Returns 0 on success, or non-zero to stop further iteration. */
+typedef int (*cbfs_entry_callback)(struct cbfs_image *image,
+ struct cbfs_file *file,
+ void *arg);
-#define ARRAY_SIZE(a) (int)(sizeof(a) / sizeof((a)[0]))
+/* Iterates through all entries in CBFS image, and invoke with callback.
+ * Stops if callback returns non-zero values.
+ * Returns number of entries invoked. */
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback, void *arg);
+
+/* Primitive CBFS utilities */
+
+/* Returns a pointer to the only valid CBFS header in give buffer, otherwise
+ * NULL (including when multiple headers were found). If there is a X86 ROM
+ * style signature (pointer at 0xfffffffc) found in ROM, it will be selected as
+ * the only header.*/
+struct cbfs_header *cbfs_find_header(char *data, size_t size);
+
+/* Returns the first cbfs_file entry in CBFS image by CBFS header (no matter if
+ * the entry has valid content or not), otherwise NULL. */
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image);
+
+/* Returns next cbfs_file entry (no matter if its content is valid or not), or
+ * NULL on failure. */
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry);
+
+/* Returns ROM address (offset) of entry.
+ * This is different from entry->offset (pointer to content). */
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry);
+
+int cbfs_print_directory(struct cbfs_image *image);
+int cbfs_print_header_info(struct cbfs_image *image);
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+
+/* Returns 1 if entry has valid data (by checking magic number), otherwise 0. */
+int cbfs_is_valid_entry(struct cbfs_file *entry);
+
+/* Utilities */
+
+/* compress.c */
+typedef void (*comp_func_ptr) (char *, int, char *, int *);
+typedef enum {
+ CBFS_COMPRESS_NONE = 0,
+ CBFS_COMPRESS_LZMA
+} comp_algo;
+comp_func_ptr compression_function(comp_algo algo);
+/* cbfs-mkpayload.c */
+int parse_elf_to_payload(char *input, char **output, comp_algo algo);
+int parse_flat_binary_to_payload(char *input, char **output,
+ uint32_t input_size, uint32_t loadaddress,
+ uint32_t entrypoint, comp_algo algo);
+/* cbfs-mkstage.c */
+int parse_elf_to_stage(char *input, char **output, comp_algo algo,
+ uint32_t location);
#endif
1
0
Patch merged into coreboot/master: dfff8a1 AMD boards, ASRock E350M1: Remove whitespace in front of comma in DSDT
by gerritï¼ coreboot.org 26 Jan '13
by gerritï¼ coreboot.org 26 Jan '13
26 Jan '13
the following patch was just integrated into master:
commit dfff8a163164d28f81ee9d057fb49c8ed3204c6a
Author: Paul Menzel <paulepanter(a)users.sourceforge.net>
Date: Sun Jan 20 11:30:14 2013 +0100
AMD boards, ASRock E350M1: Remove whitespace in front of comma in DSDT
commit 585a4006976e903599b7128200a29b5729777818
Author: zbao <fishbaozi(a)gmail.com>
Date: Thu Apr 12 11:27:26 2012 +0800
Leverage the Pstate table created by AGESA.
… introduced unneeded whitespace in front of a comma.
Revert that part of the above commit. In the file for AMD Dinar
tabs and spaces are mixed, but leave that alone for the beginning.
Change-Id: I279cd0cb0be8c79258034733773f2ae1c2207cce
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-on: http://review.coreboot.org/2187
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martin.roth(a)se-eng.com>
Build-Tested: build bot (Jenkins) at Thu Jan 24 13:22:20 2013, giving +1
See http://review.coreboot.org/2187 for details.
-gerrit
1
0
Patch set updated for coreboot: c843585 Improve CBFS tool to support non-x86 platform better.
by Hung-Te Lin 26 Jan '13
by Hung-Te Lin 26 Jan '13
26 Jan '13
Hung-Te Lin (hungte(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2194
-gerrit
commit c843585cec8affebcecb2cceb16a30c8cf647b01
Author: Hung-Te Lin <hungte(a)chromium.org>
Date: Sat Jan 26 02:03:28 2013 +0800
Improve CBFS tool to support non-x86 platform better.
CBFS tool was written with lots of global variables and implemented with
assumptions based on x86 architecture. To support other platforms better, we
should rewrite using logical offset.
Verified to work on ARM (google/snow).
Does not work on x86 yet.
DO NOT SUBMIT. WIP.
Change-Id: I28c737c8f290e51332119188248ac9e28042024c
Signed-off-by: Hung-Te Lin <hungte(a)chromium.org>
---
src/arch/armv7/Makefile.inc | 4 +-
util/cbfstool/cbfs-mkpayload.c | 82 ++-
util/cbfstool/cbfs-mkstage.c | 39 +-
util/cbfstool/cbfs.h | 3 +
util/cbfstool/cbfstool.c | 645 ++++++++++------------
util/cbfstool/common.c | 1195 ++++++++++++++++++----------------------
util/cbfstool/common.h | 196 +++++--
7 files changed, 1060 insertions(+), 1104 deletions(-)
diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc
index 872365c..d32b530 100644
--- a/src/arch/armv7/Makefile.inc
+++ b/src/arch/armv7/Makefile.inc
@@ -46,9 +46,11 @@ prebuild-files = \
$(if $(call extract_nth,4,$(file)),-b $(call extract_nth,4,$(file))) &&)
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
+# TODO(hungte) Change CBFS command to use per-board params.
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
$(CBFSTOOL) $@.tmp create -m armv7 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
- -B $(objcbfs)/bootblock.bin -a 64
+ -B $(objcbfs)/bootblock.bin -a 64 -A 0x0000 -H 0x2040 \
+ -o 0x5000
$(prebuild-files) true
mv $@.tmp $@
else
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index 0d3986e..3c19d55 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -22,24 +22,18 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo)
+int parse_elf_to_payload(char *input, char **output, comp_algo algo)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
Elf32_Shdr *shdr;
char *header;
char *strtab;
- unsigned char *sptr;
+ char *sptr;
int headers;
int segments = 1;
int isize = 0, osize = 0;
@@ -47,21 +41,16 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
struct cbfs_payload_segment *segs;
int i;
- if(!iself(input)){
+ if(!is_elf_object(input)){
fprintf(stderr, "E: The payload file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The payload file has the wrong architecture\n");
- return -1;
- }
-
comp_func_ptr compress = compression_function(algo);
if (!compress)
return -1;
+ DEBUG("start: parse_elf_to_payload\n");
headers = ehdr->e_phnum;
header = (char *)ehdr;
@@ -156,9 +145,9 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
if (phdr[i].p_filesz == 0) {
segs[segments].type = PAYLOAD_SEGMENT_BSS;
segs[segments].load_addr =
- (uint64_t)htonll(phdr[i].p_paddr);
+ htonll(phdr[i].p_paddr);
segs[segments].mem_len =
- (uint32_t)htonl(phdr[i].p_memsz);
+ htonl(phdr[i].p_memsz);
segs[segments].offset = htonl(doffset);
segments++;
@@ -169,8 +158,8 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
segs[segments].type = PAYLOAD_SEGMENT_CODE;
else
segs[segments].type = PAYLOAD_SEGMENT_DATA;
- segs[segments].load_addr = (uint64_t)htonll(phdr[i].p_paddr);
- segs[segments].mem_len = (uint32_t)htonl(phdr[i].p_memsz);
+ segs[segments].load_addr = htonll(phdr[i].p_paddr);
+ segs[segments].mem_len = htonl(phdr[i].p_memsz);
segs[segments].compression = htonl(algo);
segs[segments].offset = htonl(doffset);
@@ -197,7 +186,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
}
segs[segments].type = PAYLOAD_SEGMENT_ENTRY;
- segs[segments++].load_addr = (uint64_t)htonll(ehdr->e_entry);
+ segs[segments++].load_addr = htonll(ehdr->e_entry);
*output = sptr;
@@ -206,3 +195,54 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
err:
return -1;
}
+
+int parse_flat_binary_to_payload(char *input,
+ char **output,
+ uint32_t input_size,
+ uint32_t loadaddress,
+ uint32_t entrypoint,
+ comp_algo algo)
+{
+ comp_func_ptr compress;
+ char *payload;
+ struct cbfs_payload_segment *segs;
+ int doffset, len = 0;
+
+ compress = compression_function(algo);
+ if (!compress)
+ return 1;
+
+ DEBUG("start: parse_flat_binary_to_payload\n");
+ /* FIXME compressed file size might be bigger than original file */
+ payload = calloc((2 * sizeof(*segs)) + input_size, 1);
+ if (payload == NULL) {
+ fprintf(stderr, "E: Could not allocate memory.\n");
+ return 1;
+ }
+
+ segs = (struct cbfs_payload_segment *)payload;
+ doffset = (2 * sizeof(*segs));
+
+ /* Prepare code segment */
+ segs[0].type = PAYLOAD_SEGMENT_CODE;
+ segs[0].load_addr = htonll(loadaddress);
+ segs[0].mem_len = htonl(input_size);
+ segs[0].offset = htonl(doffset);
+
+ compress(input, input_size, (char *)(payload + doffset), &len);
+ segs[0].compression = htonl(algo);
+ segs[0].len = htonl(len);
+
+ if ((unsigned int)len >= input_size) {
+ segs[0].compression = 0;
+ segs[0].len = htonl(input_size);
+ memcpy(payload + doffset, input, input_size);
+ }
+
+ /* prepare entry point segment */
+ segs[1].type = PAYLOAD_SEGMENT_ENTRY;
+ segs[1].load_addr = htonll(entrypoint);
+
+ *output = payload;
+ return doffset + ntohl(segs[0].len);
+}
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index 0541d4b..9e47047 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -23,14 +23,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "elf.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include "common.h"
-#include "cbfs.h"
+#include "elf.h"
static unsigned int idemp(unsigned int x)
{
@@ -48,13 +43,13 @@ static unsigned int swap32(unsigned int x)
unsigned int (*elf32_to_native) (unsigned int) = idemp;
/* returns size of result, or -1 if error */
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location)
+int parse_elf_to_stage(char *input, char **output,
+ comp_algo algo, uint32_t location)
{
Elf32_Phdr *phdr;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
char *header, *buffer;
- unsigned char *out;
+ char *out;
int headers;
int i;
@@ -67,21 +62,16 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
if (!compress)
return -1;
- if (!iself(input)) {
+ DEBUG("start: parse_elf_to_stage(location=0x%x)\n", location);
+ if (!is_elf_object(input)) {
fprintf(stderr, "E: The stage file is not in ELF format!\n");
return -1;
}
- if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) &&
- !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
- fprintf(stderr, "E: The stage file has the wrong architecture\n");
- return -1;
- }
-
if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
elf_bigendian = 1;
}
- if (elf_bigendian != host_bigendian) {
+ if (elf_bigendian != is_big_endian()) {
elf32_to_native = swap32;
}
@@ -125,8 +115,8 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
mem_end = mend;
}
- if (data_start < *location) {
- data_start = *location;
+ if (data_start < location) {
+ data_start = location;
}
if (data_end <= data_start) {
@@ -155,9 +145,9 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
continue;
l_start = elf32_to_native(phdr[i].p_paddr);
- if (l_start < *location) {
- l_offset = *location - l_start;
- l_start = *location;
+ if (l_start < location) {
+ l_offset = location - l_start;
+ l_start = location;
}
memcpy(buffer + (l_start - data_start),
@@ -184,10 +174,7 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
(char *)(out + sizeof(struct cbfs_stage)), (int *)&stage->len);
free(buffer);
-
*output = out;
- if (*location)
- *location -= sizeof(struct cbfs_stage);
- return sizeof(struct cbfs_stage) + stage->len;
+ return sizeof(*stage) + stage->len;
}
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 3dbeefd..35d0670 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -42,6 +42,8 @@ struct cbfs_header {
#define CBFS_ARCHITECTURE_X86 0x00000001
#define CBFS_ARCHITECTURE_ARMV7 0x00000010
+#define CBFS_FILE_MAGIC "LARCHIVE"
+
struct cbfs_file {
uint8_t magic[8];
uint32_t len;
@@ -106,6 +108,7 @@ struct cbfs_payload {
#define CBFS_COMPONENT_NULL 0xFFFFFFFF
int cbfs_file_header(unsigned long physaddr);
+#define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file))
#define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) )
struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size);
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 4202801..6aecfcb 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -26,7 +27,6 @@
#include <unistd.h>
#include <getopt.h>
#include "common.h"
-#include "cbfs.h"
struct command {
const char *name;
@@ -35,23 +35,36 @@ struct command {
};
int verbose = 0;
-static char *cbfs_name = NULL;
-static char *rom_name = NULL;
-static char *rom_filename = NULL;
-static char *rom_bootblock = NULL;
-static uint32_t rom_type = 0;
-static uint32_t rom_baseaddress = 0;
-static uint32_t rom_loadaddress = 0;
-static uint32_t rom_entrypoint = 0;
-static uint32_t rom_size = 0;
-static uint32_t rom_alignment = 0;
-static uint32_t rom_offset = 0;
-static comp_algo rom_algo = CBFS_COMPRESS_NONE;
-
-static int cbfs_add(void)
-{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
+
+struct param {
+ char *cbfs_name;
+ char *rom_name;
+ char *rom_filename;
+ char *rom_bootblock;
+ uint32_t rom_type;
+ uint32_t rom_baseaddress;
+ uint32_t rom_loadaddress;
+ uint32_t rom_bootaddress;
+ uint32_t rom_bootaddress_assigned;
+ uint32_t rom_headeraddress;
+ uint32_t rom_headeradress_assigned;
+ uint32_t rom_entrypoint;
+ uint32_t rom_size;
+ uint32_t rom_alignment;
+ uint32_t rom_offset;
+ comp_algo rom_algo;
+} param;
+
+typedef int (*convert_buffer_t)(struct buffer *buffer);
+
+static int cbfs_add_file(const char *rom_filename,
+ const char *rom_name,
+ uint32_t rom_type,
+ convert_buffer_t convert,
+ const char *cbfs_name) {
+ struct cbfs_image image;
+ struct buffer buffer;
+ int result = 1;
if (!rom_filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
@@ -68,404 +81,331 @@ static int cbfs_add(void)
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
cbfs_name);
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (buffer_from_file(&buffer, rom_filename) != 0) {
+ fprintf(stderr, "E: Could not load file '%s'.\n", rom_filename);
+ cbfs_image_delete(&image);
return 1;
}
- cbfsfile = create_cbfs_file(rom_name, filedata, &filesize,
- rom_type, &rom_baseaddress);
- free(filedata);
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding file '%s' failed.\n", rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
- return 1;
- }
+ do {
+ if (convert && convert(&buffer) != 0) {
+ fprintf(stderr, "E: Failed to parse file '%s'.\n",
+ rom_filename);
+ break;
+ }
+ if (cbfs_add_entry(&image, rom_name, rom_type, 0, &buffer) != 0)
+ break;
+ if (cbfs_image_write_file(&image, cbfs_name) != 0)
+ break;
- free(cbfsfile);
- free(rom);
- return 0;
-}
+ result = 0;
+ } while (0);
-static int cbfs_add_payload(void)
-{
- int32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ return result;
+}
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
+static int cbfs_convert_mkstage(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_stage(buffer->data, &output, param.rom_algo,
+ param.rom_baseaddress);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
+static int cbfs_convert_elf_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result = parse_elf_to_payload(buffer->data, &output,
+ param.rom_algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
- }
+static int cbfs_convert_flat_mkpayload(struct buffer *buffer) {
+ char *name;
+ char *output;
+ int result;
+ result = parse_flat_binary_to_payload(buffer->data, &output,
+ buffer->size,
+ param.rom_loadaddress,
+ param.rom_entrypoint,
+ param.rom_algo);
+ if (result < 0)
+ return -1;
+ name = strdup(buffer->name);
+ buffer_delete(buffer);
+ buffer->name = name;
+ buffer->size = (size_t)result;
+ buffer->data = (char*)output;
+ return 0;
+}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
- return 1;
- }
+static int cbfstool_add(void)
+{
+ // TODO where is rom_baseaddress?
+ return cbfs_add_file(param.rom_filename,
+ param.rom_name,
+ param.rom_type,
+ NULL,
+ param.cbfs_name);
+}
- filesize = parse_elf_to_payload(filedata, &payload, rom_algo);
- if (filesize <= 0) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(rom);
- return 1;
- }
- cbfsfile = create_cbfs_file(rom_name, payload, &filesize,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
+static int cbfstool_add_payload(void)
+{
+ return cbfs_add_file(param.rom_filename,
+ param.rom_name,
+ CBFS_COMPONENT_PAYLOAD,
+ cbfs_convert_elf_mkpayload,
+ param.cbfs_name);
+}
- free(filedata);
- free(payload);
+static int cbfstool_add_stage(void)
+{
+ return cbfs_add_file(param.rom_filename,
+ param.rom_name,
+ CBFS_COMPONENT_STAGE,
+ cbfs_convert_mkstage,
+ param.cbfs_name);
+}
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+static int cbfstool_add_flat_binary(void)
+{
+ if (param.rom_loadaddress == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-l/--load-address.\n");
return 1;
}
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (param.rom_entrypoint == 0) {
+ fprintf(stderr, "E: You need to specify a valid "
+ "-e/--entry-point.\n");
return 1;
}
-
- free(cbfsfile);
- free(rom);
- return 0;
+ return cbfs_add_file(param.rom_filename,
+ param.rom_name,
+ CBFS_COMPONENT_PAYLOAD,
+ cbfs_convert_flat_mkpayload,
+ param.cbfs_name);
}
-static int cbfs_add_stage(void)
+static int cbfstool_remove(void)
{
- uint32_t filesize = 0;
- void *rom, *filedata, *cbfsfile;
- unsigned char *stage;
+ int result = 1;
+ struct cbfs_image image;
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
-
- if (!rom_name) {
+ if (!param.rom_name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
- }
-
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ param.cbfs_name);
return 1;
}
- filesize = parse_elf_to_stage(filedata, &stage, rom_algo, &rom_baseaddress);
-
- cbfsfile = create_cbfs_file(rom_name, stage, &filesize,
- CBFS_COMPONENT_STAGE, &rom_baseaddress);
-
- free(filedata);
- free(stage);
-
- if (add_file_to_cbfs(cbfsfile, filesize, rom_baseaddress)) {
- fprintf(stderr, "E: Adding stage '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
- return 1;
- }
-
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
- return 1;
- }
+ do {
+ if (cbfs_remove_entry(&image, param.rom_name) != 0) {
+ fprintf(stderr, "E: Removing file '%s' failed.\n",
+ param.rom_name);
+ break;
+ }
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0)
+ break;
+ result = 0;
+ } while (0);
- free(cbfsfile);
- free(rom);
- return 0;
+ cbfs_image_delete(&image);
+ return result;
}
-static int cbfs_add_flat_binary(void)
+static int cbfstool_create(void)
{
- uint32_t filesize = 0;
- uint32_t final_size;
- void *rom, *filedata, *cbfsfile;
- unsigned char *payload;
- comp_func_ptr compress;
- struct cbfs_payload_segment *segs;
- int doffset, len = 0;
+ struct cbfs_image image;
+ struct buffer bootblock;
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
-
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
-
- if (rom_loadaddress == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-l/--load-address.\n");
- return 1;
- }
-
- if (rom_entrypoint == 0) {
- fprintf(stderr, "E: You need to specify a valid "
- "-e/--entry-point.\n");
+ if (param.rom_size == 0) {
+ fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
return 1;
}
- compress = compression_function(rom_algo);
- if (!compress)
- return 1;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ if (!param.rom_bootblock) {
+ fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
return 1;
}
- filedata = loadfile(rom_filename, &filesize, 0, SEEK_SET);
- if (filedata == NULL) {
- fprintf(stderr, "E: Could not load file '%s'.\n",
- rom_filename);
- free(rom);
+ if (buffer_from_file(&bootblock, param.rom_bootblock) != 0) {
return 1;
}
- /* FIXME compressed file size might be bigger than original file */
- payload = calloc((2 * sizeof(struct cbfs_payload_segment)) + filesize, 1);
- if (payload == NULL) {
- fprintf(stderr, "E: Could not allocate memory.\n");
- free(filedata);
- free(rom);
- return 1;
+ // Setup default boot address and header address.
+ if (!param.rom_bootaddress_assigned) {
+ // put boot block before end of ROM.
+ param.rom_bootaddress = param.rom_size - bootblock.size;
+ DEBUG("bootblock in end of ROM.\n");
}
-
- segs = (struct cbfs_payload_segment *)payload;
- doffset = (2 * sizeof(struct cbfs_payload_segment));
-
- /* Prepare code segment */
- segs[0].type = PAYLOAD_SEGMENT_CODE;
- segs[0].load_addr = (uint64_t)htonll(rom_loadaddress);
- segs[0].mem_len = (uint32_t)htonl(filesize);
- segs[0].offset = (uint32_t)htonl(doffset);
-
- compress(filedata, filesize, (char *)(payload + doffset), &len);
- segs[0].compression = htonl(rom_algo);
- segs[0].len = htonl(len);
-
- if ((unsigned int)len >= filesize) {
- segs[0].compression = 0;
- segs[0].len = htonl(filesize);
- memcpy((char *)(payload + doffset), filedata, filesize);
+ if (!param.rom_headeradress_assigned) {
+ // Put header before bootblock, and make a reference in end of
+ // bootblock.
+ param.rom_headeraddress = (
+ param.rom_bootaddress -
+ sizeof(struct cbfs_header));
+ if (bootblock.size >= sizeof(uint32_t)) {
+ // TODO this only works for 32b top-aligned system now...
+ uint32_t ptr = param.rom_headeraddress - param.rom_size;
+ uint32_t *sig = (uint32_t*)(bootblock.data +
+ bootblock.size -
+ sizeof(ptr));
+ *sig = ptr;
+ DEBUG("CBFS header address set in end of bootblock.\n");
+ }
}
- /* prepare entry point segment */
- segs[1].type = PAYLOAD_SEGMENT_ENTRY;
- segs[1].load_addr = (uint64_t)htonll(rom_entrypoint);
-
- final_size = doffset + ntohl(segs[0].len);
- cbfsfile =
- create_cbfs_file(rom_name, payload, &final_size,
- CBFS_COMPONENT_PAYLOAD, &rom_baseaddress);
-
- free(filedata);
- free(payload);
-
- if (add_file_to_cbfs(cbfsfile, final_size, rom_baseaddress)) {
- fprintf(stderr, "E: Adding payload '%s' failed.\n",
- rom_filename);
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_create(&image,
+ param.rom_size,
+ param.rom_alignment,
+ &bootblock,
+ param.rom_bootaddress,
+ param.rom_headeraddress,
+ param.rom_offset) != 0) {
+ fprintf(stderr, "E: Failed to create %s.\n", param.cbfs_name);
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
- free(cbfsfile);
- free(rom);
+ if (cbfs_image_write_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to write %s.\n", param.cbfs_name);
return 1;
}
-
- free(cbfsfile);
- free(rom);
+ cbfs_image_delete(&image);
return 0;
+
}
-static int cbfs_remove(void)
+static int cbfstool_locate(void)
{
- void *rom;
+ struct cbfs_image image;
+ struct cbfs_file *entry;
+ struct buffer buffer;
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ if (!param.rom_filename) {
+ fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (remove_file_from_cbfs(rom_name)) {
- fprintf(stderr, "E: Removing file '%s' failed.\n",
- rom_name);
- free(rom);
+ if (!param.rom_name) {
+ fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- if (writerom(cbfs_name, rom, romsize)) {
- free(rom);
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
+ fprintf(stderr, "E: Failed to load %s.\n", param.cbfs_name);
return 1;
}
- free(rom);
- return 0;
-}
-static int cbfs_create(void)
-{
- if (rom_size == 0) {
- fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
+ if (buffer_from_file(&buffer, param.rom_filename) != 0) {
+ fprintf(stderr, "E: Cannot load %s.\n", param.rom_filename);
+ cbfs_image_delete(&image);
return 1;
}
-
- if (!rom_bootblock) {
- fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
+ if (cbfs_get_entry(&image, param.rom_name)) {
+ fprintf(stderr, "E: '%s' already in CBFS.\n", param.rom_name);
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
- if (arch == CBFS_ARCHITECTURE_UNKNOWN) {
- fprintf(stderr, "E: You need to specify -m/--machine arch\n");
+ if (cbfs_add_entry(&image, param.rom_name, CBFS_COMPONENT_RAW,
+ param.rom_alignment, &buffer) != 0) {
+ // Legacy output.
+ printf("0\n");
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
return 1;
}
-
- return create_cbfs_image(cbfs_name, rom_size, rom_bootblock,
- rom_alignment, rom_offset);
-}
-
-static int cbfs_locate(void)
-{
- uint32_t filesize, location;
-
- if (!rom_filename) {
- fprintf(stderr, "E: You need to specify -f/--filename.\n");
- return 1;
- }
-
- if (!rom_name) {
- fprintf(stderr, "E: You need to specify -n/--name.\n");
- return 1;
- }
-
- filesize = getfilesize(rom_filename);
-
- location = cbfs_find_location(cbfs_name, filesize,
- rom_name, rom_alignment);
-
- printf("%x\n", location);
- return location == 0 ? 1 : 0;
+ entry = cbfs_get_entry(&image, param.rom_name);
+ printf("%x\n", (cbfs_get_entry_addr(&image, entry) +
+ ntohl(entry->offset)));
+ buffer_delete(&buffer);
+ cbfs_image_delete(&image);
+ return 0;
}
-static int cbfs_print(void)
+static int cbfstool_print(void)
{
- void *rom;
-
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ struct cbfs_image image;
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
+ param.cbfs_name);
return 1;
}
+ cbfs_print_header_info(&image);
+ printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
+ cbfs_walk(&image, cbfs_print_entry_info, &verbose);
- print_cbfs_directory(cbfs_name);
-
- free(rom);
+ cbfs_image_delete(&image);
return 0;
}
-static int cbfs_extract(void)
+static int cbfstool_extract(void)
{
- void *rom;
- int ret;
+ int result = 0;
+ struct cbfs_image image;
- if (!rom_filename) {
+ if (!param.rom_filename) {
fprintf(stderr, "E: You need to specify -f/--filename.\n");
return 1;
}
- if (!rom_name) {
+ if (!param.rom_name) {
fprintf(stderr, "E: You need to specify -n/--name.\n");
return 1;
}
- rom = loadrom(cbfs_name);
- if (rom == NULL) {
+ if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- cbfs_name);
- return 1;
+ param.cbfs_name);
+ result = 1;
+ } else if (cbfs_export_entry(&image, param.rom_name,
+ param.rom_filename) != 0) {
+ result = 1;
}
- ret = extract_file_from_cbfs(cbfs_name, rom_name, rom_filename);
-
- free(rom);
- return ret;
+ cbfs_image_delete(&image);
+ return result;
}
static const struct command commands[] = {
- {"add", "f:n:t:b:h?", cbfs_add},
- {"add-payload", "f:n:t:c:b:h?", cbfs_add_payload},
- {"add-stage", "f:n:t:c:b:h?", cbfs_add_stage},
- {"add-flat-binary", "f:n:l:e:c:b:h?", cbfs_add_flat_binary},
- {"remove", "n:h?", cbfs_remove},
- {"create", "s:B:a:o:m:h?", cbfs_create},
- {"locate", "f:n:a:h?", cbfs_locate},
- {"print", "h?", cbfs_print},
- {"extract", "n:f:h?", cbfs_extract},
+ {"add", "vf:n:t:b:h?", cbfstool_add},
+ {"add-payload", "vf:n:t:c:b:h?", cbfstool_add_payload},
+ {"add-stage", "vf:n:t:c:b:h?", cbfstool_add_stage},
+ {"add-flat-binary", "vf:n:l:e:c:b:h?", cbfstool_add_flat_binary},
+ {"remove", "vn:h?", cbfstool_remove},
+ {"create", "vs:B:A:H:a:o:m:h?", cbfstool_create},
+ {"locate", "vf:n:a:h?", cbfstool_locate},
+ {"print", "vh?", cbfstool_print},
+ {"extract", "vn:f:h?", cbfstool_extract},
};
static struct option long_options[] = {
@@ -477,6 +417,8 @@ static struct option long_options[] = {
{"entry-point", required_argument, 0, 'e' },
{"size", required_argument, 0, 's' },
{"bootblock", required_argument, 0, 'B' },
+ {"boot-address", required_argument, 0, 'A' },
+ {"header-address",required_argument,0, 'H' },
{"alignment", required_argument, 0, 'a' },
{"offset", required_argument, 0, 'o' },
{"file", required_argument, 0, 'f' },
@@ -491,8 +433,9 @@ static void usage(char *name)
printf
("cbfstool: Management utility for CBFS formatted ROM images\n\n"
"USAGE:\n" " %s [-h]\n"
- " %s FILE COMMAND [PARAMETERS]...\n\n" "OPTIONs:\n"
- " -h Display this help message\n\n"
+ " %s FILE COMMAND [-v] [PARAMETERS]...\n\n" "OPTIONs:\n"
+ " -h Display this help message\n\n"
+ " -v Verbose output\n"
"COMMANDs:\n"
" add -f FILE -n NAME -t TYPE [-b base-address] "
"Add a component\n"
@@ -505,11 +448,12 @@ static void usage(char *name)
"Add a 32bit flat mode binary\n"
" remove -n NAME "
"Remove a component\n"
- " create -s size -B bootblock -m ARCH [-a align] [-o offset] "
+ " create -s size -B bootblock [-A boot-address] \\\n"
+ " [-H header-address] -m ARCH [-a align] [-o offset] "
"Create a ROM file\n"
" locate -f FILE -n NAME -a align "
"Find a place for a file of that size\n"
- " print "
+ " print "
"Show the contents of the ROM\n"
" extract -n NAME -f FILE "
"Extracts a raw payload from ROM\n"
@@ -518,19 +462,7 @@ static void usage(char *name)
" armv7, x86\n"
"TYPEs:\n", name, name
);
- print_supported_filetypes();
-}
-
-/* Small, OS/libc independent runtime check for endianess */
-int host_bigendian = 0;
-
-static void which_endian(void)
-{
- static const uint32_t inttest = 0x12345678;
- uint8_t inttest_lsb = *(uint8_t *)&inttest;
- if (inttest_lsb == 0x12) {
- host_bigendian = 1;
- }
+ print_all_cbfs_entry_types();
}
int main(int argc, char **argv)
@@ -543,9 +475,7 @@ int main(int argc, char **argv)
return 1;
}
- which_endian();
-
- cbfs_name = argv[1];
+ param.cbfs_name = argv[1];
char *cmd = argv[2];
optind += 2;
@@ -572,61 +502,70 @@ int main(int argc, char **argv)
switch(c) {
case 'n':
- rom_name = optarg;
+ param.rom_name = optarg;
break;
case 't':
- if (intfiletype(optarg) != ((uint64_t) - 1))
- rom_type = intfiletype(optarg);
- else
- rom_type = strtoul(optarg, NULL, 0);
- if (rom_type == 0)
+ param.rom_type = get_cbfs_entry_type(optarg);
+ if (param.rom_type == (uint32_t)-1)
+ param.rom_type = strtoul(optarg, NULL,
+ 0);
+ if (param.rom_type == 0)
printf("W: Unknown type '%s' ignored\n",
- optarg);
+ optarg);
break;
case 'c':
if (!strncasecmp(optarg, "lzma", 5))
- rom_algo = CBFS_COMPRESS_LZMA;
+ param.rom_algo = CBFS_COMPRESS_LZMA;
else if (!strncasecmp(optarg, "none", 5))
- rom_algo = CBFS_COMPRESS_NONE;
+ param.rom_algo = CBFS_COMPRESS_NONE;
else
printf("W: Unknown compression '%s'"
- " ignored.\n", optarg);
+ " ignored.\n", optarg);
break;
case 'b':
- rom_baseaddress = strtoul(optarg, NULL, 0);
+ param.rom_baseaddress = strtoul(optarg, NULL, 0);
break;
case 'l':
- rom_loadaddress = strtoul(optarg, NULL, 0);
+ param.rom_loadaddress = strtoul(optarg, NULL, 0);
break;
case 'e':
- rom_entrypoint = strtoul(optarg, NULL, 0);
+ param.rom_entrypoint = strtoul(optarg, NULL, 0);
break;
case 's':
- rom_size = strtoul(optarg, &suffix, 0);
+ param.rom_size = strtoul(optarg, &suffix, 0);
if (tolower(suffix[0])=='k') {
- rom_size *= 1024;
+ param.rom_size *= 1024;
}
if (tolower(suffix[0])=='m') {
- rom_size *= 1024 * 1024;
+ param.rom_size *= 1024 * 1024;
}
case 'B':
- rom_bootblock = optarg;
+ param.rom_bootblock = optarg;
+ break;
+ case 'A':
+ param.rom_bootaddress = strtoul(optarg, NULL, 0);
+ param.rom_bootaddress_assigned = 1;
+ break;
+ case 'H':
+ param.rom_headeraddress = strtoul(
+ optarg, NULL, 0);
+ param.rom_headeradress_assigned = 1;
break;
case 'a':
- rom_alignment = strtoul(optarg, NULL, 0);
+ param.rom_alignment = strtoul(optarg, NULL, 0);
break;
case 'o':
- rom_offset = strtoul(optarg, NULL, 0);
+ param.rom_offset = strtoul(optarg, NULL, 0);
break;
case 'f':
- rom_filename = optarg;
+ param.rom_filename = optarg;
break;
case 'v':
verbose++;
break;
case 'm':
- arch = string_to_arch(optarg);
+ // arch = string_to_arch(optarg);
break;
case 'h':
case '?':
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 97bf168..680e59c 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -4,6 +4,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,215 +20,105 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <assert.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <libgen.h>
+
#include "common.h"
-#include "cbfs.h"
#include "elf.h"
-#define dprintf(x...)
+/* Utilities */
-size_t getfilesize(const char *filename)
+/* Small, OS/libc independent runtime check for endianess */
+int is_big_endian(void)
{
- size_t size;
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return -1;
-
- fseek(file, 0, SEEK_END);
- size = ftell(file);
- fclose(file);
- return size;
-}
-
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place)
-{
- FILE *file = fopen(filename, "rb");
- if (file == NULL)
- return NULL;
-
- fseek(file, 0, SEEK_END);
- *romsize_p = ftell(file);
- fseek(file, 0, SEEK_SET);
- if (!content) {
- content = malloc(*romsize_p);
- if (!content) {
- fprintf(stderr, "E: Could not get %d bytes for file %s\n",
- *romsize_p, filename);
- exit(1);
- }
- } else if (place == SEEK_END)
- content -= *romsize_p;
-
- if (!fread(content, *romsize_p, 1, file)) {
- fprintf(stderr, "E: Failed to read %s\n", filename);
- return NULL;
+ static const uint32_t inttest = 0x12345678;
+ uint8_t inttest_lsb = *(uint8_t *)&inttest;
+ if (inttest_lsb == 0x12) {
+ return 1;
}
- fclose(file);
- return content;
+ return 0;
}
-static struct cbfs_header *master_header;
-static uint32_t phys_start, phys_end, align;
-uint32_t romsize;
-void *offset;
-uint32_t arch = CBFS_ARCHITECTURE_UNKNOWN;
-
-static struct {
- uint32_t arch;
- const char *name;
-} arch_names[] = {
- { CBFS_ARCHITECTURE_ARMV7, "armv7" },
- { CBFS_ARCHITECTURE_X86, "x86" },
- { CBFS_ARCHITECTURE_UNKNOWN, "unknown" }
-};
-
-uint32_t string_to_arch(const char *arch_string)
-{
- int i;
- uint32_t ret = CBFS_ARCHITECTURE_UNKNOWN;
-
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (!strcasecmp(arch_string, arch_names[i].name)) {
- ret = arch_names[i].arch;
- break;
- }
- }
-
- return ret;
+uint32_t align_up(uint32_t value, uint32_t align) {
+ if (value % align)
+ value += align - (value % align);
+ return value;
}
-const char *arch_to_string(uint32_t a)
-{
- int i;
- const char *ret = NULL;
-
- for (i = 0; i < ARRAY_SIZE(arch_names); i++) {
- if (a == arch_names[i].arch) {
- ret = arch_names[i].name;
- break;
- }
- }
-
- return ret;
+/* Buffer and file I/O */
+int buffer_create(struct buffer *buffer, size_t size, const char *name) {
+ buffer->name = strdup(name);
+ buffer->size = size;
+ buffer->data = (char*)malloc(buffer->size);
+ return (buffer->data == NULL);
}
-int find_master_header(void *romarea, size_t size)
-{
- size_t offset;
-
- if (master_header)
- return 0;
-
- for (offset = 0; offset < size - sizeof(struct cbfs_header); offset++) {
- struct cbfs_header *tmp = romarea + offset;
-
- if (tmp->magic == ntohl(CBFS_HEADER_MAGIC)) {
- master_header = tmp;
- break;
- }
+int buffer_from_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "rb");
+ if (!fp) {
+ perror(filename);
+ return -1;
}
-
- return master_header ? 0 : 1;
-}
-
-void recalculate_rom_geometry(void *romarea)
-{
- if (find_master_header(romarea, romsize)) {
- fprintf(stderr, "E: Cannot find master header\n");
- exit(1);
+ fseek(fp, 0, SEEK_END);
+ buffer->size = ftell(fp);
+ buffer->name = strdup(filename);
+ rewind(fp);
+ buffer->data = (char*)malloc(buffer->size);
+ assert(buffer->data);
+ if (fread(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete read: %s\n", filename);
+ fclose(fp);
+ return -1;
}
+ fclose(fp);
+ return 0;
+}
- /* Update old headers */
- if (master_header->version == CBFS_HEADER_VERSION1 &&
- ntohl(master_header->architecture) == CBFS_ARCHITECTURE_UNKNOWN) {
- dprintf("Updating CBFS master header to version 2\n");
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
+int buffer_write_file(struct buffer *buffer, const char *filename) {
+ FILE *fp = fopen(filename, "wb");
+ if (!fp) {
+ perror(filename);
+ return -1;
}
-
- arch = ntohl(master_header->architecture);
-
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- offset = romarea;
- phys_start = (0 + ntohl(master_header->offset)) & 0xffffffff;
- phys_end = romsize & 0xffffffff;
- break;
- case CBFS_ARCHITECTURE_X86:
- offset = romarea + romsize - 0x100000000ULL;
- phys_start = (0 - romsize + ntohl(master_header->offset)) &
- 0xffffffff;
- phys_end = (0 - ntohl(master_header->bootblocksize) -
- sizeof(struct cbfs_header)) & 0xffffffff;
- break;
- default:
- fprintf(stderr, "E: Unknown architecture\n");
- exit(1);
+ assert(buffer && buffer->data);
+ if (fwrite(buffer->data, 1, buffer->size, fp) != buffer->size) {
+ ERROR("incomplete write: %s\n", filename);
+ fclose(fp);
+ return -1;
}
-
- align = ntohl(master_header->align);
-}
-
-void *loadrom(const char *filename)
-{
- void *romarea = loadfile(filename, &romsize, 0, SEEK_SET);
- if (romarea == NULL)
- return NULL;
- recalculate_rom_geometry(romarea);
- return romarea;
+ fclose(fp);
+ return 0;
}
-int writerom(const char *filename, void *start, uint32_t size)
-{
- FILE *file = fopen(filename, "wb");
- if (!file) {
- fprintf(stderr, "Could not open '%s' for writing: ", filename);
- perror("");
- return 1;
+int buffer_delete(struct buffer *buffer) {
+ assert(buffer);
+ if (buffer->name) {
+ free(buffer->name);
+ buffer->name = NULL;
}
-
- if (fwrite(start, size, 1, file) != 1) {
- fprintf(stderr, "Could not write to '%s': ", filename);
- perror("");
- return 1;
+ if (buffer->data) {
+ free(buffer->data);
+ buffer->data = NULL;
}
-
- fclose(file);
+ buffer->size = 0;
return 0;
}
-int cbfs_file_header(unsigned long physaddr)
-{
- /* maybe improve this test */
- return (strncmp(phys_to_virt(physaddr), "LARCHIVE", 8) == 0);
-}
-
-struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size)
-{
- struct cbfs_file *nextfile = (struct cbfs_file *)phys_to_virt(physaddr);
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(size);
- nextfile->type = htonl(0xffffffff);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(sizeof(struct cbfs_file) + 16);
- memset(((void *)nextfile) + sizeof(struct cbfs_file), 0, 16);
- return nextfile;
-}
+/* Type and format */
-int iself(unsigned char *input)
-{
- Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
+int is_elf_object(const void *input) {
+ Elf32_Ehdr *ehdr = (Elf32_Ehdr *)input;
return !memcmp(ehdr->e_ident, ELFMAG, 4);
}
static struct filetypes_t {
uint32_t type;
const char *name;
-} filetypes[] = {
+} cbfs_filetypes[] = {
{CBFS_COMPONENT_STAGE, "stage"},
{CBFS_COMPONENT_PAYLOAD, "payload"},
{CBFS_COMPONENT_OPTIONROM, "optionrom"},
@@ -236,550 +127,544 @@ static struct filetypes_t {
{CBFS_COMPONENT_VSA, "vsa"},
{CBFS_COMPONENT_MBI, "mbi"},
{CBFS_COMPONENT_MICROCODE, "microcode"},
- {CBFS_COMPONENT_CMOS_DEFAULT, "cmos default"},
- {CBFS_COMPONENT_CMOS_LAYOUT, "cmos layout"},
+ {CBFS_COMPONENT_CMOS_DEFAULT, "cmos_default"},
+ {CBFS_COMPONENT_CMOS_LAYOUT, "cmos_layout"},
{CBFS_COMPONENT_DELETED, "deleted"},
{CBFS_COMPONENT_NULL, "null"}
};
-void print_supported_filetypes(void)
-{
- int i, number = ARRAY_SIZE(filetypes);
-
- for (i=0; i<number; i++) {
- printf(" %s%c", filetypes[i].name, (i==(number-1))?'\n':',');
- if ((i%8) == 7)
- printf("\n");
- }
-}
-
-const char *strfiletype(uint32_t number)
-{
+uint32_t get_cbfs_entry_type(const char *name) {
size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (filetypes[i].type == number)
- return filetypes[i].name;
- return "unknown";
+ for (i = 0; i < ARRAY_SIZE(cbfs_filetypes); i++)
+ if (strcmp(cbfs_filetypes[i].name, name) == 0)
+ return cbfs_filetypes[i].type;
+ return -1;
}
-uint64_t intfiletype(const char *name)
-{
+const char * get_cbfs_entry_type_name(uint32_t type) {
size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
- if (strcmp(filetypes[i].name, name) == 0)
- return filetypes[i].type;
- return -1;
+ for (i = 0; i < ARRAY_SIZE(cbfs_filetypes); i++)
+ if (cbfs_filetypes[i].type == type)
+ return cbfs_filetypes[i].name;
+ return "(unknown)";
}
-void print_cbfs_directory(const char *filename)
-{
- printf
- ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n"
- "alignment: %d bytes, architecture: %s\n\n",
- basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize),
- romsize, ntohl(master_header->offset), align, arch_to_string(arch));
- printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
- if (strlen(fname) == 0)
- fname = "(empty)";
-
- printf("%-30s 0x%-8x %-12s %d\n", fname,
- current - phys_start + ntohl(master_header->offset),
- strfiletype(ntohl(thisfile->type)), length);
-
- /* note the components of the subheader are in host order ... */
- switch (ntohl(thisfile->type)) {
- case CBFS_COMPONENT_STAGE:
- {
- struct cbfs_stage *stage = CBFS_SUBHEADER(thisfile);
- dprintf(" %s compression, entry: 0x%llx, load: 0x%llx, length: %d/%d\n",
- stage->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- (unsigned long long)stage->entry,
- (unsigned long long)stage->load,
- stage->len,
- stage->memlen);
- break;
- }
- case CBFS_COMPONENT_PAYLOAD:
- {
- struct cbfs_payload_segment *payload = CBFS_SUBHEADER(thisfile);
- while(payload) {
- switch(payload->type) {
- case PAYLOAD_SEGMENT_CODE:
- case PAYLOAD_SEGMENT_DATA:
- dprintf(" %s (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d)\n",
- payload->type == PAYLOAD_SEGMENT_CODE ? "code " : "data" ,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len), ntohl(payload->mem_len));
- break;
- case PAYLOAD_SEGMENT_ENTRY:
- dprintf(" entry (0x%llx)\n", (unsigned long long)ntohll(payload->load_addr));
- break;
- case PAYLOAD_SEGMENT_BSS:
- dprintf(" BSS (address 0x%016llx, length 0x%x)\n", (unsigned long long)ntohll(payload->load_addr), ntohl(payload->len));
- break;
- case PAYLOAD_SEGMENT_PARAMS:
- dprintf(" parameters\n");
- break;
- default:
- dprintf(" %x (%s compression, offset: 0x%x, load: 0x%llx, length: %d/%d\n",
- payload->type,
- payload->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
- ntohl(payload->offset),
- (unsigned long long)ntohll(payload->load_addr),
- ntohl(payload->len),
- ntohl(payload->mem_len));
- break;
- }
+void print_all_cbfs_entry_types(void) {
+ size_t i, total = ARRAY_SIZE(cbfs_filetypes);
- if(payload->type == PAYLOAD_SEGMENT_ENTRY)
- payload=NULL;
- else
- payload++;
- }
- break;
- }
- default:
- break;
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
+ for (i = 0; i < total; i++) {
+ printf(" %s%c", cbfs_filetypes[i].name,
+ (i + 1 == total) ? '\n' : ',');
+ if ((i + 1) % 8 == 0)
+ printf("\n");
}
}
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath)
+/* CBFS image processing */
+
+/* The file name align is not defined in CBFS spec -- only a preference by
+ * cbfstool. */
+#define CBFS_FILENAME_ALIGN (16)
+
+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)
{
- FILE *outfile = NULL;
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
+ struct cbfs_header *header;
+ struct cbfs_file *entry;
+ uint32_t cbfs_len;
- // Locate the file start struct
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- // And its length
- uint32_t length = ntohl(thisfile->len);
- // Locate the file name
- char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
-
- // It's not the file we are looking for..
- if (strcmp(fname, payloadname) != 0)
- {
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
- continue;
- }
+ DEBUG("cbfs_create_image: bootblock=0x%x+0x%zx, "
+ "header=0x%x+0x%zx, entries_offset=0x%x\n",
+ bootblock_offset, bootblock->size,
+ header_offset, sizeof(*header), entries_offset);
- // Else, it's our file.
- printf("Found file %.30s at 0x%x, type %.12s, size %d\n", fname,
- current - phys_start, strfiletype(ntohl(thisfile->type)),
- length);
-
- // If we are not dumping to stdout, open the out file.
- outfile = fopen(outpath, "wb");
- if (!outfile)
- {
- fprintf(stderr, "E: Could not open the file %s for writing.\n", outpath);
- return 1;
- }
+ if (buffer_create(&image->buffer, size, "(new)") != 0) {
+ ERROR("Cannot allocate memory for %zd bytes.\n", size);
+ return -1;
+ }
+ image->header = NULL;
+ memset(image->buffer.data, -1, size);
- if (ntohl(thisfile->type) != CBFS_COMPONENT_RAW)
- {
- fprintf(stderr, "W: Only 'raw' files are safe to extract.\n");
- }
+ // Adjust relative offset values (<0) to ROM address (>=0).
+ if (entries_offset < 0)
+ entries_offset += (int32_t)size;
+ if (bootblock_offset < 0)
+ bootblock_offset += (int32_t)size;
+ if (header_offset < 0)
+ header_offset += (int32_t) size;
- fwrite(((char *)thisfile)
- + ntohl(thisfile->offset), length, 1, outfile);
+ DEBUG("cbfs_create_image: (real offset) bootblock=0x%x, "
+ "header=0x%x, entries_offset=0x%x\n",
+ bootblock_offset, header_offset, entries_offset);
- fclose(outfile);
- printf("Successfully dumped the file.\n");
+ if (align == 0)
+ align = 64; // default align size.
- // We'll only dump one file.
- return 0;
+ // Prepare bootblock
+ if (bootblock_offset + bootblock->size > size) {
+ ERROR("Bootblock (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ bootblock_offset, bootblock->size, size);
+ return -1;
}
- fprintf(stderr, "E: File %s not found.\n", payloadname);
- return 1;
-}
+ memcpy(image->buffer.data + bootblock_offset, bootblock->data,
+ bootblock->size);
-
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location)
-{
- uint32_t current = phys_start;
- while (current < phys_end) {
- if (!cbfs_file_header(current)) {
- current += align;
- continue;
- }
- struct cbfs_file *thisfile =
- (struct cbfs_file *)phys_to_virt(current);
- uint32_t length = ntohl(thisfile->len);
-
- dprintf("at %x, %x bytes\n", current, length);
- /* Is this a free chunk? */
- if ((thisfile->type == CBFS_COMPONENT_DELETED)
- || (thisfile->type == CBFS_COMPONENT_NULL)) {
- dprintf("null||deleted at %x, %x bytes\n", current,
- length);
- /* if this is the right size, and if specified, the right location, use it */
- if ((contentsize <= length)
- && ((location == 0) || (current == location))) {
- if (contentsize < length) {
- dprintf
- ("this chunk is %x bytes, we need %x. create a new chunk at %x with %x bytes\n",
- length, contentsize,
- ALIGN(current + contentsize,
- align),
- length - contentsize);
- uint32_t start =
- ALIGN(current + contentsize, align);
- uint32_t size =
- current + ntohl(thisfile->offset)
- + length - start - 16 -
- sizeof(struct cbfs_file);
- cbfs_create_empty_file(start, size);
- }
- dprintf("copying data\n");
- memcpy(phys_to_virt(current), content,
- contentsize);
- return 0;
- }
- if (location != 0) {
- /* CBFS has the constraint that the chain always moves up in memory. so once
- we're past the place we seek, we don't need to look any further */
- if (current > location) {
- fprintf
- (stderr, "E: The requested space is not available\n");
- return 1;
- }
-
- /* Is the requested location inside the current chunk? */
- if ((current < location)
- && ((location + contentsize) <=
- (current + length))) {
- /* Split it up. In the next iteration the code will be at the right place. */
- dprintf("split up. new length: %x\n",
- location - current -
- ntohl(thisfile->offset));
- thisfile->len =
- htonl(location - current -
- ntohl(thisfile->offset));
- cbfs_create_empty_file(location,
- length -
- (location -
- current));
- }
- }
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
+ // Prepare header
+ if (header_offset + sizeof(*header) > size) {
+ ERROR("Header (0x%x+0x%zx) exceed ROM size (0x%zx)\n",
+ header_offset, sizeof(*header), size);
+ return -1;
+ }
+ header = (struct cbfs_header*)(image->buffer.data + header_offset);
+ image->header = header;
+ header->magic = htonl(CBFS_HEADER_MAGIC);
+ header->version = htonl(CBFS_HEADER_VERSION);
+ header->romsize = htonl(size);
+ header->bootblocksize = htonl(bootblock->size);
+ header->align = htonl(align);
+ header->offset = htonl(entries_offset);
+ header->architecture = ntohl(CBFS_ARCHITECTURE_ARMV7);
+
+ // Prepare entries
+ if (align_up(entries_offset, align) != entries_offset) {
+ ERROR("Offset (0x%x) must be aligned to 0x%x.\n",
+ entries_offset, align);
+ return -1;
}
- fprintf(stderr, "E: Could not add the file to CBFS, it's probably too big.\n");
- fprintf(stderr, "E: File size: %d bytes (%d KB).\n", contentsize, contentsize/1024);
- return 1;
+ if (entries_offset + sizeof(*entry) > size) {
+ ERROR("Offset (0x%x+0x%zx) exceed ROM size(0x%zx)\n",
+ entries_offset, sizeof(*entry), size);
+ return -1;
+ }
+ entry = (struct cbfs_file*)(image->buffer.data + entries_offset);
+ // To calculate available length, find
+ // e = min(bootblock, header, size) where e > entries_offset.
+ cbfs_len = size;
+ if (bootblock_offset > entries_offset && bootblock_offset < cbfs_len)
+ cbfs_len = bootblock_offset;
+ if (header_offset > entries_offset && header_offset < cbfs_len)
+ cbfs_len = header_offset;
+ cbfs_len -= entries_offset + align;
+ cbfs_create_entry(image, entry, cbfs_len, "");
+ LOG("Created CBFS image (capacity = %d bytes)\n", cbfs_len);
+ return 0;
}
-static struct cbfs_file *merge_adjacent_files(struct cbfs_file *first,
- struct cbfs_file *second)
-{
- uint32_t new_length =
- ntohl(first->len) + ntohl(second->len) + ntohl(second->offset);
- first->len = htonl(new_length);
- first->checksum = 0; // FIXME?
- return first;
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename) {
+ if (buffer_from_file(&image->buffer, filename) != 0)
+ return -1;
+ DEBUG("read_cbfs_image: %s (%zd bytes)\n", image->buffer.name,
+ image->buffer.size);
+ image->header = cbfs_find_header(image->buffer.data,
+ image->buffer.size);
+ if (!image->header) {
+ ERROR("%s does not have CBFS master header.\n", filename);
+ cbfs_image_delete(image);
+ return -1;
+ }
+ return 0;
}
-static struct cbfs_file *next_file(struct cbfs_file *prev)
-{
- uint32_t pos = (prev == NULL) ? phys_start :
- ALIGN(virt_to_phys(prev) + ntohl(prev->len) + ntohl(prev->offset),
- align);
-
- for (; pos < phys_end; pos += align) {
- if (cbfs_file_header(pos))
- return (struct cbfs_file *)phys_to_virt(pos);
- }
- return NULL;
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename) {
+ assert(image && image->buffer.data);
+ return buffer_write_file(&image->buffer, filename);
}
+int cbfs_image_delete(struct cbfs_image *image) {
+ buffer_delete(&image->buffer);
+ image->header = NULL;
+ return 0;
+}
-int remove_file_from_cbfs(const char *filename)
-{
- struct cbfs_file *prev = NULL;
- struct cbfs_file *cur = next_file(prev);
- struct cbfs_file *next = next_file(cur);
- for (; cur; prev = cur, cur = next, next = next_file(next)) {
-
- /* Check if this is the file to remove. */
- char *name = (char *)cur + sizeof(*cur);
- if (strcmp(name, filename))
+int cbfs_add_entry(struct cbfs_image *image, const char *name,
+ uint32_t type, size_t data_align, struct buffer *buffer) {
+ uint32_t entry_type, entry_capacity;
+ uint32_t addr;
+ struct cbfs_file *entry, *next;
+ uint32_t need_size, new_size;
+
+ need_size = (sizeof(*entry) + buffer->size +
+ align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN));
+ DEBUG("cbfs_add_entry('%s', %zd) => need_size = %u\n",
+ name, buffer->size, need_size);
+
+ // Merge empty sections.
+ DEBUG("(trying to merge empty sections...)\n");
+ cbfs_walk(image, cbfs_merge_empty_entry, NULL);
+
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+
+ entry_type = ntohl(entry->type);
+ if (entry_type != CBFS_COMPONENT_DELETED &&
+ entry_type != CBFS_COMPONENT_NULL)
continue;
- /* Mark the file as free space and erase its name. */
- cur->type = CBFS_COMPONENT_NULL;
- name[0] = '\0';
-
- /* Merge it with the previous file if possible. */
- if (prev && prev->type == CBFS_COMPONENT_NULL)
- cur = merge_adjacent_files(prev, cur);
-
- /* Merge it with the next file if possible. */
- if (next && next->type == CBFS_COMPONENT_NULL)
- merge_adjacent_files(cur, next);
+ addr = cbfs_get_entry_addr(image, entry);
+ next = cbfs_find_next_entry(image, entry);
+ entry_capacity = cbfs_get_entry_addr(image, next) - addr;
+ DEBUG("cbfs_add_entry: space %s at 0x%x, %d bytes\n",
+ get_cbfs_entry_type_name(entry_type), addr,
+ entry_capacity);
+ if (entry_capacity < need_size)
+ continue;
+ // TODO check if we want to put blob in particular address
+ // (baseaddress).
+
+ DEBUG("Filling new entry data (%zd bytes).\n", buffer->size);
+ cbfs_create_entry(image, entry, buffer->size, name);
+ entry->type = htonl(type);
+ memcpy(CBFS_SUBHEADER(entry), buffer->data, buffer->size);
+ if (verbose)
+ cbfs_print_entry_info(image, entry, NULL);
+
+ // setup new entry
+ entry = cbfs_find_next_entry(image, entry);
+ new_size = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ new_size -= sizeof(*entry) + CBFS_FILENAME_ALIGN;
+ cbfs_create_entry(image, entry, new_size, "");
+ if (verbose)
+ cbfs_print_entry_info(image, entry, NULL);
return 0;
}
- fprintf(stderr, "E: CBFS file %s not found.\n", filename);
- return 1;
+
+ ERROR("Could not add [%s, %zd bytes (%zd KB)]; probably too big?\n",
+ buffer->name, buffer->size, buffer->size / 1024);
+ return 0;
}
+int cbfs_remove_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry, *next;
+ size_t len;
+ entry = cbfs_get_entry(image, name);
+ if (!entry) {
+ ERROR("CBFS file %s not found.\n", name);
+ return -1;
+ }
+ next = cbfs_find_next_entry(image, entry);
+ assert(next);
+ DEBUG("cbfs_remove_entry: Removed %s @ 0x%x\n",
+ CBFS_NAME(entry), cbfs_get_entry_addr(image, entry));
+ entry->type = htonl(CBFS_COMPONENT_DELETED);
+ len = (cbfs_get_entry_addr(image, next) -
+ cbfs_get_entry_addr(image, entry));
+ entry->offset = htonl(sizeof(*entry) + CBFS_FILENAME_ALIGN);
+ entry->len = htonl(len - ntohl(entry->offset));
+ memset(CBFS_NAME(entry), 0, CBFS_FILENAME_ALIGN);
+ memset(CBFS_SUBHEADER(entry), -1, ntohl(entry->len));
+ return 0;
+}
-/* returns new data block with cbfs_file header, suitable to dump into the ROM. location returns
- the new location that points to the cbfs_file header */
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location)
-{
- uint32_t filename_len = ALIGN(strlen(filename) + 1, 16);
- uint32_t headersize = sizeof(struct cbfs_file) + filename_len;
- if ((location != 0) && (*location != 0)) {
- uint32_t offset = *location % align;
- /* If offset >= (headersize % align), we can stuff the header into the offset.
- Otherwise the header has to be aligned itself, and put before the offset data */
- if (offset >= (headersize % align)) {
- offset -= (headersize % align);
- } else {
- offset += align - (headersize % align);
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name) {
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ if (strcmp(CBFS_NAME(entry), name) == 0) {
+ DEBUG("cbfs_get_entry: found %s\n", name);
+ return entry;
}
- headersize += offset;
- *location -= headersize;
}
- void *newdata = malloc(*datasize + headersize);
- if (!newdata) {
- fprintf(stderr, "E: Could not get %d bytes for CBFS file.\n", *datasize +
- headersize);
- exit(1);
- }
- memset(newdata, 0xff, *datasize + headersize);
- struct cbfs_file *nextfile = (struct cbfs_file *)newdata;
- strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
- nextfile->len = htonl(*datasize);
- nextfile->type = htonl(type);
- nextfile->checksum = 0; // FIXME?
- nextfile->offset = htonl(headersize);
- strcpy(newdata + sizeof(struct cbfs_file), filename);
- memcpy(newdata + headersize, data, *datasize);
- *datasize += headersize;
- return newdata;
-}
-
-int create_cbfs_image(const char *romfile, uint32_t _romsize,
- const char *bootblock, uint32_t align, uint32_t offs)
-{
- uint32_t bootblocksize = 0;
- struct cbfs_header *master_header;
- unsigned char *romarea, *bootblk;
-
- romsize = _romsize;
- romarea = malloc(romsize);
- if (!romarea) {
- fprintf(stderr, "E: Could not get %d bytes of memory"
- " for CBFS image.\n", romsize);
- exit(1);
+ return NULL;
+}
+
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename) {
+ struct cbfs_file *entry = cbfs_get_entry(image, entry_name);
+ struct buffer buffer;
+ if (!entry) {
+ ERROR("File not found: %s\n", entry_name);
+ return -1;
}
- memset(romarea, 0xff, romsize);
+ LOG("Found file %.30s at 0x%x, type %.12s, size %d\n",
+ entry_name, cbfs_get_entry_addr(image, entry),
+ get_cbfs_entry_type_name(ntohl(entry->type)),
+ ntohl(entry->len));
- if (align == 0)
- align = 64;
-
- bootblk = loadfile(bootblock, &bootblocksize,
- romarea + romsize, SEEK_END);
- if (!bootblk) {
- fprintf(stderr, "E: Could not load bootblock %s.\n",
- bootblock);
- free(romarea);
- return 1;
+ if (ntohl(entry->type) != CBFS_COMPONENT_RAW) {
+ WARN("Only 'raw' files are safe to extract.\n");
}
- // TODO(hungte) Replace magic numbers by named constants.
- switch (arch) {
- case CBFS_ARCHITECTURE_ARMV7:
- /* Set up physical/virtual mapping */
- offset = romarea;
-
- /*
- * The initial jump instruction and bootblock will be placed
- * before and after the master header, respectively. The
- * bootblock image must contain a blank, aligned region large
- * enough for the master header to fit.
- *
- * An anchor string must be left such that when cbfstool is run
- * we can find it and insert the master header at the next
- * aligned boundary.
- */
- loadfile(bootblock, &bootblocksize, romarea + offs, SEEK_SET);
-
- unsigned char *p = romarea + offs;
- while (1) {
- /* FIXME: assumes little endian... */
- if (*(uint32_t *)p == 0xdeadbeef)
- break;
- if (p >= (romarea + _romsize)) {
- fprintf(stderr, "E: Could not determine CBFS "
- "header location.\n", bootblock);
- return 1;
- }
- p += (sizeof(unsigned int));
- }
- unsigned int u = ALIGN((unsigned int)(p - romarea), align);
- master_header = (struct cbfs_header *)(romarea + u);
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(
- ALIGN((0x40 + bootblocksize), align));
- master_header->architecture = htonl(CBFS_ARCHITECTURE_ARMV7);
-
- ((uint32_t *) phys_to_virt(0x4 + offs))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file(
- offs + ALIGN((0x40 + bootblocksize), align),
- romsize - offs - sizeof(struct cbfs_file) -
- ALIGN((bootblocksize + 0x40), align));
- break;
-
- case CBFS_ARCHITECTURE_X86:
- // Set up physical/virtual mapping
- offset = romarea + romsize - 0x100000000ULL;
-
- loadfile(bootblock, &bootblocksize, romarea + romsize,
- SEEK_END);
- master_header = (struct cbfs_header *)(romarea + romsize -
- bootblocksize - sizeof(struct cbfs_header));
-
- master_header->magic = ntohl(CBFS_HEADER_MAGIC);
- master_header->version = ntohl(CBFS_HEADER_VERSION);
- master_header->romsize = htonl(romsize);
- master_header->bootblocksize = htonl(bootblocksize);
- master_header->align = htonl(align);
- master_header->offset = htonl(offs);
- master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
-
- ((uint32_t *) phys_to_virt(CBFS_HEADPTR_ADDR_X86))[0] =
- virt_to_phys(master_header);
-
- recalculate_rom_geometry(romarea);
-
- cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff,
- romsize - offs - bootblocksize -
- sizeof(struct cbfs_header) -
- sizeof(struct cbfs_file) - 16);
- break;
-
- default:
- // Should not happen.
- fprintf(stderr, "E: You found a bug in cbfstool.\n");
- exit(1);
+ buffer.data = CBFS_SUBHEADER(entry);
+ buffer.size = ntohl(entry->len);
+ buffer.name = "(cbfs_export_entry)";
+ if (buffer_write_file(&buffer, filename) != 0) {
+ ERROR("Failed to write %s into %s.\n",
+ entry_name, filename);
+ return -1;
}
+ printf("Successfully dumped the file to: %s\n", filename);
+ return 0;
+}
+
+/* basename(3) may modify buffer, so we want a tiny alternative. */
+static const char *simple_basename(const char *name) {
+ const char *slash = strrchr(name, '/');
+ if (slash)
+ return slash + 1;
+ else
+ return name;
+}
- writerom(romfile, romarea, romsize);
- free(romarea);
+int cbfs_print_header_info(struct cbfs_image *image) {
+ assert(image && image->header);
+ printf("%s: %zd kB, bootblocksize %d, romsize %d, offset 0x%x\n"
+ "alignment: %d bytes\n\n",
+ simple_basename(image->buffer.name),
+ image->buffer.size / 1024,
+ ntohl(image->header->bootblocksize),
+ ntohl(image->header->romsize),
+ ntohl(image->header->offset),
+ ntohl(image->header->align));
return 0;
}
-static int in_segment(int addr, int size, int gran)
-{
- return ((addr & ~(gran - 1)) == ((addr + size) & ~(gran - 1)));
+static int cbfs_print_stage_info(struct cbfs_stage *stage) {
+ printf(" %s compression, entry: 0x%" PRIx64 ", load: 0x%" PRIx64 ", "
+ "length: %d/%d\n",
+ stage->compression == CBFS_COMPRESS_LZMA ? "LZMA" : "no",
+ stage->entry,
+ stage->load,
+ stage->len,
+ stage->memlen);
+ return 0;
}
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t alignment)
+static int cbfs_print_payload_segment_info(struct cbfs_payload_segment *payload)
{
- void *rom;
- size_t filename_size, headersize, totalsize;
- int ret = 0;
- uint32_t current;
-
- rom = loadrom(romfile);
- if (rom == NULL) {
- fprintf(stderr, "E: Could not load ROM image '%s'.\n",
- romfile);
+ switch(payload->type) {
+ case PAYLOAD_SEGMENT_CODE:
+ case PAYLOAD_SEGMENT_DATA:
+ printf(" %s (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d)\n",
+ (payload->type == PAYLOAD_SEGMENT_CODE ?
+ "code " : "data"),
+ (payload->compression == CBFS_COMPRESS_LZMA ?
+ "LZMA" : "no"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len), ntohl(payload->mem_len));
+ break;
+
+ case PAYLOAD_SEGMENT_ENTRY:
+ printf(" entry (0x%" PRIx64 ")\n",
+ ntohll(payload->load_addr));
+ break;
+
+ case PAYLOAD_SEGMENT_BSS:
+ printf(" BSS (address 0x%016" PRIx64 ", "
+ "length 0x%x)\n",
+ ntohll(payload->load_addr),
+ ntohl(payload->len));
+ break;
+
+ case PAYLOAD_SEGMENT_PARAMS:
+ printf(" parameters\n");
+ break;
+
+ default:
+ printf(" %x (%s compression, offset: 0x%x, "
+ "load: 0x%" PRIx64 ", length: %d/%d\n",
+ payload->type,
+ (payload->compression == CBFS_COMPRESS_LZMA ?
+ "LZMA" : "no"),
+ ntohl(payload->offset),
+ ntohll(payload->load_addr),
+ ntohl(payload->len),
+ ntohl(payload->mem_len));
+ break;
+ }
+ return 0;
+}
+
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ const char *name = CBFS_NAME(entry);
+ struct cbfs_payload_segment *payload;
+ int *verbose = (int*)arg;
+ if (!cbfs_is_valid_entry(entry)) {
+ ERROR("cbfs_print_entry_info: Invalid entry at 0x%x\n",
+ cbfs_get_entry_addr(image, entry));
+ return -1;
+ }
+
+ printf("%-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));
+
+ if (!(verbose && *verbose))
return 0;
+
+ /* note the components of the subheader may be in host order ... */
+ switch (ntohl(entry->type)) {
+ case CBFS_COMPONENT_STAGE:
+ cbfs_print_stage_info((struct cbfs_stage*)
+ CBFS_SUBHEADER(entry));
+ break;
+
+ case CBFS_COMPONENT_PAYLOAD:
+ payload = (struct cbfs_payload_segment*)
+ CBFS_SUBHEADER(entry);
+ while (payload) {
+ cbfs_print_payload_segment_info(payload);
+ if (payload->type == PAYLOAD_SEGMENT_ENTRY)
+ break;
+ else
+ payload ++;
+ }
+ break;
+ default:
+ break;
}
+ return 0;
+}
- filename_size = strlen(filename);
- headersize = sizeof(struct cbfs_file) + ALIGN(filename_size + 1, 16) +
- sizeof(struct cbfs_stage);
- totalsize = headersize + filesize;
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg) {
+ struct cbfs_file *next, *last;
+ uint32_t type;
+ size_t newlen;
+ type = ntohl(entry->type);
+ if (type != CBFS_COMPONENT_NULL && type != CBFS_COMPONENT_DELETED)
+ return 0;
+ next = cbfs_find_next_entry(image, entry);
+ if (!next || !cbfs_is_valid_entry(next))
+ return -1;
+ last = cbfs_find_next_entry(image, next);
+ assert(last);
+ type = ntohl(next->type);
+ if (type != CBFS_COMPONENT_NULL && type != CBFS_COMPONENT_DELETED)
+ return 0;
+
+ // Now, we find two deleted/empty sections; try to merge now.
+ DEBUG("cbfs_join_empty_entry: combine 0x%x+0x%x and 0x%x+0x%x.\n",
+ cbfs_get_entry_addr(image, entry), ntohl(entry->len),
+ cbfs_get_entry_addr(image, next), ntohl(next->len));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ newlen = (cbfs_get_entry_addr(image, last) -
+ cbfs_get_entry_addr(image, entry) - ntohl(entry->offset));
+ entry->len = htonl(newlen);
+ DEBUG("new empty entry: length=0x%zx\n", newlen);
+ // TODO clear name
+ memset(CBFS_SUBHEADER(entry), -1, newlen);
+ // TODO we should try again until no more sections are found...
+ return 0;
+}
- current = phys_start;
- while (current < phys_end) {
- uint32_t top;
- struct cbfs_file *thisfile;
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback,
+ void *arg) {
+ int count = 0;
+ struct cbfs_file *entry;
+ for (entry = cbfs_find_first_entry(image);
+ entry && cbfs_is_valid_entry(entry);
+ entry = cbfs_find_next_entry(image, entry)) {
+ count ++;
+ if (callback(image, entry, arg) != 0)
+ break;
+ }
+ return count;
+}
- if (!cbfs_file_header(current)) {
- current += align;
+struct cbfs_header *cbfs_find_header(char *data, size_t size) {
+ size_t offset;
+ int found = 0;
+ uint32_t x86sig;
+ struct cbfs_header *header, *result = NULL;
+
+ // Try x86 style (check signature in bottom) header first.
+ x86sig = *(uint32_t*)(data + size - sizeof(uint32_t));
+ offset = (x86sig + (uint32_t)size);
+ DEBUG("x86sig: 0x%x, offset: 0x%zx\n", x86sig, offset);
+ if (offset >= size - sizeof(*header) ||
+ ntohl(((struct cbfs_header*)(data + offset))->magic) !=
+ CBFS_HEADER_MAGIC)
+ offset = 0;
+
+ for (; offset + sizeof(*header) < size; offset++) {
+ header = (struct cbfs_header*)(data + offset);
+ if (ntohl(header->magic) !=(CBFS_HEADER_MAGIC))
+ continue;
+ if (ntohl(header->version) != CBFS_HEADER_VERSION1 &&
+ ntohl(header->version) != CBFS_HEADER_VERSION2) {
+ // Probably not a real CBFS header?
continue;
}
+ found++;
+ result = header;
+ }
+ if (found > 1) {
+ ERROR("multiple (%d) CBFS headers found!\n",
+ found);
+ result = NULL;
+ }
+ return result;
+}
- thisfile = (struct cbfs_file *)phys_to_virt(current);
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image) {
+ assert(image && image->header);
+ return (struct cbfs_file*)(image->buffer.data +
+ ntohl(image->header->offset));
+}
- top = current + ntohl(thisfile->len) + ntohl(thisfile->offset);
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry) {
+ uint32_t addr = cbfs_get_entry_addr(image, entry);
+ int align = ntohl(image->header->align);
+ assert(entry && cbfs_is_valid_entry(entry));
+ addr += ntohl(entry->offset) + ntohl(entry->len);
+ addr = align_up(addr, align);
+ return (struct cbfs_file*)(image->buffer.data + addr);
+}
- if (((ntohl(thisfile->type) == 0x0)
- || (ntohl(thisfile->type) == 0xffffffff))
- && (ntohl(thisfile->len) + ntohl(thisfile->offset) >=
- totalsize)) {
- if (in_segment
- (current + headersize, filesize, alignment)) {
- ret = current + headersize;
- break;
- }
- if ((ALIGN(current, alignment) + filesize < top)
- && (ALIGN(current, alignment) - headersize >
- current)
- && in_segment(ALIGN(current, alignment), filesize,
- alignment)) {
- ret = ALIGN(current, alignment);
- break;
- }
- if ((ALIGN(current, alignment) + alignment + filesize <
- top)
- && (ALIGN(current, alignment) + alignment -
- headersize > current)
- && in_segment(ALIGN(current, alignment) + alignment,
- filesize, alignment)) {
- ret = ALIGN(current, alignment) + alignment;
- break;
- }
- }
- current =
- ALIGN(current + ntohl(thisfile->len) +
- ntohl(thisfile->offset), align);
- }
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry) {
+ assert(image && image->buffer.data && entry);
+ return (int32_t)((char*)entry - image->buffer.data);
+}
+
+int cbfs_is_valid_entry(struct cbfs_file *entry) {
+ return (entry &&memcmp(entry->magic, CBFS_FILE_MAGIC,
+ sizeof(entry->magic)) == 0);
+}
+
+int cbfs_init_entry(struct cbfs_file *entry,
+ struct buffer *buffer) {
+ memset(entry, 0, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->len = htonl(buffer->size);
+ entry->offset = htonl(sizeof(*entry) + strlen(buffer->name) + 1);
+ return 0;
+}
- free(rom);
- return ret;
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name) {
+ memset(entry, -1, sizeof(*entry));
+ memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic));
+ entry->type = htonl(CBFS_COMPONENT_NULL);
+ entry->len = htonl(len);
+ entry->checksum = 0; // TODO Build a checksum algorithm.
+ entry->offset = htonl(sizeof(*entry) + align_up(strlen(name) + 1,
+ CBFS_FILENAME_ALIGN));
+ memset(CBFS_NAME(entry), 0, ntohl(entry->offset) - sizeof(*entry));
+ strcpy(CBFS_NAME(entry), name);
+ memset(CBFS_SUBHEADER(entry), -1, len);
+ return 0;
+}
+
+#if 0
+
+static int in_segment(int addr, int size, int gran)
+{
+ return ((addr & ~(gran - 1)) == ((addr + size) & ~(gran - 1)));
}
+#endif
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index 853e529..918def6 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -2,6 +2,7 @@
* Copyright (C) 2009 coresystems GmbH
* written by Patrick Georgi <patrick.georgi(a)coresystems.de>
* Copyright (C) 2012 Google, Inc.
+ * Copyright (C) 2013 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,71 +22,170 @@
#define __CBFSTOOL_COMMON_H
#include <stdint.h>
+#include "cbfs.h"
+
+/* Message output */
+extern int verbose;
+#define DEBUG(x...) { if (verbose > 1) fprintf(stderr, "DEBUG: " x); }
+#define ERROR(x...) { fprintf(stderr, "ERROR: " x); }
+#define WARN(x...) { fprintf(stderr, "WARN: " x); }
+#define LOG(x...) { if (verbose > 0) printf(x); }
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+/* Endianess */
+#include <arpa/inet.h> // for ntohl, htonl
#include "swab.h"
-#ifndef __APPLE__
-#define ntohl(x) (host_bigendian?(x):swab32(x))
-#define htonl(x) (host_bigendian?(x):swab32(x))
-#endif
-#define ntohll(x) (host_bigendian?(x):swab64(x))
-#define htonll(x) (host_bigendian?(x):swab64(x))
+int is_big_endian(void);
+#define ntohll(x) (is_big_endian() ? (x) : swab64(x))
+#define htonll(x) (is_big_endian() ? (x) : swab64(x))
-extern void *offset;
-extern uint32_t romsize;
-extern int host_bigendian;
-extern uint32_t arch;
+/* Buffer and file I/O */
+struct buffer {
+ char *name;
+ char *data;
+ size_t size;
+};
-const char *arch_to_string(uint32_t a);
-uint32_t string_to_arch(const char *arch_string);
+/* Creates an empty memory buffer with given size.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_create(struct buffer *buffer, size_t size, const char *name);
-static inline void *phys_to_virt(uint32_t addr)
-{
- return offset + addr;
-}
+/* Loads a file into memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_from_file(struct buffer *buffer, const char *filename);
-static inline uint32_t virt_to_phys(void *addr)
-{
- return (unsigned long)(addr - offset) & 0xffffffff;
-}
+/* Writes memory buffer content into file.
+ * Returns 0 on success, otherwise non-zero. */
+int buffer_write_file(struct buffer *buffer, const char *filename);
-#define ALIGN(val, by) (((val) + (by)-1)&~((by)-1))
+/* Destroys a memory buffer. Returns 0 on success, otherwise non-zero. */
+int buffer_delete(struct buffer *buffer);
-size_t getfilesize(const char *filename);
-void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
- int place);
-void *loadrom(const char *filename);
-int writerom(const char *filename, void *start, uint32_t size);
-int iself(unsigned char *input);
+/* Type and format */
-typedef void (*comp_func_ptr) (char *, int, char *, int *);
-typedef enum { CBFS_COMPRESS_NONE = 0, CBFS_COMPRESS_LZMA = 1 } comp_algo;
+/* Returns 1 if input points to an ELF object, otherwise 0. */
+int is_elf_object(const void *input);
-comp_func_ptr compression_function(comp_algo algo);
+/* Returns CBFS entry type value for given name, or (uint32_t)-1 as unknown. */
+uint32_t get_cbfs_entry_type(const char *name);
+
+/* Gets the name of given CBFS entry type value, or "(unknown)". */
+const char *get_cbfs_entry_type_name(uint32_t type);
+
+/* Prints all known CBFS entry types. */
+void print_all_cbfs_entry_types();
+
+
+/* CBFS image processing */
+
+struct cbfs_image {
+ struct buffer buffer;
+ struct cbfs_header *header;
+};
+
+/* Creates an empty CBFS image by given size, and description to its content
+ * (bootblock, align, header location, starting offset of CBFS entries.
+ * The output image will contain a valid cbfs_header, with one cbfs_file
+ * entry with type CBFS_COMPONENT_NULL, with max available size.
+ * Returns 0 on success, otherwise none-zero. */
+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);
+
+
+/* Loads a CBFS image from file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_from_file(struct cbfs_image *image, const char *filename);
-uint64_t intfiletype(const char *name);
+/* Writes a CBFS image into file. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_write_file(struct cbfs_image *image, const char *filename);
-int parse_elf_to_payload(unsigned char *input, unsigned char **output,
- comp_algo algo);
-int parse_elf_to_stage(unsigned char *input, unsigned char **output,
- comp_algo algo, uint32_t * location);
+/* Releases the CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_image_delete(struct cbfs_image *image);
-void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
- uint32_t type, uint32_t * location);
+/* Adds an entry to CBFS image by given name and type.
+ * If data_align is specified, entry data (CBFS_SUBHEADER(entry)) must be
+ * aligned (usually for eXecute-In-Place).
+ * Returns 0 on success, otherwise non-zero. */
+int cbfs_add_entry(struct cbfs_image *image, const char *name,
+ uint32_t type, size_t data_align, struct buffer *buffer);
-int create_cbfs_image(const char *romfile, uint32_t romsize,
- const char *bootblock, uint32_t align, uint32_t offs);
+/* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */
+int cbfs_remove_entry(struct cbfs_image *image, const char *name);
-int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location);
-int remove_file_from_cbfs(const char *filename);
-void print_cbfs_directory(const char *filename);
-int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath);
-int remove_file_from_cbfs(const char *filename);
+/* Returns a pointer to entry by name, or NULL if name is not found. */
+struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name);
-uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
- const char *filename, uint32_t align);
+/* Exports an entry to external file.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
+ const char *filename);
-void print_supported_filetypes(void);
+/* Initializes a new entry with size and name in CBFS image.
+ * Returns 0 on success, otherwise (ex, not found) non-zero. */
+int cbfs_create_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ size_t len, const char *name);
-#define ARRAY_SIZE(a) (int)(sizeof(a) / sizeof((a)[0]))
+/* Callback function used by cbfs_walk.
+ * Returns 0 on success, or non-zero to stop further iteration. */
+typedef int (*cbfs_entry_callback)(struct cbfs_image *image,
+ struct cbfs_file *file,
+ void *arg);
+
+/* Iterates through all entries in CBFS image, and invoke with callback.
+ * Stops if callback returns non-zero values.
+ * Returns number of entries invoked. */
+int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback, void *arg);
+
+/* Primitive CBFS utilities */
+
+/* Returns a pointer to the only valid CBFS header in give buffer, otherwise
+ * NULL (including when multiple headers were found). If there is a X86 ROM
+ * style signature (pointer at 0xfffffffc) found in ROM, it will be selected as
+ * the only header.*/
+struct cbfs_header *cbfs_find_header(char *data, size_t size);
+
+/* Returns the first cbfs_file entry in CBFS image by CBFS header (no matter if
+ * the entry has valid content or not), otherwise NULL. */
+struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image);
+
+/* Returns next cbfs_file entry (no matter if its content is valid or not), or
+ * NULL on failure. */
+struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image,
+ struct cbfs_file *entry);
+
+/* Returns ROM address (offset) of entry.
+ * This is different from entry->offset (pointer to content). */
+uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry);
+
+int cbfs_print_header_info(struct cbfs_image *image);
+int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
+ void *arg);
+
+/* Returns 1 if entry has valid data (by checking magic number), otherwise 0. */
+int cbfs_is_valid_entry(struct cbfs_file *entry);
+
+/* Utilities */
+
+/* compress.c */
+typedef void (*comp_func_ptr) (char *, int, char *, int *);
+typedef enum {
+ CBFS_COMPRESS_NONE = 0,
+ CBFS_COMPRESS_LZMA
+} comp_algo;
+comp_func_ptr compression_function(comp_algo algo);
+/* cbfs-mkpayload.c */
+int parse_elf_to_payload(char *input, char **output, comp_algo algo);
+int parse_flat_binary_to_payload(char *input, char **output,
+ uint32_t input_size, uint32_t loadaddress,
+ uint32_t entrypoint, comp_algo algo);
+/* cbfs-mkstage.c */
+int parse_elf_to_stage(char *input, char **output, comp_algo algo,
+ uint32_t location);
#endif
1
0