Change in coreboot[master]: soc/amd/stoneyridge: Use multiple VBIOS images

[Richard Spiegel (Code Review)]

Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/27643

Change subject: soc/amd/stoneyridge: Use multiple VBIOS images
......................................................................

soc/amd/stoneyridge: Use multiple VBIOS images

The careena board required a different setting within VBIOS in order to
pass eDP eye diagram test, creating the possibility that different boards
might need different VBIOS images. Prepare the framework for multiple VBIOS
images, use the newer VBIOS for all grunt variants (until a new board needs
something different) while maintaining the original one for gardenia.

BUG=b:111673328
TEST=Change VBIOS_015_049_000_017.bin name, build grunt, fails. Return
original name, build grunt, success.

Change-Id: I268cd3dbce6ba1f7bd781d768f470463846a4e10
Signed-off-by: Richard Spiegel 
---
M 3rdparty/blobs
M src/mainboard/amd/gardenia/Kconfig
M src/mainboard/google/kahlee/Kconfig
M src/soc/amd/stoneyridge/Kconfig
4 files changed, 10 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/27643/1

diff --git a/3rdparty/blobs b/3rdparty/blobs
index 3854ad2..4f466ab 160000
--- a/3rdparty/blobs
+++ b/3rdparty/blobs
@@ -1 +1 @@
-Subproject commit 3854ad29e7b767001d4f6dd93eba0d79aedda9c3
+Subproject commit 4f466ab06f44a1fc3c5ac42fecd8232b7f28b872
diff --git a/src/mainboard/amd/gardenia/Kconfig b/src/mainboard/amd/gardenia/Kconfig
index 5d74768..091fad1 100644
--- a/src/mainboard/amd/gardenia/Kconfig
+++ b/src/mainboard/amd/gardenia/Kconfig
@@ -49,4 +49,8 @@
    bool
    default y

+config VGA_BIOS_FILE_BLOB
+	string
+	default "soc/amd/stoneyridge/VBIOS.bin"
+
 endif # BOARD_AMD_GARDENIA
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index 11cb891..d00fd92 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -51,6 +51,10 @@
    string
    default google/kahlee

+config VGA_BIOS_FILE_BLOB
+	string
+	default "mainboard/google/kahlee/VBIOS_015_049_000_017.bin"
+
 config VARIANT_DIR
    string
    default "aleena" if BOARD_GOOGLE_ALEENA
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index 05c3043..363eec4 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -137,7 +137,7 @@

config VGA_BIOS_FILE
    string
-	default "3rdparty/blobs/soc/amd/stoneyridge/VBIOS.bin"
+	default "3rdparty/blobs/$(VGA_BIOS_FILE_BLOB)"

config S3_VGA_ROM_RUN
    bool