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

cbfs: hardcode file alignment

Browse Source 
Assume that it's 64 byte.

Change-Id: I168facd92f64c2cf99c26c350c60317807a4aed4
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10919
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Patrick Georgi
2015-07-14 22:28:27 +02:00
committed by Patrick Georgi
parent 45acb34ffc
commit 4d3e4c421e
7 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/cbfs.c
View File

@ -57,7 +57,6 @@ int cbfs_boot_locate(struct region_device *fh, const char *name, uint32_t *type)
return -1;
cbfs.rdev = &rdev;
cbfs.align = props.align;
return cbfs_locate(fh, &cbfs, name, type);
}
@ -83,11 +82,9 @@ int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs,
{
size_t offset;
const struct region_device *rd;
size_t align;
offset = 0;
rd = cbfs->rdev;
align = cbfs->align;
LOG("Locating '%s'\n", name);
@ -107,7 +104,7 @@ int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs,
if (memcmp(file.magic, CBFS_FILE_MAGIC, sizeof(file.magic))) {
offset++;
offset = ALIGN_UP(offset, align);
offset = ALIGN_UP(offset, CBFS_ALIGNMENT);
continue;
}
@ -127,14 +124,14 @@ int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs,
if (!name_match) {
DEBUG(" Unmatched '%s' at %zx\n", fname, offset);
offset += file.offset + file.len;
offset = ALIGN_UP(offset, align);
offset = ALIGN_UP(offset, CBFS_ALIGNMENT);
continue;
}
if (type != NULL && *type != file.type) {
DEBUG(" Unmatched type %x at %zx\n", file.type, offset);
offset += file.offset + file.len;
offset = ALIGN_UP(offset, align);
offset = ALIGN_UP(offset, CBFS_ALIGNMENT);
continue;
}