[coreboot-gerrit] New patch to review for coreboot: x86: Align CBFS on top of ROM

[Nico Huber (nico.h@gmx.de)]

Nico Huber (nico.h at gmx.de) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12810

-gerrit

commit e53ec12404b6ed8ce597d266a879436d3ec6f33c
Author: Nico Huber <nico.huber at secunet.com>
Date:   Mon Dec 28 20:17:13 2015 +0100

    x86: Align CBFS on top of ROM
    
    Since the introduction of the new (interim?) master header, coreboot
    searches the whole ROM for CBFS entries. Fix that by aligning it on top
    of the ROM.
    
    Change-Id: I080cd4b746169a36462a49baff5e114b1f6f224a
    Signed-off-by: Nico Huber <nico.huber at secunet.com>
---
 src/arch/x86/mmap_boot.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/arch/x86/mmap_boot.c b/src/arch/x86/mmap_boot.c
index ae35451..0c2b45d 100644
--- a/src/arch/x86/mmap_boot.c
+++ b/src/arch/x86/mmap_boot.c
@@ -55,9 +55,8 @@ static int cbfs_master_header_props(struct cbfs_props *props)
 
 	props->offset = header.offset;
 	if (CONFIG_ROM_SIZE != header.romsize)
-		props->size = CONFIG_ROM_SIZE;
-	else
-		props->size = header.romsize;
+		props->offset += CONFIG_ROM_SIZE - header.romsize;
+	props->size = CONFIG_ROM_SIZE;
 	props->size -= props->offset;
 	props->size -= header.bootblocksize;
 	props->size = ALIGN_DOWN(props->size, 64);