[coreboot-gerrit] New patch to review for coreboot: Revert "x86: Align CBFS on top of ROM"
Aaron Durbin (adurbin@chromium.org)
gerrit at coreboot.org
Mon Jan 4 21:07:15 CET 2016
Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12824
-gerrit
commit f8f8d3af6de09daaaacb6a13352ebe9dc464916e
Author: Aaron Durbin <adurbin at chromium.org>
Date: Mon Jan 4 13:57:07 2016 -0600
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 at chromium.org>
---
src/arch/x86/mmap_boot.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/arch/x86/mmap_boot.c b/src/arch/x86/mmap_boot.c
index 0c2b45d..ae35451 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);
More information about the coreboot-gerrit
mailing list