[coreboot-gerrit] Patch merged into coreboot/master: amd/hudson: Add PSP2 build for combo BIOS