[coreboot-gerrit] Patch merged into coreboot/master: x86: Align CBFS on top of ROM