[coreboot-gerrit] Patch merged into coreboot/master: a11df88 kirby: Clean some cruft from mainboard.c