[coreboot-gerrit] Patch merged into coreboot/master: mainboard: Clean up boot_option/reboot_bits in cmos.layout