[coreboot-gerrit] Patch merged into coreboot/master: Combine Broadwell Chromeboxes using variant board scheme