From c188936dfe2f384228344d69801e10d97600d748 Mon Sep 17 00:00:00 2001 From: Zheng Bao Date: Wed, 25 Jan 2023 22:50:26 +0800 Subject: [PATCH] soc/amd/*: Add SOC_NAME in fw.cfg(s) 2/5 of split changes of https://review.coreboot.org/c/coreboot/+/58552/28 Change-Id: I18f73462a3995038fe93750320dfc053fec969ba Signed-off-by: Zheng Bao Reviewed-on: https://review.coreboot.org/c/coreboot/+/72457 Tested-by: build bot (Jenkins) Reviewed-by: Fred Reitberger --- src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg | 1 + src/mainboard/google/skyrim/amdfw.cfg | 1 + src/soc/amd/cezanne/fw.cfg | 1 + src/soc/amd/common/Makefile.inc | 2 +- src/soc/amd/glinda/fw.cfg | 1 + src/soc/amd/mendocino/fw.cfg | 1 + src/soc/amd/phoenix/fw.cfg | 1 + src/soc/amd/picasso/fw.cfg | 1 + src/soc/amd/stoneyridge/fw_cz.cfg | 2 ++ src/soc/amd/stoneyridge/fw_st.cfg | 1 + 10 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg b/src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg index fc7d1a43fb..408ac5f827 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg +++ b/src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg @@ -1,6 +1,7 @@ # PSP fw config file FIRMWARE_LOCATION 3rdparty/amd_blobs/cezanne/PSP +SOC_NAME Cezanne # type file # PSP diff --git a/src/mainboard/google/skyrim/amdfw.cfg b/src/mainboard/google/skyrim/amdfw.cfg index 446f0eb4f9..90eceb3d7a 100644 --- a/src/mainboard/google/skyrim/amdfw.cfg +++ b/src/mainboard/google/skyrim/amdfw.cfg @@ -1,6 +1,7 @@ # PSP fw config file FIRMWARE_LOCATION 3rdparty/amd_blobs/mendocino/PSP +SOC_NAME Mendocino # type file # PSP diff --git a/src/soc/amd/cezanne/fw.cfg b/src/soc/amd/cezanne/fw.cfg index 372d371965..36b45caa34 100644 --- a/src/soc/amd/cezanne/fw.cfg +++ b/src/soc/amd/cezanne/fw.cfg @@ -1,6 +1,7 @@ # PSP fw config file FIRMWARE_LOCATION 3rdparty/amd_blobs/cezanne/PSP +SOC_NAME Cezanne # type file # PSP diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc index 3130a0cc58..dc782c99d8 100644 --- a/src/soc/amd/common/Makefile.inc +++ b/src/soc/amd/common/Makefile.inc @@ -11,7 +11,7 @@ FIRMWARE_LOCATION=$(shell grep -e FIRMWARE_LOCATION $(CONFIG_AMDFW_CONFIG_FILE) # Add all the files listed in the config file POUND_SIGN=$(call strip_quotes, "\#") -DEP_FILES= $(patsubst %,$(FIRMWARE_LOCATION)/%, $(shell sed -e /^$(POUND_SIGN)/d -e /*/d -e /^FIRMWARE_LOCATION/d $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}' )) +DEP_FILES= $(patsubst %,$(FIRMWARE_LOCATION)/%, $(shell sed -e /^$(POUND_SIGN)/d -e /*/d -e /^FIRMWARE_LOCATION/d -e /^SOC_NAME/d $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}' )) amd_microcode_bins += $(wildcard ${FIRMWARE_LOCATION}/*UcodePatch_*.bin) diff --git a/src/soc/amd/glinda/fw.cfg b/src/soc/amd/glinda/fw.cfg index 7fb5e8c98f..11908df200 100644 --- a/src/soc/amd/glinda/fw.cfg +++ b/src/soc/amd/glinda/fw.cfg @@ -1,6 +1,7 @@ # PSP fw config file FIRMWARE_LOCATION 3rdparty/amd_blobs/glinda/psp +SOC_NAME Glinda # type file AMD_PUBKEY_FILE TypeId0x00_Root.tkn diff --git a/src/soc/amd/mendocino/fw.cfg b/src/soc/amd/mendocino/fw.cfg index e7a6576462..cf3a446932 100644 --- a/src/soc/amd/mendocino/fw.cfg +++ b/src/soc/amd/mendocino/fw.cfg @@ -1,6 +1,7 @@ # PSP fw config file FIRMWARE_LOCATION 3rdparty/amd_blobs/mendocino/PSP +SOC_NAME Mendocino # type file # PSP diff --git a/src/soc/amd/phoenix/fw.cfg b/src/soc/amd/phoenix/fw.cfg index 4c1017819c..4ee4cd497d 100644 --- a/src/soc/amd/phoenix/fw.cfg +++ b/src/soc/amd/phoenix/fw.cfg @@ -1,6 +1,7 @@ # PSP fw config file FIRMWARE_LOCATION 3rdparty/amd_blobs/phoenix/psp +SOC_NAME Phoenix # type file AMD_PUBKEY_FILE TypeId0x00_Root.tkn diff --git a/src/soc/amd/picasso/fw.cfg b/src/soc/amd/picasso/fw.cfg index c9db4b6d59..dda700a04a 100644 --- a/src/soc/amd/picasso/fw.cfg +++ b/src/soc/amd/picasso/fw.cfg @@ -1,6 +1,7 @@ # PSP fw config file FIRMWARE_LOCATION 3rdparty/amd_blobs/picasso/PSP +SOC_NAME Picasso # type file AMD_PUBKEY_FILE AmdPubKeyRV.bin diff --git a/src/soc/amd/stoneyridge/fw_cz.cfg b/src/soc/amd/stoneyridge/fw_cz.cfg index a6a22f7191..09a0032700 100644 --- a/src/soc/amd/stoneyridge/fw_cz.cfg +++ b/src/soc/amd/stoneyridge/fw_cz.cfg @@ -1,6 +1,8 @@ # PSP fw config file FIRMWARE_LOCATION 3rdparty/amd_blobs/stoneyridge/PSP/CZ +SOC_NAME Carrizo + #PSP AMD_PUBKEY_FILE AmdPubKeyCZ.bin PSPBTLDR_FILE PspBootLoader_prod_CZ.sbin diff --git a/src/soc/amd/stoneyridge/fw_st.cfg b/src/soc/amd/stoneyridge/fw_st.cfg index 01db8b9748..049242b337 100644 --- a/src/soc/amd/stoneyridge/fw_st.cfg +++ b/src/soc/amd/stoneyridge/fw_st.cfg @@ -1,6 +1,7 @@ # PSP fw config file FIRMWARE_LOCATION 3rdparty/amd_blobs/stoneyridge/PSP/ST +SOC_NAME Stoneyridge #XHCI_FWM_FILE xhci.bin #PSP