amd/pi/hudson: Add fanless SMU firmware to build

Use the new parameters in amdfwtool to include the additional SMU
firmware into amdfw.rom.

Change-Id: Ib44860780c8d5fb00c47f775a2a83b82ff3e1821
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/19002
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc
index 155b39e..78d66ae 100644
--- a/src/southbridge/amd/pi/hudson/Makefile.inc
+++ b/src/southbridge/amd/pi/hudson/Makefile.inc
@@ -124,6 +124,7 @@
 
 ###8
 CONFIG_SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE).sbin
+CONFIG_SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin
 
 ###95
 CONFIG_SMUSCS_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuScs$(FIRMWARE_TYPE).bin
@@ -152,6 +153,7 @@
 ###18
 ifeq ($(CONFIG_CPU_AMD_PI_00670F00), y)
 CONFIG_SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE).sbin
+CONFIG_SMUFIRMWARE2_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE)_FN.sbin
 else ifeq ($(CONFIG_CPU_AMD_PI_00660F01), y)
 CONFIG_SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_$(FIRMWARE_TYPE).sbin
 endif
@@ -171,6 +173,7 @@
 	CONFIG_2AMD_PUBKEY_FILE      =$(CONFIG_AMD_PUBKEY_FILE)
 	CONFIG_2PSPBTLDR_FILE        =$(CONFIG_PSPBTLDR_FILE)
 	CONFIG_2SMUFWM_FILE          =$(CONFIG_SMUFWM_FILE)
+	CONFIG_2SMUFWM_FN_FILE       =$(CONFIG_SMUFWM_FN_FILE)
 	CONFIG_2PSPRCVR_FILE         =$(CONFIG_PSPRCVR_FILE)
 	CONFIG_2PUBSIGNEDKEY_FILE    =$(CONFIG_PUBSIGNEDKEY_FILE)
 	CONFIG_2PSPSCUREOS_FILE      =$(CONFIG_PSPSCUREOS_FILE)
@@ -179,6 +182,7 @@
 	CONFIG_2PSPTRUSTLETS_FILE    =$(CONFIG_PSPTRUSTLETS_FILE)
 	CONFIG_2TRUSTLETKEY_FILE     =$(CONFIG_TRUSTLETKEY_FILE)
 	CONFIG_2SMUFIRMWARE2_FILE    =$(CONFIG_SMUFIRMWARE2_FILE)
+	CONFIG_2SMUFIRMWARE2_FN_FILE =$(CONFIG_SMUFIRMWARE2_FN_FILE)
 	CONFIG_2SMUSCS_FILE          =$(CONFIG_SMUSCS_FILE)
 
 	OPT_2AMD_PUBKEY_FILE=$(call add_opt_prefix, $(CONFIG_2AMD_PUBKEY_FILE), --pubkey2)
@@ -193,6 +197,8 @@
 	OPT_2TRUSTLETKEY_FILE=$(call add_opt_prefix, $(CONFIG_2TRUSTLETKEY_FILE), --trustletkey2)
 	OPT_2SMUFIRMWARE2_FILE=$(call add_opt_prefix, $(CONFIG_2SMUFIRMWARE2_FILE), --smufirmware2_2)
 	OPT_2SMUSCS_FILE=$(call add_opt_prefix, $(CONFIG_2SMUSCS_FILE), --smuscs2)
+	OPT_2SMUFWM_FN_FILE=$(call add_opt_prefix, $(CONFIG_2SMUFWM_FN_FILE), --smufnfirmware_2)
+	OPT_2SMUFIRMWARE2_FN_FILE=$(call add_opt_prefix, $(CONFIG_2SMUFIRMWARE2_FN_FILE), --smufnfirmware2_2)
 else
 	OPT_AMD_PUBKEY_FILE=$(call add_opt_prefix, $(CONFIG_AMD_PUBKEY_FILE), --pubkey)
 	OPT_PSPBTLDR_FILE=$(call add_opt_prefix, $(CONFIG_PSPBTLDR_FILE), --bootloader)
@@ -227,6 +233,7 @@
 			$(call strip_quotes, $(CONFIG_2PUBSIGNEDKEY_FILE)) \
 			$(call strip_quotes, $(CONFIG_2PSPBTLDR_FILE)) \
 			$(call strip_quotes, $(CONFIG_2SMUFWM_FILE)) \
+			$(call strip_quotes, $(CONFIG_2SMUFWM_FN_FILE)) \
 			$(call strip_quotes, $(CONFIG_2PSPRCVR_FILE)) \
 			$(call strip_quotes, $(CONFIG_2PSPSCUREOS_FILE)) \
 			$(call strip_quotes, $(CONFIG_2PSPNVRAM_FILE)) \
@@ -235,6 +242,7 @@
 			$(call strip_quotes, $(CONFIG_2PSPTRUSTLETS_FILE)) \
 			$(call strip_quotes, $(CONFIG_2TRUSTLETKEY_FILE)) \
 			$(call strip_quotes, $(CONFIG_2SMUFIRMWARE2_FILE)) \
+			$(call strip_quotes, $(CONFIG_2SMUFIRMWARE2_FN_FILE)) \
 			$(AMDFWTOOL)
 	rm -f $@
 	@printf "    AMDFWTOOL  $(subst $(obj)/,,$(@))\n"
@@ -257,6 +265,7 @@
 		$(OPT_2AMD_PUBKEY_FILE) \
 		$(OPT_2PSPBTLDR_FILE) \
 		$(OPT_2SMUFWM_FILE) \
+		$(OPT_2SMUFWM_FN_FILE) \
 		$(OPT_2PSPRCVR_FILE) \
 		$(OPT_2PUBSIGNEDKEY_FILE) \
 		$(OPT_2PSPSCUREOS_FILE) \
@@ -265,6 +274,7 @@
 		$(OPT_2PSPTRUSTLETS_FILE) \
 		$(OPT_2TRUSTLETKEY_FILE) \
 		$(OPT_2SMUFIRMWARE2_FILE) \
+		$(OPT_2SMUFIRMWARE2_FN_FILE) \
 		$(OPT_2SMUSCS_FILE) \
 		--flashsize $(CONFIG_ROM_SIZE) \
 		--output	$@