[coreboot-gerrit] Change in coreboot[master]: soc/amd/stoneyridge: Change default locations for blobs

[Marshall Dawson (Code Review)]

Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37222 )

Change subject: soc/amd/stoneyridge: Change default locations for blobs
......................................................................

soc/amd/stoneyridge: 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 
---
M src/soc/amd/stoneyridge/Kconfig
M src/vendorcode/amd/pi/Kconfig
2 files changed, 9 insertions(+), 9 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/37222/1

diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index c477e03..2fe3ef7 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -177,8 +177,8 @@
 config VGA_BIOS_FILE
    string
    default "" if !USE_AMD_BLOBS
-	default "3rdparty/blobs/soc/amd/merlinfalcon/VBIOS.bin" if AMD_APU_MERLINFALCON
-	default "3rdparty/blobs/soc/amd/stoneyridge/VBIOS.bin"
+	default "3rdparty/amd_blobs/stoneyridge/CarrizoGenericVbios.bin" if AMD_APU_MERLINFALCON
+	default "3rdparty/amd_blobs/stoneyridge/StoneyGenericVbios.bin"

config S3_VGA_ROM_RUN
    bool
@@ -218,7 +218,7 @@
 config STONEYRIDGE_XHCI_FWM_FILE
    string "XHCI firmware path and filename"
    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

config STONEYRIDGE_GEC_FWM_FILE
@@ -228,8 +228,8 @@
 config AMD_PUBKEY_FILE
    string "AMD public Key"
    default "" if !USE_AMD_BLOBS
-	default "3rdparty/blobs/soc/amd/merlinfalcon/PSP/AmdPubKeyCZ.bin" if AMD_APU_MERLINFALCON
-	default "3rdparty/blobs/soc/amd/stoneyridge/PSP/AmdPubKeyST.bin"
+	default "3rdparty/amd_blobs/stoneyridge/PSP/CZ/AmdPubKeyCZ.bin" if AMD_APU_MERLINFALCON
+	default "3rdparty/amd_blobs/stoneyridge/PSP/ST/AmdPubKeyST.bin"

config STONEYRIDGE_SATA_MODE
    int "SATA Mode"
diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig
index 0605563..9f5d94d 100644
--- a/src/vendorcode/amd/pi/Kconfig
+++ b/src/vendorcode/amd/pi/Kconfig
@@ -44,10 +44,10 @@
    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/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
-	default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && !HAVE_MERLINFALCON_BINARIES
-	default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FP4
-	default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FT4
+	default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && HAVE_MERLINFALCON_BINARIES
+	default "3rdparty/amd_blobs/stoneyridge/pi/CZ/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON
+	default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FP4
+	default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FT4
    default "3rdparty/blobs/pi/amd/00660F01/FP4/AGESA.bin" if CPU_AMD_PI_00660F01
    help
      Specify the binary file to use for AMD platform initialization.