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

amd_blobs: Always set default paths 

Don't make the default paths to AMD blobs depend on USE_AMD_BLOBS. This
way we get error messages about the missing files when the blobs repos
aren't checked out.

Change-Id: I754fdc5e1414c8a3dc88b364bcfbea9a26b59eb0
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38044
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Nico Huber 2020-01-01 15:53:41 +01:00 committed by Felix Held
parent f9f129a5dc
commit aa5ff5a0fc
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,6 @@ config VGA_BIOS_ID
config VGA_BIOS_FILE config VGA_BIOS_FILE
string string
default "" if !USE_AMD_BLOBS
default "3rdparty/amd_blobs/stoneyridge/CarrizoGenericVbios.bin" if AMD_APU_MERLINFALCON default "3rdparty/amd_blobs/stoneyridge/CarrizoGenericVbios.bin" if AMD_APU_MERLINFALCON
default "3rdparty/amd_blobs/stoneyridge/StoneyGenericVbios.bin" if AMD_APU_PRAIRIEFALCON default "3rdparty/amd_blobs/stoneyridge/StoneyGenericVbios.bin" if AMD_APU_PRAIRIEFALCON
default "3rdparty/amd_blobs/stoneyridge/StoneyGenericVbios.bin" if AMD_APU_STONEYRIDGE default "3rdparty/amd_blobs/stoneyridge/StoneyGenericVbios.bin" if AMD_APU_STONEYRIDGE
@ -183,7 +182,6 @@ 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 "3rdparty/amd_blobs/stoneyridge/xhci.bin" default "3rdparty/amd_blobs/stoneyridge/xhci.bin"
depends on STONEYRIDGE_XHCI_FWM depends on STONEYRIDGE_XHCI_FWM
@ -194,7 +192,6 @@ config STONEYRIDGE_GEC_FWM_FILE
config AMDFW_CONFIG_FILE config AMDFW_CONFIG_FILE
string string
string "AMD PSP Firmware config file" string "AMD PSP Firmware config file"
default "" if !USE_AMD_BLOBS
default "src/soc/amd/stoneyridge/fw_cz.cfg" if AMD_APU_MERLINFALCON default "src/soc/amd/stoneyridge/fw_cz.cfg" if AMD_APU_MERLINFALCON
default "src/soc/amd/stoneyridge/fw_st.cfg" if AMD_APU_PRAIRIEFALCON default "src/soc/amd/stoneyridge/fw_st.cfg" if AMD_APU_PRAIRIEFALCON
default "src/soc/amd/stoneyridge/fw_st.cfg" if AMD_APU_STONEYRIDGE default "src/soc/amd/stoneyridge/fw_st.cfg" if AMD_APU_STONEYRIDGE

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

@ -42,9 +42,9 @@ 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/amd_blobs/stoneyridge/pi/CZ/\$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_MERLINFALCON && USE_AMD_BLOBS default "3rdparty/amd_blobs/stoneyridge/pi/CZ/\$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_MERLINFALCON
default "3rdparty/amd_blobs/stoneyridge/pi/ST/\$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_PRAIRIEFALCON && USE_AMD_BLOBS default "3rdparty/amd_blobs/stoneyridge/pi/ST/\$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_PRAIRIEFALCON
default "3rdparty/amd_blobs/stoneyridge/pi/ST/\$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_STONEYRIDGE && USE_AMD_BLOBS default "3rdparty/amd_blobs/stoneyridge/pi/ST/\$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_STONEYRIDGE
help help
Specify the binary file to use for AMD platform initialization. Specify the binary file to use for AMD platform initialization.
@ -68,7 +68,7 @@ config AGESA_SPLIT_MEMORY_FILES
config AGESA_PRE_MEMORY_BINARY_PI_FILE config AGESA_PRE_MEMORY_BINARY_PI_FILE
string "Pre memory Binary PI file name" string "Pre memory Binary PI file name"
depends on AGESA_SPLIT_MEMORY_FILES depends on AGESA_SPLIT_MEMORY_FILES
default "3rdparty/blobs/pi/amd/00670F00/FT4/AGESA_premem.elf" if SOC_AMD_STONEYRIDGE && USE_AMD_BLOBS default "3rdparty/blobs/pi/amd/00670F00/FT4/AGESA_premem.elf" if SOC_AMD_STONEYRIDGE
help help
Specify the binary file to use for pre-memory AMD platform Specify the binary file to use for pre-memory AMD platform
initialization. initialization.
@ -76,7 +76,7 @@ config AGESA_PRE_MEMORY_BINARY_PI_FILE
config AGESA_POST_MEMORY_BINARY_PI_FILE config AGESA_POST_MEMORY_BINARY_PI_FILE
string "Post memory Binary PI file name" string "Post memory Binary PI file name"
depends on AGESA_SPLIT_MEMORY_FILES depends on AGESA_SPLIT_MEMORY_FILES
default "3rdparty/blobs/pi/amd/00670F00/FT4/AGESA_postmem.elf" if SOC_AMD_STONEYRIDGE && USE_AMD_BLOBS default "3rdparty/blobs/pi/amd/00670F00/FT4/AGESA_postmem.elf" if SOC_AMD_STONEYRIDGE
help help
Specify the binary file to use for post-memory AMD platform Specify the binary file to use for post-memory AMD platform
initialization. initialization.