Patch set updated for coreboot: amd/hudson: Add PSP2 build for combo BIOS

[Marc Jones]

Marc Jones ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17149

-gerrit

commit e1092fcb9106066b3361c188367b22d7783b22f6
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 
---
 src/southbridge/amd/pi/hudson/Makefile.inc | 66 ++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc
index 59e4240..53a1a4f0 100644
--- a/src/southbridge/amd/pi/hudson/Makefile.inc
+++ b/src/southbridge/amd/pi/hudson/Makefile.inc
@@ -161,19 +161,18 @@ OPT_TRUSTLETKEY_FILE=$(call add_opt_prefix, $(CONFIG_TRUSTLETKEY_FILE), --trustl
 OPT_SMUFIRMWARE2_FILE=$(call add_opt_prefix, $(CONFIG_SMUFIRMWARE2_FILE), --smufirmware2)
 OPT_SMUSCS_FILE=$(call add_opt_prefix, $(CONFIG_SMUSCS_FILE), --smuscs)

-#TODO: Set PSP2 Firmware. The setting below is just for testing.
-#CONFIG_2AMD_PUBKEY_FILE     =$(CONFIG_AMD_PUBKEY_FILE)
-#CONFIG_2PSPBTLDR_FILE	    =$(CONFIG_PSPBTLDR_FILE)
-#CONFIG_2SMUFWM_FILE	    =$(CONFIG_SMUFWM_FILE)
-#CONFIG_2PSPRCVR_FILE	    =$(CONFIG_PSPRCVR_FILE)
-#CONFIG_2PUBSIGNEDKEY_FILE   =$(CONFIG_PUBSIGNEDKEY_FILE)
-#CONFIG_2PSPSCUREOS_FILE	    =$(CONFIG_PSPSCUREOS_FILE)
-#CONFIG_2PSPNVRAM_FILE	    =$(CONFIG_PSPNVRAM_FILE)
-#CONFIG_2PSPSECUREDEBUG_FILE =$(CONFIG_PSPSECUREDEBUG_FILE)
-#CONFIG_2PSPTRUSTLETS_FILE   =$(CONFIG_PSPTRUSTLETS_FILE)
-#CONFIG_2TRUSTLETKEY_FILE    =$(CONFIG_TRUSTLETKEY_FILE)
-#CONFIG_2SMUFIRMWARE2_FILE   =$(CONFIG_SMUFIRMWARE2_FILE)
-#CONFIG_2SMUSCS_FILE	    =$(CONFIG_SMUSCS_FILE)
+CONFIG_2AMD_PUBKEY_FILE     =$(CONFIG_AMD_PUBKEY_FILE)
+CONFIG_2PSPBTLDR_FILE       =$(CONFIG_PSPBTLDR_FILE)
+CONFIG_2SMUFWM_FILE         =$(CONFIG_SMUFWM_FILE)
+CONFIG_2PSPRCVR_FILE        =$(CONFIG_PSPRCVR_FILE)
+CONFIG_2PUBSIGNEDKEY_FILE   =$(CONFIG_PUBSIGNEDKEY_FILE)
+CONFIG_2PSPSCUREOS_FILE     =$(CONFIG_PSPSCUREOS_FILE)
+CONFIG_2PSPNVRAM_FILE       =$(CONFIG_PSPNVRAM_FILE)
+CONFIG_2PSPSECUREDEBUG_FILE =$(CONFIG_PSPSECUREDEBUG_FILE)
+CONFIG_2PSPTRUSTLETS_FILE   =$(CONFIG_PSPTRUSTLETS_FILE)
+CONFIG_2TRUSTLETKEY_FILE    =$(CONFIG_TRUSTLETKEY_FILE)
+CONFIG_2SMUFIRMWARE2_FILE   =$(CONFIG_SMUFIRMWARE2_FILE)
+CONFIG_2SMUSCS_FILE         =$(CONFIG_SMUSCS_FILE)

OPT_2AMD_PUBKEY_FILE=$(call add_opt_prefix, $(CONFIG_2AMD_PUBKEY_FILE), --pubkey2)
 OPT_2PSPBTLDR_FILE=$(call add_opt_prefix, $(CONFIG_2PSPBTLDR_FILE), --bootloader2)
@@ -203,9 +202,50 @@ $(obj)/amdfw.rom:	$(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \
    		$(call strip_quotes, $(CONFIG_PSPTRUSTLETS_FILE)) \
    		$(call strip_quotes, $(CONFIG_TRUSTLETKEY_FILE)) \
    		$(call strip_quotes, $(CONFIG_SMUFIRMWARE2_FILE)) \
+			$(call strip_quotes, $(CONFIG_2AMD_PUBKEY_FILE)) \
+			$(call strip_quotes, $(CONFIG_2PUBSIGNEDKEY_FILE)) \
+			$(call strip_quotes, $(CONFIG_2PSPBTLDR_FILE)) \
+			$(call strip_quotes, $(CONFIG_2SMUFWM_FILE)) \
+			$(call strip_quotes, $(CONFIG_2PSPRCVR_FILE)) \
+			$(call strip_quotes, $(CONFIG_2PSPSCUREOS_FILE)) \
+			$(call strip_quotes, $(CONFIG_2PSPNVRAM_FILE)) \
+			$(call strip_quotes, $(CONFIG_2SMUSCS_FILE)) \
+			$(call strip_quotes, $(CONFIG_2PSPSECUREDEBUG_FILE)) \
+			$(call strip_quotes, $(CONFIG_2PSPTRUSTLETS_FILE)) \
+			$(call strip_quotes, $(CONFIG_2TRUSTLETKEY_FILE)) \
+			$(call strip_quotes, $(CONFIG_2SMUFIRMWARE2_FILE)) \
    		$(AMDFWTOOL)
    rm -f $@
    @printf "    AMDFWTOOL  $(subst $(obj)/,,$(@))\n"
+	echo "$(AMDFWTOOL) \
+		$(OPT_HUDSON_XHCI_FWM_FILE) \
+		$(OPT_HUDSON_IMC_FWM_FILE) \
+		$(OPT_HUDSON_GEC_FWM_FILE) \
+		$(OPT_AMD_PUBKEY_FILE) \
+		$(OPT_PSPBTLDR_FILE) \
+		$(OPT_SMUFWM_FILE) \
+		$(OPT_PSPRCVR_FILE) \
+		$(OPT_PUBSIGNEDKEY_FILE) \
+		$(OPT_PSPSCUREOS_FILE) \
+		$(OPT_PSPNVRAM_FILE) \
+		$(OPT_PSPSECUREDEBUG_FILE) \
+		$(OPT_PSPTRUSTLETS_FILE) \
+		$(OPT_TRUSTLETKEY_FILE) \
+		$(OPT_SMUFIRMWARE2_FILE) \
+		$(OPT_SMUSCS_FILE) \
+		$(OPT_2AMD_PUBKEY_FILE) \
+		$(OPT_2PSPBTLDR_FILE) \
+		$(OPT_2SMUFWM_FILE) \
+		$(OPT_2PSPRCVR_FILE) \
+		$(OPT_2PUBSIGNEDKEY_FILE) \
+		$(OPT_2PSPSCUREOS_FILE) \
+		$(OPT_2PSPNVRAM_FILE) \
+		$(OPT_2PSPSECUREDEBUG_FILE) \
+		$(OPT_2PSPTRUSTLETS_FILE) \
+		$(OPT_2TRUSTLETKEY_FILE) \
+		$(OPT_2SMUFIRMWARE2_FILE) \
+		$(OPT_2SMUSCS_FILE) \
+		--output	$@"
    $(AMDFWTOOL) \
    	$(OPT_HUDSON_XHCI_FWM_FILE) \
    	$(OPT_HUDSON_IMC_FWM_FILE) \