[coreboot-gerrit] Change in coreboot[master]: amdfwtool: Apply the change of config file to hudson

[Bao Zheng (Code Review)]

Hello Zheng Bao,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/45288

to review the following change.

Change subject: amdfwtool: Apply the change of config file to hudson
......................................................................

amdfwtool: Apply the change of config file to hudson

Change-Id: Id953c3e4b5c075815d4cc86bc8cd7ca0ebdf6de7
Signed-off-by: Zheng Bao 
---
M src/southbridge/amd/pi/hudson/Kconfig
M src/southbridge/amd/pi/hudson/Makefile.inc
2 files changed, 12 insertions(+), 30 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/45288/1

diff --git a/src/southbridge/amd/pi/hudson/Kconfig b/src/southbridge/amd/pi/hudson/Kconfig
index b569690..94418a8 100644
--- a/src/southbridge/amd/pi/hudson/Kconfig
+++ b/src/southbridge/amd/pi/hudson/Kconfig
@@ -63,6 +63,11 @@
    bool
    default y if CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01

+config AMDFW_CONFIG_FILE
+	string
+	string "AMD PSP Firmware config file"
+	default "3rdparty/blobs/southbridge/amd/avalon/PSP/fw.cfg" if CPU_AMD_PI_00730F01
+
 config HUDSON_XHCI_FWM_FILE
    string "XHCI firmware path and filename"
    default "3rdparty/blobs/southbridge/amd/avalon/xhci.bin" if SOUTHBRIDGE_AMD_PI_AVALON
diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc
index bf8292b..9ad1954 100644
--- a/src/southbridge/amd/pi/hudson/Makefile.inc
+++ b/src/southbridge/amd/pi/hudson/Makefile.inc
@@ -78,10 +78,10 @@
 ifeq ($(CONFIG_HUDSON_PSP), y)

ifeq ($(CONFIG_CPU_AMD_PI_00730F01), y)
-FIRMWARE_LOCATE=$(dir $(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)))
+FIRMWARE_LOCATE=$(dir $(call strip_quotes, $(CONFIG_AMDFW_CONFIG_FILE)))
 FIRMWARE_TYPE=

-PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader.Bypass.sbin
+#PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader.Bypass.sbin
 #PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspRecovery.sbin
 #PSPSCUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureOs.sbin
 #PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATE)/trustlets.bin
@@ -102,9 +102,9 @@

#PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/RtmPubSigned$(FIRMWARE_TYPE).key
 #PSPNVRAM_FILE=$(top)/$(FIRMWARE_LOCATE)/PspNvram$(FIRMWARE_TYPE).bin
-SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE).sbin
-SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin
-SMUSCS_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuScs$(FIRMWARE_TYPE).bin
+#SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE).sbin
+#SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin
+#SMUSCS_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuScs$(FIRMWARE_TYPE).bin
 #PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureDebug$(FIRMWARE_TYPE).Key

endif
@@ -131,18 +131,6 @@
 $(obj)/amdfw.rom:	$(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \
    		$(call strip_quotes, $(CONFIG_HUDSON_IMC_FWM_FILE)) \
    		$(call strip_quotes, $(CONFIG_HUDSON_GEC_FWM_FILE)) \
-			$(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)) \
-			$(call strip_quotes, $(PUBSIGNEDKEY_FILE)) \
-			$(call strip_quotes, $(PSPBTLDR_FILE)) \
-			$(call strip_quotes, $(PSPRCVR_FILE)) \
-			$(call strip_quotes, $(PSPSCUREOS_FILE)) \
-			$(call strip_quotes, $(PSPNVRAM_FILE)) \
-			$(call strip_quotes, $(SMUFWM_FILE)) \
-			$(call strip_quotes, $(SMUSCS_FILE)) \
-			$(call strip_quotes, $(PSPSECUREDEBUG_FILE)) \
-			$(call strip_quotes, $(PSPTRUSTLETS_FILE)) \
-			$(call strip_quotes, $(TRUSTLETKEY_FILE)) \
-			$(call strip_quotes, $(SMUFIRMWARE2_FILE)) \
    		$(call strip_quotes, $(AMD_PUBKEY2_FILE)) \
    		$(call strip_quotes, $(PUBSIGNEDKEY2_FILE)) \
    		$(call strip_quotes, $(PSPBTLDR2_FILE)) \
@@ -164,18 +152,6 @@
    	$(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) \
@@ -192,6 +168,7 @@
    	$(OPT_2SMUSCS_FILE) \
    	--flashsize $(CONFIG_ROM_SIZE) \
    	--location $(HUDSON_FWM_POSITION) \
+		--config $(CONFIG_AMDFW_CONFIG_FILE) \
    	--output	$@

ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y)
@@ -205,7 +182,7 @@

else # ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y)

-#cbfs-files-y += apu/amdfw
+cbfs-files-y += apu/amdfw
 apu/amdfw-file := $(obj)/amdfw.rom
 apu/amdfw-position := $(HUDSON_FWM_POSITION)
 apu/amdfw-type := raw