Fred Reitberger has submitted this change. ( https://review.coreboot.org/c/coreboot/+/72457 )
Change subject: soc/amd/*: Add SOC_NAME in fw.cfg(s) ......................................................................
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 fishbaozi@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/72457 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Fred Reitberger reitbergerfred@gmail.com --- M src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg M src/mainboard/google/skyrim/amdfw.cfg M src/soc/amd/cezanne/fw.cfg M src/soc/amd/common/Makefile.inc M src/soc/amd/glinda/fw.cfg M src/soc/amd/mendocino/fw.cfg M src/soc/amd/phoenix/fw.cfg M src/soc/amd/picasso/fw.cfg M src/soc/amd/stoneyridge/fw_cz.cfg M src/soc/amd/stoneyridge/fw_st.cfg 10 files changed, 27 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Fred Reitberger: Looks good to me, approved
diff --git a/src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg b/src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg index fc7d1a4..408ac5f 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 446f0eb..90eceb3 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 372d371..36b45ca 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 3130a0c..dc782c9 100644 --- a/src/soc/amd/common/Makefile.inc +++ b/src/soc/amd/common/Makefile.inc @@ -11,7 +11,7 @@
# 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 7fb5e8c..11908df 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 e7a6576..cf3a446 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 4c10178..4ee4cd4 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 c9db4b6..dda700a 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 a6a22f7..09a0032 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 01db8b9..049242b 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
-
Fred Reitberger (Code Review)