[coreboot-gerrit] Patch merged into coreboot/master: 56b8309 build system: rename __BOOT_BLOCK__ and __VER_STAGE__