<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21451">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">amdfw: Clean up makefiles a bit more<br><br>- Get rid of CONFIG_ prefix from variables that don't come from Kconfig.<br>- Remove 2nd set of variables that are duplicates of the first set.<br>- Delete duplicate set of Prerequisites<br><br>Change-Id: I194b4c790b3e35353d480d34b60507a00f10ef11<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/soc/amd/stoneyridge/Makefile.inc<br>M src/southbridge/amd/pi/hudson/Makefile.inc<br>2 files changed, 96 insertions(+), 126 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/21451/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc<br>index ee0b489..e7ac1b8 100644<br>--- a/src/soc/amd/stoneyridge/Makefile.inc<br>+++ b/src/soc/amd/stoneyridge/Makefile.inc<br>@@ -105,48 +105,48 @@<br> FIRMWARE_TYPE=ST<br> <br> ###5<br>-CONFIG_PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/RtmPubSigned$(FIRMWARE_TYPE).key<br>+PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/RtmPubSigned$(FIRMWARE_TYPE).key<br> <br> ###1<br>-CONFIG_PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader_prod_$(FIRMWARE_TYPE).sbin<br>+PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader_prod_$(FIRMWARE_TYPE).sbin<br> <br> ###3<br>-CONFIG_PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspRecoveryBootLoader_prod_$(FIRMWARE_TYPE).sbin<br>+PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspRecoveryBootLoader_prod_$(FIRMWARE_TYPE).sbin<br> <br> ###4<br>-CONFIG_PSPNVRAM_FILE=$(top)/$(FIRMWARE_LOCATE)/PspNvram$(FIRMWARE_TYPE).bin<br>+PSPNVRAM_FILE=$(top)/$(FIRMWARE_LOCATE)/PspNvram$(FIRMWARE_TYPE).bin<br> <br> ###8 - Check for smu firmware named either *.sbin or *.csbin<br>-CONFIG_SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware_$(FIRMWARE_TYPE).csbin<br>-CONFIG_SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware_$(FIRMWARE_TYPE)_FN.csbin<br>-ifeq ("$(wildcard $(CONFIG_SMUFWM_FILE))","")<br>-CONFIG_SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE).sbin<br>-CONFIG_SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin<br>+SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware_$(FIRMWARE_TYPE).csbin<br>+SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware_$(FIRMWARE_TYPE)_FN.csbin<br>+ifeq ("$(wildcard $(SMUFWM_FILE))","")<br>+SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE).sbin<br>+SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin<br> endif<br> <br> ###95<br>-CONFIG_SMUSCS_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuScs$(FIRMWARE_TYPE).bin<br>+SMUSCS_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuScs$(FIRMWARE_TYPE).bin<br> <br> ###9<br>-CONFIG_PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureDebug$(FIRMWARE_TYPE).Key<br>+PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureDebug$(FIRMWARE_TYPE).Key<br> <br> ifeq ($(CONFIG_USE_PSPSCUREOS),y)<br> ###2<br>-CONFIG_PSPSCUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureOs_prod_$(FIRMWARE_TYPE).csbin<br>+PSPSCUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureOs_prod_$(FIRMWARE_TYPE).csbin<br> <br> ###12<br>-CONFIG_PSPTRUSTLETS_FILE=$(wildcard $(top)/$(FIRMWARE_LOCATE)/PspTrustlets*_prod_$(FIRMWARE_TYPE).cbin)<br>+PSPTRUSTLETS_FILE=$(wildcard $(top)/$(FIRMWARE_LOCATE)/PspTrustlets*_prod_$(FIRMWARE_TYPE).cbin)<br> <br> ###13<br>-CONFIG_TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/TrustletKey_prod_$(FIRMWARE_TYPE).sbin<br>+TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/TrustletKey_prod_$(FIRMWARE_TYPE).sbin<br> endif<br> <br> ###18- Check for smu firmware2 named either *.sbin or *.csbin<br>-CONFIG_SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE).csbin<br>-CONFIG_SMUFIRMWARE2_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE)_FN.csbin<br>-ifeq ("$(wildcard $(CONFIG_SMUFIRMWARE2_FILE))","")<br>-CONFIG_SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE).sbin<br>-CONFIG_SMUFIRMWARE2_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE)_FN.sbin<br>+SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE).csbin<br>+SMUFIRMWARE2_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE)_FN.csbin<br>+ifeq ("$(wildcard $(SMUFIRMWARE2_FILE))","")<br>+SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE).sbin<br>+SMUFIRMWARE2_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE)_FN.sbin<br> endif<br> <br> add_opt_prefix=$(if $(call strip_quotes, $(1)), $(2) $(call strip_quotes, $(1)), )<br>@@ -155,68 +155,38 @@<br> OPT_STONEYRIDGE_IMC_FWM_FILE=$(call add_opt_prefix, $(CONFIG_STONEYRIDGE_IMC_FWM_FILE), --imc)<br> OPT_STONEYRIDGE_GEC_FWM_FILE=$(call add_opt_prefix, $(CONFIG_STONEYRIDGE_GEC_FWM_FILEddd), --gec)<br> <br>-CONFIG_2AMD_PUBKEY_FILE =$(CONFIG_AMD_PUBKEY_FILE)<br>-CONFIG_2PSPBTLDR_FILE =$(CONFIG_PSPBTLDR_FILE)<br>-CONFIG_2SMUFWM_FILE =$(CONFIG_SMUFWM_FILE)<br>-CONFIG_2SMUFWM_FN_FILE =$(CONFIG_SMUFWM_FN_FILE)<br>-CONFIG_2PSPRCVR_FILE =$(CONFIG_PSPRCVR_FILE)<br>-CONFIG_2PUBSIGNEDKEY_FILE =$(CONFIG_PUBSIGNEDKEY_FILE)<br>-CONFIG_2PSPSCUREOS_FILE =$(CONFIG_PSPSCUREOS_FILE)<br>-CONFIG_2PSPNVRAM_FILE =$(CONFIG_PSPNVRAM_FILE)<br>-CONFIG_2PSPSECUREDEBUG_FILE =$(CONFIG_PSPSECUREDEBUG_FILE)<br>-CONFIG_2PSPTRUSTLETS_FILE =$(CONFIG_PSPTRUSTLETS_FILE)<br>-CONFIG_2TRUSTLETKEY_FILE =$(CONFIG_TRUSTLETKEY_FILE)<br>-CONFIG_2SMUFIRMWARE2_FILE =$(CONFIG_SMUFIRMWARE2_FILE)<br>-CONFIG_2SMUFIRMWARE2_FN_FILE =$(CONFIG_SMUFIRMWARE2_FN_FILE)<br>-CONFIG_2SMUSCS_FILE =$(CONFIG_SMUSCS_FILE)<br>-<br>-OPT_2AMD_PUBKEY_FILE=$(call add_opt_prefix, $(CONFIG_2AMD_PUBKEY_FILE), --pubkey2)<br>-OPT_2PSPBTLDR_FILE=$(call add_opt_prefix, $(CONFIG_2PSPBTLDR_FILE), --bootloader2)<br>-OPT_2SMUFWM_FILE=$(call add_opt_prefix, $(CONFIG_2SMUFWM_FILE), --smufirmware_2)<br>-OPT_2PSPRCVR_FILE=$(call add_opt_prefix, $(CONFIG_2PSPRCVR_FILE), --recovery2)<br>-OPT_2PUBSIGNEDKEY_FILE=$(call add_opt_prefix, $(CONFIG_2PUBSIGNEDKEY_FILE), --rtmpubkey2)<br>-OPT_2PSPNVRAM_FILE=$(call add_opt_prefix, $(CONFIG_2PSPNVRAM_FILE), --nvram2)<br>-OPT_2PSPSECUREDEBUG_FILE=$(call add_opt_prefix, $(CONFIG_2PSPSECUREDEBUG_FILE), --securedebug2)<br>+OPT_2AMD_PUBKEY_FILE=$(call add_opt_prefix, $(CONFIG_AMD_PUBKEY_FILE), --pubkey2)<br>+OPT_2PSPBTLDR_FILE=$(call add_opt_prefix, $(PSPBTLDR_FILE), --bootloader2)<br>+OPT_2SMUFWM_FILE=$(call add_opt_prefix, $(SMUFWM_FILE), --smufirmware_2)<br>+OPT_2PSPRCVR_FILE=$(call add_opt_prefix, $(PSPRCVR_FILE), --recovery2)<br>+OPT_2PUBSIGNEDKEY_FILE=$(call add_opt_prefix, $(PUBSIGNEDKEY_FILE), --rtmpubkey2)<br>+OPT_2PSPNVRAM_FILE=$(call add_opt_prefix, $(PSPNVRAM_FILE), --nvram2)<br>+OPT_2PSPSECUREDEBUG_FILE=$(call add_opt_prefix, $(PSPSECUREDEBUG_FILE), --securedebug2)<br> ifeq ($(CONFIG_USE_PSPSCUREOS),y)<br>-OPT_2PSPSCUREOS_FILE=$(call add_opt_prefix, $(CONFIG_2PSPSCUREOS_FILE), --secureos2)<br>-OPT_2PSPTRUSTLETS_FILE=$(call add_opt_prefix, $(CONFIG_2PSPTRUSTLETS_FILE), --trustlets2)<br>-OPT_2TRUSTLETKEY_FILE=$(call add_opt_prefix, $(CONFIG_2TRUSTLETKEY_FILE), --trustletkey2)<br>+OPT_2PSPSCUREOS_FILE=$(call add_opt_prefix, $(PSPSCUREOS_FILE), --secureos2)<br>+OPT_2PSPTRUSTLETS_FILE=$(call add_opt_prefix, $(PSPTRUSTLETS_FILE), --trustlets2)<br>+OPT_2TRUSTLETKEY_FILE=$(call add_opt_prefix, $(TRUSTLETKEY_FILE), --trustletkey2)<br> endif<br>-OPT_2SMUFIRMWARE2_FILE=$(call add_opt_prefix, $(CONFIG_2SMUFIRMWARE2_FILE), --smufirmware2_2)<br>-OPT_2SMUSCS_FILE=$(call add_opt_prefix, $(CONFIG_2SMUSCS_FILE), --smuscs2)<br>-OPT_2SMUFWM_FN_FILE=$(call add_opt_prefix, $(CONFIG_2SMUFWM_FN_FILE), --smufnfirmware_2)<br>-OPT_2SMUFIRMWARE2_FN_FILE=$(call add_opt_prefix, $(CONFIG_2SMUFIRMWARE2_FN_FILE), --smufnfirmware2_2)<br>+OPT_2SMUFIRMWARE2_FILE=$(call add_opt_prefix, $(SMUFIRMWARE2_FILE), --smufirmware2_2)<br>+OPT_2SMUSCS_FILE=$(call add_opt_prefix, $(SMUSCS_FILE), --smuscs2)<br>+OPT_2SMUFWM_FN_FILE=$(call add_opt_prefix, $(SMUFWM_FN_FILE), --smufnfirmware_2)<br>+OPT_2SMUFIRMWARE2_FN_FILE=$(call add_opt_prefix, $(SMUFIRMWARE2_FN_FILE), --smufnfirmware2_2)<br> <br> <br> $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_STONEYRIDGE_XHCI_FWM_FILE)) \<br> $(call strip_quotes, $(CONFIG_STONEYRIDGE_IMC_FWM_FILE)) \<br> $(call strip_quotes, $(CONFIG_STONEYRIDGE_GEC_FWM_FILE)) \<br> $(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PUBSIGNEDKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPBTLDR_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPRCVR_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPSCUREOS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPNVRAM_FILE)) \<br>- $(call strip_quotes, $(CONFIG_SMUFWM_FILE)) \<br>- $(call strip_quotes, $(CONFIG_SMUSCS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPSECUREDEBUG_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPTRUSTLETS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_TRUSTLETKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_SMUFIRMWARE2_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2AMD_PUBKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PUBSIGNEDKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPBTLDR_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2SMUFWM_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2SMUFWM_FN_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPRCVR_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPSCUREOS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPNVRAM_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2SMUSCS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPSECUREDEBUG_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPTRUSTLETS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2TRUSTLETKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2SMUFIRMWARE2_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2SMUFIRMWARE2_FN_FILE)) \<br>+ $(call strip_quotes, $(PUBSIGNEDKEY_FILE)) \<br>+ $(call strip_quotes, $(PSPBTLDR_FILE)) \<br>+ $(call strip_quotes, $(PSPRCVR_FILE)) \<br>+ $(call strip_quotes, $(PSPSCUREOS_FILE)) \<br>+ $(call strip_quotes, $(PSPNVRAM_FILE)) \<br>+ $(call strip_quotes, $(SMUFWM_FILE)) \<br>+ $(call strip_quotes, $(SMUSCS_FILE)) \<br>+ $(call strip_quotes, $(PSPSECUREDEBUG_FILE)) \<br>+ $(call strip_quotes, $(PSPTRUSTLETS_FILE)) \<br>+ $(call strip_quotes, $(TRUSTLETKEY_FILE)) \<br> $(AMDFWTOOL)<br> rm -f $@<br> @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n"<br>diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc<br>index e1d164f..251cb6c 100644<br>--- a/src/southbridge/amd/pi/hudson/Makefile.inc<br>+++ b/src/southbridge/amd/pi/hudson/Makefile.inc<br>@@ -89,58 +89,58 @@<br> endif<br> <br> ###5<br>-CONFIG_PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/RtmPubSigned$(FIRMWARE_TYPE).key<br>+PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/RtmPubSigned$(FIRMWARE_TYPE).key<br> ###1<br> ifeq ($(CONFIG_CPU_AMD_PI_00730F01), y)<br>-CONFIG_PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader$(FIRMWARE_TYPE).Bypass.sbin<br>+PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader$(FIRMWARE_TYPE).Bypass.sbin<br> else ifeq ($(CONFIG_CPU_AMD_PI_00660F01), y)<br>-CONFIG_PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader_prod_$(FIRMWARE_TYPE).sbin<br>+PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader_prod_$(FIRMWARE_TYPE).sbin<br> endif<br> <br> ###3<br> ifeq ($(CONFIG_CPU_AMD_PI_00730F01), y)<br>-CONFIG_PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspRecovery$(FIRMWARE_TYPE).sbin<br>+PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspRecovery$(FIRMWARE_TYPE).sbin<br> else ifeq ($(CONFIG_CPU_AMD_PI_00660F01), y)<br>-CONFIG_PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspRecoveryBootLoader_prod_$(FIRMWARE_TYPE).sbin<br>+PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspRecoveryBootLoader_prod_$(FIRMWARE_TYPE).sbin<br> endif<br> <br> ###2<br> ifeq ($(CONFIG_CPU_AMD_PI_00730F01), y)<br>-CONFIG_PSPSCUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureOs$(FIRMWARE_TYPE).sbin<br>+PSPSCUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureOs$(FIRMWARE_TYPE).sbin<br> else ifeq ($(CONFIG_CPU_AMD_PI_00660F01), y)<br>-CONFIG_PSPSCUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureOs_prod_$(FIRMWARE_TYPE).csbin<br>+PSPSCUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureOs_prod_$(FIRMWARE_TYPE).csbin<br> endif<br> <br> ###4<br>-CONFIG_PSPNVRAM_FILE=$(top)/$(FIRMWARE_LOCATE)/PspNvram$(FIRMWARE_TYPE).bin<br>+PSPNVRAM_FILE=$(top)/$(FIRMWARE_LOCATE)/PspNvram$(FIRMWARE_TYPE).bin<br> <br> ###8<br>-CONFIG_SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE).sbin<br>-CONFIG_SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin<br>+SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE).sbin<br>+SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin<br> <br> ###95<br>-CONFIG_SMUSCS_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuScs$(FIRMWARE_TYPE).bin<br>+SMUSCS_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuScs$(FIRMWARE_TYPE).bin<br> <br> ###9<br>-CONFIG_PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureDebug$(FIRMWARE_TYPE).Key<br>+PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureDebug$(FIRMWARE_TYPE).Key<br> <br> ###12<br> ifeq ($(CONFIG_CPU_AMD_PI_00730F01), y)<br>-CONFIG_PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATE)/trustlets.bin<br>+PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATE)/trustlets.bin<br> else ifeq ($(CONFIG_CPU_AMD_PI_00660F01), y)<br>-CONFIG_PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspTrustlets_prod_$(FIRMWARE_TYPE).cbin<br>+PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspTrustlets_prod_$(FIRMWARE_TYPE).cbin<br> endif<br> <br> ###13<br> ifeq ($(CONFIG_CPU_AMD_PI_00730F01), y)<br>-CONFIG_TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/Trustlet.tkn.cert<br>+TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/Trustlet.tkn.cert<br> else ifeq ($(CONFIG_CPU_AMD_PI_00660F01), y)<br>-CONFIG_TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/TrustletKey_prod_$(FIRMWARE_TYPE).sbin<br>+TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/TrustletKey_prod_$(FIRMWARE_TYPE).sbin<br> endif<br> <br> ###18<br> ifeq ($(CONFIG_CPU_AMD_PI_00660F01), y)<br>-CONFIG_SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE).sbin<br>+SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE).sbin<br> endif<br> <br> endif<br>@@ -152,47 +152,47 @@<br> OPT_HUDSON_GEC_FWM_FILE=$(call add_opt_prefix, $(CONFIG_HUDSON_GEC_FWM_FILEddd), --gec)<br> <br> OPT_AMD_PUBKEY_FILE=$(call add_opt_prefix, $(CONFIG_AMD_PUBKEY_FILE), --pubkey)<br>-OPT_PSPBTLDR_FILE=$(call add_opt_prefix, $(CONFIG_PSPBTLDR_FILE), --bootloader)<br>-OPT_SMUFWM_FILE=$(call add_opt_prefix, $(CONFIG_SMUFWM_FILE), --smufirmware)<br>-OPT_PSPRCVR_FILE=$(call add_opt_prefix, $(CONFIG_PSPRCVR_FILE), --recovery)<br>-OPT_PUBSIGNEDKEY_FILE=$(call add_opt_prefix, $(CONFIG_PUBSIGNEDKEY_FILE), --rtmpubkey)<br>-OPT_PSPSCUREOS_FILE=$(call add_opt_prefix, $(CONFIG_PSPSCUREOS_FILE), --secureos)<br>-OPT_PSPNVRAM_FILE=$(call add_opt_prefix, $(CONFIG_PSPNVRAM_FILE), --nvram)<br>-OPT_PSPSECUREDEBUG_FILE=$(call add_opt_prefix, $(CONFIG_PSPSECUREDEBUG_FILE), --securedebug)<br>-OPT_PSPTRUSTLETS_FILE=$(call add_opt_prefix, $(CONFIG_PSPTRUSTLETS_FILE), --trustlets)<br>-OPT_TRUSTLETKEY_FILE=$(call add_opt_prefix, $(CONFIG_TRUSTLETKEY_FILE), --trustletkey)<br>-OPT_SMUFIRMWARE2_FILE=$(call add_opt_prefix, $(CONFIG_SMUFIRMWARE2_FILE), --smufirmware2)<br>-OPT_SMUSCS_FILE=$(call add_opt_prefix, $(CONFIG_SMUSCS_FILE), --smuscs)<br>+OPT_PSPBTLDR_FILE=$(call add_opt_prefix, $(PSPBTLDR_FILE), --bootloader)<br>+OPT_SMUFWM_FILE=$(call add_opt_prefix, $(SMUFWM_FILE), --smufirmware)<br>+OPT_PSPRCVR_FILE=$(call add_opt_prefix, $(PSPRCVR_FILE), --recovery)<br>+OPT_PUBSIGNEDKEY_FILE=$(call add_opt_prefix, $(PUBSIGNEDKEY_FILE), --rtmpubkey)<br>+OPT_PSPSCUREOS_FILE=$(call add_opt_prefix, $(PSPSCUREOS_FILE), --secureos)<br>+OPT_PSPNVRAM_FILE=$(call add_opt_prefix, $(PSPNVRAM_FILE), --nvram)<br>+OPT_PSPSECUREDEBUG_FILE=$(call add_opt_prefix, $(PSPSECUREDEBUG_FILE), --securedebug)<br>+OPT_PSPTRUSTLETS_FILE=$(call add_opt_prefix, $(PSPTRUSTLETS_FILE), --trustlets)<br>+OPT_TRUSTLETKEY_FILE=$(call add_opt_prefix, $(TRUSTLETKEY_FILE), --trustletkey)<br>+OPT_SMUFIRMWARE2_FILE=$(call add_opt_prefix, $(SMUFIRMWARE2_FILE), --smufirmware2)<br>+OPT_SMUSCS_FILE=$(call add_opt_prefix, $(SMUSCS_FILE), --smuscs)<br> <br> $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \<br> $(call strip_quotes, $(CONFIG_HUDSON_IMC_FWM_FILE)) \<br> $(call strip_quotes, $(CONFIG_HUDSON_GEC_FWM_FILE)) \<br> $(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PUBSIGNEDKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPBTLDR_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPRCVR_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPSCUREOS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPNVRAM_FILE)) \<br>- $(call strip_quotes, $(CONFIG_SMUFWM_FILE)) \<br>- $(call strip_quotes, $(CONFIG_SMUSCS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPSECUREDEBUG_FILE)) \<br>- $(call strip_quotes, $(CONFIG_PSPTRUSTLETS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_TRUSTLETKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_SMUFIRMWARE2_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2AMD_PUBKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PUBSIGNEDKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPBTLDR_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2SMUFWM_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2SMUFWM_FN_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPRCVR_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPSCUREOS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPNVRAM_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2SMUSCS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPSECUREDEBUG_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2PSPTRUSTLETS_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2TRUSTLETKEY_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2SMUFIRMWARE2_FILE)) \<br>- $(call strip_quotes, $(CONFIG_2SMUFIRMWARE2_FN_FILE)) \<br>+ $(call strip_quotes, $(PUBSIGNEDKEY_FILE)) \<br>+ $(call strip_quotes, $(PSPBTLDR_FILE)) \<br>+ $(call strip_quotes, $(PSPRCVR_FILE)) \<br>+ $(call strip_quotes, $(PSPSCUREOS_FILE)) \<br>+ $(call strip_quotes, $(PSPNVRAM_FILE)) \<br>+ $(call strip_quotes, $(SMUFWM_FILE)) \<br>+ $(call strip_quotes, $(SMUSCS_FILE)) \<br>+ $(call strip_quotes, $(PSPSECUREDEBUG_FILE)) \<br>+ $(call strip_quotes, $(PSPTRUSTLETS_FILE)) \<br>+ $(call strip_quotes, $(TRUSTLETKEY_FILE)) \<br>+ $(call strip_quotes, $(SMUFIRMWARE2_FILE)) \<br>+ $(call strip_quotes, $(AMD_PUBKEY2_FILE)) \<br>+ $(call strip_quotes, $(PUBSIGNEDKEY2_FILE)) \<br>+ $(call strip_quotes, $(PSPBTLDR2_FILE)) \<br>+ $(call strip_quotes, $(SMUFWM2_FILE)) \<br>+ $(call strip_quotes, $(SMUFWM2_FN_FILE)) \<br>+ $(call strip_quotes, $(PSPRCVR2_FILE)) \<br>+ $(call strip_quotes, $(PSPSCUREOS2_FILE)) \<br>+ $(call strip_quotes, $(PSPNVRAM2_FILE)) \<br>+ $(call strip_quotes, $(SMUSCS2_FILE)) \<br>+ $(call strip_quotes, $(PSPSECUREDEBUG2_FILE)) \<br>+ $(call strip_quotes, $(PSPTRUSTLETS2_FILE)) \<br>+ $(call strip_quotes, $(TRUSTLETKEY2_FILE)) \<br>+ $(call strip_quotes, $(SMUFIRMWARE2_2_FILE)) \<br>+ $(call strip_quotes, $(SMUFIRMWARE2_2_FN_FILE)) \<br> $(AMDFWTOOL)<br> rm -f $@<br> @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n"<br></pre><p>To view, visit <a href="https://review.coreboot.org/21451">change 21451</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/21451"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I194b4c790b3e35353d480d34b60507a00f10ef11 </div>
<div style="display:none"> Gerrit-Change-Number: 21451 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>