Patch merged into coreboot/master: Revert "x86: Align CBFS on top of ROM"

the following patch was just integrated into master:
commit 12c55eda11453ed1e7a24e218338831f67cd5de6
Author: Aaron Durbin 
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 
    Reviewed-on: https://review.coreboot.org/12824
    Tested-by: build bot (Jenkins)
    Reviewed-by: Paul Menzel 
    Reviewed-by: Martin Roth

See https://review.coreboot.org/12824 for details.

-gerrit