[coreboot-gerrit] [S] Change in coreboot[main]: soc/amd/common/block/noncar: Merge romstage into bootblock