<p>Patrick Georgi has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21907">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/*lake: Load vbt when it's needed<br><br>That removes the need for another global variable.<br><br>Change-Id: I25e12ba724836de4c8afb25cd347cafe6df8cea9<br>Signed-off-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M src/soc/intel/apollolake/chip.c<br>M src/soc/intel/cannonlake/chip.c<br>2 files changed, 2 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/21907/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c<br>index f122876..405a45c 100644<br>--- a/src/soc/intel/apollolake/chip.c<br>+++ b/src/soc/intel/apollolake/chip.c<br>@@ -48,8 +48,6 @@<br> <br> #include "chip.h"<br> <br>-static void *vbt;<br>-<br> static const char *soc_acpi_name(const struct device *dev)<br> {<br>  if (dev->path.type == DEVICE_PATH_DOMAIN)<br>@@ -315,9 +313,6 @@<br> {<br>         struct global_nvs_t *gnvs;<br> <br>-        /* Save VBT info and mapping */<br>-      vbt = vbt_get();<br>-<br>   /* Snapshot the current GPIO IRQ polarities. FSP is setting a<br>          * default policy that doesn't honor boards' requirements. */<br>         itss_snapshot_irq_polarities(GPIO_IRQ_START, GPIO_IRQ_END);<br>@@ -534,7 +529,7 @@<br>      static struct soc_intel_apollolake_config *cfg;<br> <br>    /* Load VBT before devicetree-specific config. */<br>-    silconfig->GraphicsConfigPtr = (uintptr_t)vbt;<br>+    silconfig->GraphicsConfigPtr = (uintptr_t)vbt_get();<br> <br>    struct device *dev = SA_DEV_ROOT;<br> <br>diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c<br>index 57a3224..39e8e8b 100644<br>--- a/src/soc/intel/cannonlake/chip.c<br>+++ b/src/soc/intel/cannonlake/chip.c<br>@@ -25,8 +25,6 @@<br> #include <soc/ramstage.h><br> #include <string.h><br> <br>-static void *vbt;<br>-<br> #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)<br> static const char *soc_acpi_name(const struct device *dev)<br> {<br>@@ -180,11 +178,8 @@<br>         /* Parse device tree and enable/disable devices */<br>    parse_devicetree(params);<br> <br>- /* Save VBT info and mapping */<br>-      vbt = vbt_get();<br>-<br>   /* Load VBT before devicetree-specific config. */<br>-    params->GraphicsConfigPtr = (uintptr_t)vbt;<br>+       params->GraphicsConfigPtr = (uintptr_t)vbt_get();<br> <br>       /* Set USB OC pin to 0 first */<br>       for (i = 0; i < ARRAY_SIZE(params->Usb2OverCurrentPin); i++) {<br></pre><p>To view, visit <a href="https://review.coreboot.org/21907">change 21907</a>. To unsubscribe, 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/21907"/><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: I25e12ba724836de4c8afb25cd347cafe6df8cea9 </div>
<div style="display:none"> Gerrit-Change-Number: 21907 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Georgi <pgeorgi@google.com> </div>