GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/stoneyridge|vc: Change default locations for blobs 

Set the default location strings to point to the 3rdparty/amd_blobs
files.

Change-Id: I5426b8de2501ba55843efc1cda4b03bc3768f8cb
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37222
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
This commit is contained in:
Marshall Dawson 2019-11-25 08:29:28 -07:00 committed by Patrick Georgi
parent fd6fb289ce
commit 7987c1cb6f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/soc/amd/stoneyridge/Kconfig
View File

@ -175,8 +175,8 @@ config VGA_BIOS_ID
config VGA_BIOS_FILE config VGA_BIOS_FILE
string string
default "" if !USE_AMD_BLOBS default "" if !USE_AMD_BLOBS
default "3rdparty/blobs/soc/amd/merlinfalcon/VBIOS.bin" if AMD_APU_MERLINFALCON default "3rdparty/amd_blobs/stoneyridge/CarrizoGenericVbios.bin" if AMD_APU_MERLINFALCON
default "3rdparty/blobs/soc/amd/stoneyridge/VBIOS.bin" default "3rdparty/amd_blobs/stoneyridge/StoneyGenericVbios.bin"
config S3_VGA_ROM_RUN config S3_VGA_ROM_RUN
bool bool
@ -216,7 +216,7 @@ config STONEYRIDGE_GEC_FWM
config STONEYRIDGE_XHCI_FWM_FILE config STONEYRIDGE_XHCI_FWM_FILE
string "XHCI firmware path and filename" string "XHCI firmware path and filename"
default "" if !USE_AMD_BLOBS default "" if !USE_AMD_BLOBS
default "3rdparty/blobs/soc/amd/stoneyridge/xhci.bin" default "3rdparty/amd_blobs/stoneyridge/xhci.bin"
depends on STONEYRIDGE_XHCI_FWM depends on STONEYRIDGE_XHCI_FWM
config STONEYRIDGE_GEC_FWM_FILE config STONEYRIDGE_GEC_FWM_FILE
@ -226,8 +226,8 @@ config STONEYRIDGE_GEC_FWM_FILE
config AMD_PUBKEY_FILE config AMD_PUBKEY_FILE
string "AMD public Key" string "AMD public Key"
default "" if !USE_AMD_BLOBS default "" if !USE_AMD_BLOBS
default "3rdparty/blobs/soc/amd/merlinfalcon/PSP/AmdPubKeyCZ.bin" if AMD_APU_MERLINFALCON default "3rdparty/amd_blobs/stoneyridge/PSP/CZ/AmdPubKeyCZ.bin" if AMD_APU_MERLINFALCON
default "3rdparty/blobs/soc/amd/stoneyridge/PSP/AmdPubKeyST.bin" default "3rdparty/amd_blobs/stoneyridge/PSP/ST/AmdPubKeyST.bin"
config STONEYRIDGE_SATA_MODE config STONEYRIDGE_SATA_MODE
int "SATA Mode" int "SATA Mode"

8
src/vendorcode/amd/pi/Kconfig
View File

@ -44,10 +44,10 @@ config AGESA_BINARY_PI_FILE
string "AGESA PI binary file name" string "AGESA PI binary file name"
default "3rdparty/blobs/pi/amd/00630F01/FP3/AGESA.bin" if CPU_AMD_PI_00630F01 default "3rdparty/blobs/pi/amd/00630F01/FP3/AGESA.bin" if CPU_AMD_PI_00630F01
default "3rdparty/blobs/pi/amd/00730F01/FT3b/AGESA.bin" if CPU_AMD_PI_00730F01 default "3rdparty/blobs/pi/amd/00730F01/FT3b/AGESA.bin" if CPU_AMD_PI_00730F01
default "3rdparty/blobs/pi/amd/merlinfalcon/$(CONFIG_AMD_SOC_PACKAGE)/AGESA_CZ_FP4.bin" if SOC_AMD_MERLINFALCON && HAVE_MERLINFALCON_BINARIES && USE_AMD_BLOBS default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && HAVE_MERLINFALCON_BINARIES && USE_AMD_BLOBS
default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && !HAVE_MERLINFALCON_BINARIES && USE_AMD_BLOBS default "3rdparty/amd_blobs/stoneyridge/pi/CZ/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && USE_AMD_BLOBS
default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FP4 && USE_AMD_BLOBS default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FP4 && USE_AMD_BLOBS
default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FT4 && USE_AMD_BLOBS default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FT4 && USE_AMD_BLOBS
default "3rdparty/blobs/pi/amd/00660F01/FP4/AGESA.bin" if CPU_AMD_PI_00660F01 default "3rdparty/blobs/pi/amd/00660F01/FP4/AGESA.bin" if CPU_AMD_PI_00660F01
help help
Specify the binary file to use for AMD platform initialization. Specify the binary file to use for AMD platform initialization.