summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Jones <marcj303@gmail.com>2016-09-20 20:50:25 -0600
committerMartin Roth <martinroth@google.com>2016-11-02 18:40:32 +0100
commitc98629cd676b41938978f3e108d54755e3c5935b (patch)
treef5ea866f2d17b4780386447c251189e8f108dd4c
parent350630aefbcebee7edb9941fe2ba1846fca8b793 (diff)
downloadcoreboot-c98629cd676b41938978f3e108d54755e3c5935b.tar.xz
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 <marcj303@gmail.com> Original-Tested-by: Marshall Dawson <marshalldawson3rd@gmail.com> Original-Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> (cherry picked from commit a3334632fd53c07a046c9b23161f6ee67e5cb16e) Change-Id: I40a9ef2e6bed51bc339d3f9ae7c6f316192c4a78 Signed-off-by: Marc Jones <marcj303@gmail.com> Reviewed-on: https://review.coreboot.org/17149 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Martin Roth <martinroth@google.com> Reviewed-by: Zheng Bao <fishbaozi@gmail.com>
-rw-r--r--src/southbridge/amd/pi/hudson/Makefile.inc66
1 files changed, 53 insertions, 13 deletions
diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc
index 59e4240284..53a1a4f004 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) \