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