[coreboot] Patch merged into coreboot/master: 7ed3bc9 Clean up #ifs