diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2015-07-14 22:28:27 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-07-15 16:34:37 +0200 |
| commit | 4d3e4c421e94814884d1ff035a4c4ec80d4b33b2 (patch) | |
| tree | 714cf2a02ad6ee568928084df4c5cc36530ae96f /src/include | |
| parent | 45acb34ffce5ffef1e574305b4e18af6d26df46b (diff) | |
cbfs: hardcode file alignment
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>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/cbfs.h | 3 | ||||
| -rw-r--r-- | src/include/cbfs_serialized.h | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/include/cbfs.h b/src/include/cbfs.h index 00c43f2871..f031141a82 100644 --- a/src/include/cbfs.h +++ b/src/include/cbfs.h @@ -66,13 +66,10 @@ int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs, struct cbfsd { const struct region_device *rdev; - size_t align; }; /* The cbfs_props struct describes the properties associated with a CBFS. */ struct cbfs_props { - /* Each file is aligned. */ - size_t align; /* CBFS starts at the following offset within the boot region. */ size_t offset; /* CBFS size. */ diff --git a/src/include/cbfs_serialized.h b/src/include/cbfs_serialized.h index df388570bf..f6720959e3 100644 --- a/src/include/cbfs_serialized.h +++ b/src/include/cbfs_serialized.h @@ -95,12 +95,15 @@ struct cbfs_header { uint32_t version; uint32_t romsize; uint32_t bootblocksize; - uint32_t align; + uint32_t align; /* fixed to 64 bytes */ uint32_t offset; uint32_t architecture; uint32_t pad[1]; } __attribute__((packed)); +/* this used to be flexible, but wasn't ever set to something different. */ +#define CBFS_ALIGNMENT 64 + /* "Unknown" refers to CBFS headers version 1, * before the architecture was defined (i.e., x86 only). */ |