[coreboot] Patch merged into coreboot/master: 2ed95b3 Some more #if cleanup