[coreboot-gerrit] Patch merged into coreboot/master: 771819a cosmos: rearrange configuration and makefile definitions