summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2016-01-04 13:57:07 -0600
committerMartin Roth <martinroth@google.com>2016-01-06 17:44:54 +0100
commit12c55eda11453ed1e7a24e218338831f67cd5de6 (patch)
tree0fd479baf15f86c9880b4dbd13167014801dc984 /src/arch
parentf812c44f003a1ba34548d1eceb622221d95a5945 (diff)
downloadcoreboot-12c55eda11453ed1e7a24e218338831f67cd5de6.tar.xz
Revert "x86: Align CBFS on top of ROM"
This reverts commit 65e33c08a9a88c52baaadaf515b9591856115a77. This was the wrong logic to fix the master header. Change-Id: I4688034831f09ac69abfd0660c76112deabd62ec Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/12824 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/mmap_boot.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/x86/mmap_boot.c b/src/arch/x86/mmap_boot.c
index 0c2b45dd18..ae35451b3c 100644
--- a/src/arch/x86/mmap_boot.c
+++ b/src/arch/x86/mmap_boot.c
@@ -55,8 +55,9 @@ static int cbfs_master_header_props(struct cbfs_props *props)
props->offset = header.offset;
if (CONFIG_ROM_SIZE != header.romsize)
- props->offset += CONFIG_ROM_SIZE - header.romsize;
- props->size = CONFIG_ROM_SIZE;
+ props->size = CONFIG_ROM_SIZE;
+ else
+ props->size = header.romsize;
props->size -= props->offset;
props->size -= header.bootblocksize;
props->size = ALIGN_DOWN(props->size, 64);