[coreboot-gerrit] Change in coreboot[master]: amdfwtool: Add a union for combo and psp directory