summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--payloads/libpayload/libcbfs/cbfs_core.c15
-rw-r--r--src/lib/cbfs_core.c15
2 files changed, 26 insertions, 4 deletions
diff --git a/payloads/libpayload/libcbfs/cbfs_core.c b/payloads/libpayload/libcbfs/cbfs_core.c
index a3d3e02467..fb15744fe0 100644
--- a/payloads/libpayload/libcbfs/cbfs_core.c
+++ b/payloads/libpayload/libcbfs/cbfs_core.c
@@ -119,11 +119,22 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name)
// TODO Add a "size" in CBFS header for a platform independent way to
// determine the end of CBFS data.
#if defined(CONFIG_LP_ARCH_X86) && CONFIG_LP_ARCH_X86
- romsize -= htonl(header->bootblocksize);
+ // resolve actual length of ROM used for CBFS components
+ // the bootblock size was not taken into account
+ romsize -= ntohl(header->bootblocksize);
+
+ // fine tune the length to handle alignment positioning.
+ // using (bootblock size) % align, to derive the
+ // number of bytes the bootblock is off from the alignment size.
+ if ((ntohl(header->bootblocksize) % align))
+ romsize -= (align - (ntohl(header->bootblocksize) % align));
+ else
+ romsize -= 1;
#endif
- DEBUG("CBFS location: 0x%x~0x%x, align: %d\n", offset, romsize, align);
+ DEBUG("CBFS location: 0x%x~0x%x, align: %d\n", offset, romsize, align);
DEBUG("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)) {
diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c
index 7ef103bc24..264d9a8f24 100644
--- a/src/lib/cbfs_core.c
+++ b/src/lib/cbfs_core.c
@@ -119,11 +119,22 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name)
// TODO Add a "size" in CBFS header for a platform independent way to
// determine the end of CBFS data.
#if defined(CONFIG_ARCH_X86) && CONFIG_ARCH_X86
- romsize -= htonl(header->bootblocksize);
+ // resolve actual length of ROM used for CBFS components
+ // the bootblock size was not taken into account
+ romsize -= ntohl(header->bootblocksize);
+
+ // fine tune the length to handle alignment positioning.
+ // using (bootblock size) % align, to derive the
+ // number of bytes the bootblock is off from the alignment size.
+ if ((ntohl(header->bootblocksize) % align))
+ romsize -= (align - (ntohl(header->bootblocksize) % align));
+ else
+ romsize -= 1;
#endif
- DEBUG("CBFS location: 0x%x~0x%x, align: %d\n", offset, romsize, align);
+ DEBUG("CBFS location: 0x%x~0x%x, align: %d\n", offset, romsize, align);
DEBUG("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)) {