<p>Ivy Jian has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26212">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[Test]<br>mb/google/poppy/variants/nami: Add support model specific VBT on NAMI based projects.<br><br>Change-Id: Ib90dc65a131179648770564ccd79e2b6fd25e4e8<br>Signed-off-by: ivy_jian <ivy_jian@compal.corp-partner.google.com><br>---<br>M src/mainboard/google/poppy/Kconfig<br>M src/mainboard/google/poppy/variants/nami/Makefile.inc<br>M src/mainboard/google/poppy/variants/nami/include/variant/sku.h<br>M src/mainboard/google/poppy/variants/nami/mainboard.c<br>4 files changed, 29 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/26212/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig</span><br><span>index be5e3ca..68c6f02 100644</span><br><span>--- a/src/mainboard/google/poppy/Kconfig</span><br><span>+++ b/src/mainboard/google/poppy/Kconfig</span><br><span>@@ -114,6 +114,10 @@</span><br><span>         string "OEM ID table"</span><br><span>      default ""</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config VBT_FILE_PANTHEON</span><br><span style="color: hsl(120, 100%, 40%);">+    string "pantheon model specific vbt"</span><br><span style="color: hsl(120, 100%, 40%);">+        default ""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config TPM_TIS_ACPI_INTERRUPT</span><br><span>      int</span><br><span>  default 64  # GPE0_DW2_00 (GPP_E0)</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.inc b/src/mainboard/google/poppy/variants/nami/Makefile.inc</span><br><span>index dc43619..c1f4baf 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/Makefile.inc</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/Makefile.inc</span><br><span>@@ -38,3 +38,9 @@</span><br><span> cbfs-files-y += oem.bin</span><br><span> oem.bin-file := $(call strip_quotes,$(CONFIG_OEM_BIN_FILE))</span><br><span> oem.bin-type := raw</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Add model-specific VBT </span><br><span style="color: hsl(120, 100%, 40%);">+cbfs-files-y += vbt-pantheon.bin</span><br><span style="color: hsl(120, 100%, 40%);">+vbt-pantheon.bin-file := $(call strip_quotes,$(CONFIG_VBT_FILE_PANTHEON))</span><br><span style="color: hsl(120, 100%, 40%);">+vbt-pantheon.bin-type := raw</span><br><span style="color: hsl(120, 100%, 40%);">+vbt-pantheon.bin-compression := lzma</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h</span><br><span>index 3b67b56..aa16999 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h</span><br><span>@@ -20,5 +20,7 @@</span><br><span> #define SKU_0_NAMI   0x3A7B</span><br><span> #define SKU_1_VAYNE   0x3A63</span><br><span> #define SKU_2_VAYNE   0x3A7F</span><br><span style="color: hsl(120, 100%, 40%);">+#define SKU_0_PANTHEON  0x3F63</span><br><span style="color: hsl(120, 100%, 40%);">+#define SKU_1_PANTHEON  0x3F67</span><br><span> </span><br><span> #endif /* __MAINBOARD_SKU_H__ */</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>index bb77b6e..afc80b5 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <soc/ramstage.h></span><br><span> #include <string.h></span><br><span> #include <variant/sku.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <drivers/intel/gma/opregion.h></span><br><span> </span><br><span> uint32_t variant_board_sku(void)</span><br><span> {</span><br><span>@@ -139,3 +140,19 @@</span><br><span> </span><br><span>     return manuf;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const char *mainboard_vbt_filename(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        uint32_t sku_id = variant_board_sku();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        switch (sku_id) {</span><br><span style="color: hsl(120, 100%, 40%);">+        case SKU_0_PANTHEON:</span><br><span style="color: hsl(120, 100%, 40%);">+        case SKU_1_PANTHEON:</span><br><span style="color: hsl(120, 100%, 40%);">+                return "vbt-pantheon.bin";</span><br><span style="color: hsl(120, 100%, 40%);">+                break;</span><br><span style="color: hsl(120, 100%, 40%);">+        default:</span><br><span style="color: hsl(120, 100%, 40%);">+                return "vbt.bin";</span><br><span style="color: hsl(120, 100%, 40%);">+                break;</span><br><span style="color: hsl(120, 100%, 40%);">+        }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26212">change 26212</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26212"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib90dc65a131179648770564ccd79e2b6fd25e4e8 </div>
<div style="display:none"> Gerrit-Change-Number: 26212 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Ivy Jian <ivy_jian@compal.corp-partner.google.com> </div>