sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfstool: Use cbfs_image API for "create" command.

Browse Source 
Usage Changes: To support platforms with different memory layout, "create" takes
two extra optional parameters:

    "-b": base address (or offset) for bootblock. When omitted, put bootblock in
          end of ROM (x86  style).
    "-H": header offset. When omitted, put header right before bootblock,
          and update a top-aligned virtual address reference in end of ROM.

  Example: (can be found in ARM MAkefile):
    cbfstool coreboot.rom create -m armv7 -s 4096K -B bootblock.bin \
             -a 64 -b 0x0000 -H 0x2040 -o 0x5000

Verified to boot on ARM (Snow) and X86 (QEMU).

Change-Id: Ida2a9e32f9a459787b577db5e6581550d9d7017b
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: http://review.coreboot.org/2214
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Hung-Te Lin
2013-01-29 09:45:12 +08:00
committed by Stefan Reinauer
parent 215d1d7c9b
commit f56c73f1e1
4 changed files with 171 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
util/cbfstool/cbfstool.c
View File

@@ -43,7 +43,10 @@ static struct param {
char *bootblock;
uint32_t type;
uint32_t baseaddress;
uint32_t baseaddress_assigned;
uint32_t loadaddress;
uint32_t headeroffset;
uint32_t headeroffset_assigned;
uint32_t entrypoint;
uint32_t size;
uint32_t alignment;
@@ -343,23 +346,72 @@ static int cbfs_remove(void)
static int cbfs_create(void)
{
struct cbfs_image image;
struct buffer bootblock;
if (param.size == 0) {
ERROR("You need to specify a valid -s/--size.\n");
return 1;
}
if (!param.bootblock) {
ERROR("You need to specify -b/--bootblock.\n");
ERROR("You need to specify -B/--bootblock.\n");
return 1;
}
// TODO Remove arch or pack into param.
if (arch == CBFS_ARCHITECTURE_UNKNOWN) {
ERROR("You need to specify -m/--machine arch\n");
return 1;
}
return create_cbfs_image(param.cbfs_name, param.size, param.bootblock,
param.alignment, param.offset);
if (buffer_from_file(&bootblock, param.bootblock) != 0) {
return 1;
}
// Setup default boot offset and header offset.
if (!param.baseaddress_assigned) {
// put boot block before end of ROM.
param.baseaddress = param.size - bootblock.size;
DEBUG("bootblock in end of ROM.\n");
}
if (!param.headeroffset_assigned) {
// Put header before bootblock, and make a reference in end of
// bootblock.
param.headeroffset = (
param.baseaddress -
sizeof(struct cbfs_header));
if (bootblock.size >= sizeof(uint32_t)) {
// TODO this only works for 32b top-aligned system now...
uint32_t ptr = param.headeroffset - param.size;
uint32_t *sig = (uint32_t *)(bootblock.data +
bootblock.size -
sizeof(ptr));
*sig = ptr;
DEBUG("CBFS header reference in end of bootblock.\n");
}
}
if (cbfs_image_create(&image,
arch,
param.size,
param.alignment,
&bootblock,
param.baseaddress,
param.headeroffset,
param.offset) != 0) {
ERROR("Failed to create %s.\n", param.cbfs_name);
return 1;
}
buffer_delete(&bootblock);
if (cbfs_image_write_file(&image, param.cbfs_name) != 0) {
ERROR("Failed to write %s.\n", param.cbfs_name);
cbfs_image_delete(&image);
return 1;
}
cbfs_image_delete(&image);
return 0;
}
static int cbfs_locate(void)
@@ -458,7 +510,7 @@ static const struct command commands[] = {
{"add-stage", "f:n:t:c:b:vh?", cbfs_add_stage},
{"add-flat-binary", "f:n:l:e:c:b:vh?", cbfs_add_flat_binary},
{"remove", "n:vh?", cbfs_remove},
{"create", "s:B:a:o:m:vh?", cbfs_create},
{"create", "s:B:b:H:a:o:m:vh?", cbfs_create},
{"locate", "f:n:a:Tvh?", cbfs_locate},
{"print", "vh?", cbfs_print},
{"extract", "n:f:vh?", cbfs_extract},
@@ -579,6 +631,10 @@ int main(int argc, char **argv)
break;
case 'b':
param.baseaddress = strtoul(optarg, NULL, 0);
// baseaddress may be zero on non-x86, so we
// need an explicit "baseaddress_assigned".
param.baseaddress = strtoul(optarg, NULL, 0);
param.baseaddress_assigned = 1;
break;
case 'l':
param.loadaddress = strtoul(optarg, NULL, 0);
@@ -598,6 +654,11 @@ int main(int argc, char **argv)
case 'B':
param.bootblock = optarg;
break;
case 'H':
param.headeroffset = strtoul(
optarg, NULL, 0);
param.headeroffset_assigned = 1;
break;
case 'a':
param.alignment = strtoul(optarg, NULL, 0);
break;