Revert "x86: Align CBFS on top of ROM"

This reverts commit 65e33c08a9.
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>
This commit is contained in:
Aaron Durbin 2016-01-04 13:57:07 -06:00 committed by Martin Roth
parent f812c44f00
commit 12c55eda11
1 changed files with 3 additions and 2 deletions

View File

@ -55,8 +55,9 @@ static int cbfs_master_header_props(struct cbfs_props *props)
props->offset = header.offset; props->offset = header.offset;
if (CONFIG_ROM_SIZE != header.romsize) 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 -= props->offset;
props->size -= header.bootblocksize; props->size -= header.bootblocksize;
props->size = ALIGN_DOWN(props->size, 64); props->size = ALIGN_DOWN(props->size, 64);