[coreboot-gerrit] Change in coreboot[master]: arch/x86: Fix !CONFIG_VBOOT_SEPARATE_VERSTAGE