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

cbfstool: fix alignment to 64 byte 

It's not like we _ever_ changed it, so drop the option and make cbfstool
use the default. always.

Change-Id: Ia1b99fda03d5852137a362422e979f4a4dffc5ed
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10918
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Patrick Georgi 2015-07-14 22:18:23 +02:00 committed by Patrick Georgi
parent ff9afb3d8e
commit 45acb34ffc
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc
View File

@ -573,7 +573,7 @@ prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(FMAPTOOL) $(CBFSTOOL) $$(cpu_ucode_cbfs_file)
$(CBFSTOOL) $@.tmp create \
-B $(objcbfs)/bootblock.bin -a 64 \
-B $(objcbfs)/bootblock.bin \
$(CBFSTOOL_PRE1_OPTS)
$(prebuild-files) true
$(call add-cpu-microcode-to-cbfs,$@.tmp)

4
util/cbfstool/cbfs.h
View File

@ -47,12 +47,14 @@
#define CBFS_HEADER_VERSION2 0x31313132
#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION2
#define CBFS_ALIGNMENT 64
struct cbfs_header {
uint32_t magic;
uint32_t version;
uint32_t romsize;
uint32_t bootblocksize;
uint32_t align;
uint32_t align; /* hard coded to 64 byte */
uint32_t offset;
uint32_t architecture; /* Version 2 */
uint32_t pad[1];

11
util/cbfstool/cbfstool.c
View File

@ -372,9 +372,8 @@ static int cbfs_create(void)
param.baseaddress_assigned ||
param.headeroffset_assigned ||
param.cbfsoffset_assigned ||
param.alignment ||
param.bootblock) {
ERROR("Since -M was provided, -m, -s, -b, -o, -H, -a, and -B should be omitted\n");
ERROR("Since -M was provided, -m, -s, -b, -o, -H, and -B should be omitted\n");
return 1;
}
@ -395,7 +394,7 @@ static int cbfs_create(void)
}
if (!param.alignment)
param.alignment = 64; // default CBFS entry alignment
param.alignment = CBFS_ALIGNMENT;
// Set default offsets. x86, as usual, needs to be a special snowflake.
if (!param.baseaddress_assigned) {
@ -430,7 +429,7 @@ static int cbfs_create(void)
} else {
param.cbfsoffset = align_up(param.headeroffset +
sizeof(struct cbfs_header),
param.alignment);
CBFS_ALIGNMENT);
DEBUG("CBFS entries start beind master header (%#x).\n",
param.cbfsoffset);
}
@ -438,7 +437,7 @@ static int cbfs_create(void)
int ret = cbfs_legacy_image_create(&image,
param.arch,
param.alignment,
CBFS_ALIGNMENT,
&bootblock,
param.baseaddress,
param.headeroffset,
@ -743,7 +742,7 @@ static const struct command commands[] = {
{"add-stage", "H:r:f:n:t:c:b:S:vh?", cbfs_add_stage, true, true},
{"add-int", "H:r:i:n:b:vh?", cbfs_add_integer, true, true},
{"copy", "H:D:s:h?", cbfs_copy, true, true},
{"create", "M:r:s:B:b:H:a:o:m:vh?", cbfs_create, true, true},
{"create", "M:r:s:B:b:H:o:m:vh?", cbfs_create, true, true},
{"extract", "H:r:n:f:vh?", cbfs_extract, true, false},
{"locate", "H:r:f:n:P:a:Tvh?", cbfs_locate, true, false},
{"layout", "wvh?", cbfs_layout, false, false},