[coreboot-gerrit] Change in coreboot[master]: bootblock: Support normal/fallback mechanism again