[coreboot-gerrit] [M] Change in coreboot[main]: mb/google/skyrim: Combine the variants function