From 12c55eda11453ed1e7a24e218338831f67cd5de6 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Mon, 4 Jan 2016 13:57:07 -0600 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/12824 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Martin Roth --- 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 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);