[coreboot-gerrit] Change in coreboot[master]: [Test] mb/google/poppy/variants/nami: Add support model specific VBT ...

[Ivy Jian (Code Review)]

Ivy Jian has uploaded this change for review. ( https://review.coreboot.org/26212


Change subject: [Test] mb/google/poppy/variants/nami: Add support model specific VBT on NAMI based projects.
......................................................................

[Test]
mb/google/poppy/variants/nami: Add support model specific VBT on NAMI based projects.

Change-Id: Ib90dc65a131179648770564ccd79e2b6fd25e4e8
Signed-off-by: ivy_jian <ivy_jian at compal.corp-partner.google.com>
---
M src/mainboard/google/poppy/Kconfig
M src/mainboard/google/poppy/variants/nami/Makefile.inc
M src/mainboard/google/poppy/variants/nami/include/variant/sku.h
M src/mainboard/google/poppy/variants/nami/mainboard.c
4 files changed, 29 insertions(+), 0 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/26212/1

diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index be5e3ca..68c6f02 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -114,6 +114,10 @@
 	string "OEM ID table"
 	default ""
 
+config VBT_FILE_PANTHEON
+	string "pantheon model specific vbt"
+	default ""
+
 config TPM_TIS_ACPI_INTERRUPT
 	int
 	default 64  # GPE0_DW2_00 (GPP_E0)
diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.inc b/src/mainboard/google/poppy/variants/nami/Makefile.inc
index dc43619..c1f4baf 100644
--- a/src/mainboard/google/poppy/variants/nami/Makefile.inc
+++ b/src/mainboard/google/poppy/variants/nami/Makefile.inc
@@ -38,3 +38,9 @@
 cbfs-files-y += oem.bin
 oem.bin-file := $(call strip_quotes,$(CONFIG_OEM_BIN_FILE))
 oem.bin-type := raw
+
+# Add model-specific VBT 
+cbfs-files-y += vbt-pantheon.bin
+vbt-pantheon.bin-file := $(call strip_quotes,$(CONFIG_VBT_FILE_PANTHEON))
+vbt-pantheon.bin-type := raw
+vbt-pantheon.bin-compression := lzma
diff --git a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h
index 3b67b56..aa16999 100644
--- a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h
+++ b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h
@@ -20,5 +20,7 @@
 #define SKU_0_NAMI	0x3A7B
 #define SKU_1_VAYNE	0x3A63
 #define SKU_2_VAYNE	0x3A7F
+#define SKU_0_PANTHEON	0x3F63
+#define SKU_1_PANTHEON	0x3F67
 
 #endif /* __MAINBOARD_SKU_H__ */
diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c
index bb77b6e..afc80b5 100644
--- a/src/mainboard/google/poppy/variants/nami/mainboard.c
+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c
@@ -26,6 +26,7 @@
 #include <soc/ramstage.h>
 #include <string.h>
 #include <variant/sku.h>
+#include <drivers/intel/gma/opregion.h>
 
 uint32_t variant_board_sku(void)
 {
@@ -139,3 +140,19 @@
 
 	return manuf;
 }
+
+const char *mainboard_vbt_filename(void)
+{
+        uint32_t sku_id = variant_board_sku();
+
+        switch (sku_id) {
+        case SKU_0_PANTHEON:
+        case SKU_1_PANTHEON:
+                return "vbt-pantheon.bin";
+                break;
+        default:
+                return "vbt.bin";
+                break;
+        }
+}
+

-- 
To view, visit https://review.coreboot.org/26212
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib90dc65a131179648770564ccd79e2b6fd25e4e8
Gerrit-Change-Number: 26212
Gerrit-PatchSet: 1
Gerrit-Owner: Ivy Jian <ivy_jian at compal.corp-partner.google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180510/4b3ebb0c/attachment.html>