Patch merged into coreboot/master: amd/hudson: Add PSP2 build for combo BIOS

the following patch was just integrated into master:
commit c98629cd676b41938978f3e108d54755e3c5935b
Author: Marc Jones 
Date:   Tue Sep 20 20:50:25 2016 -0600

amd/hudson: Add PSP2 build for combo BIOS

The Stoney processor can use multiple directory structures.  Turn
    this feature on in the makefile.

Original-Signed-off-by: Marc Jones 
    Original-Tested-by: Marshall Dawson 
    Original-Reviewed-by: Marshall Dawson 
    (cherry picked from commit a3334632fd53c07a046c9b23161f6ee67e5cb16e)

Change-Id: I40a9ef2e6bed51bc339d3f9ae7c6f316192c4a78
    Signed-off-by: Marc Jones 
    Reviewed-on: https://review.coreboot.org/17149
    Tested-by: build bot (Jenkins)
    Reviewed-by: Paul Menzel 
    Reviewed-by: Martin Roth 
    Reviewed-by: Zheng Bao

See https://review.coreboot.org/17149 for details.

-gerrit