<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20448">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drivers/fsp1_1: remove VBT function defs from util.h<br><br>Including <fsp/gop.h> in util.h causes issues with<br>redeclarations when using SOC_INTEL_COMMON_GFX_OPREGION<br>along with FSP 1.1.  Separating it out and including<br>directly in vbt.c has no negative side effects.<br><br>Change-Id: I2d82c2da40b067272d876929fc73b97f490146a7<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/drivers/intel/fsp1_1/include/fsp/util.h<br>M src/drivers/intel/fsp1_1/vbt.c<br>2 files changed, 1 insertion(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/20448/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/drivers/intel/fsp1_1/include/fsp/util.h b/src/drivers/intel/fsp1_1/include/fsp/util.h<br>index 8f55256..ffc43bc 100644<br>--- a/src/drivers/intel/fsp1_1/include/fsp/util.h<br>+++ b/src/drivers/intel/fsp1_1/include/fsp/util.h<br>@@ -21,7 +21,6 @@<br> #include <fsp/api.h><br> /* Current users expect to get the SoC's FSP definitions by including util.h. */<br> #include <fsp/soc_binding.h><br>-#include <fsp/gop.h><br> #include <program_loading.h><br> #include <commonlib/region.h><br> <br>diff --git a/src/drivers/intel/fsp1_1/vbt.c b/src/drivers/intel/fsp1_1/vbt.c<br>index 5cac150..92a4c91 100644<br>--- a/src/drivers/intel/fsp1_1/vbt.c<br>+++ b/src/drivers/intel/fsp1_1/vbt.c<br>@@ -17,6 +17,7 @@<br> #include <bootmode.h><br> #include <cbfs.h><br> #include <console/console.h><br>+#include <fsp/gop.h><br> #include <fsp/ramstage.h><br> #include <fsp/util.h><br> <br></pre><p>To view, visit <a href="https://review.coreboot.org/20448">change 20448</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/20448"/><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: I2d82c2da40b067272d876929fc73b97f490146a7 </div>
<div style="display:none"> Gerrit-Change-Number: 20448 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>