<p>Patrick Georgi has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21898">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/skylake: use locate_vbt directly instead of calling a wrapper<br><br>Change-Id: I65c423660ab1778f5dd9243e428a4d005bd1699a<br>Signed-off-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M src/drivers/intel/fsp2_0/graphics.c<br>M src/drivers/intel/fsp2_0/include/fsp/util.h<br>M src/soc/intel/skylake/chip_fsp20.c<br>3 files changed, 2 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/21898/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c<br>index f2888e8..f1219ea 100644<br>--- a/src/drivers/intel/fsp2_0/graphics.c<br>+++ b/src/drivers/intel/fsp2_0/graphics.c<br>@@ -94,16 +94,6 @@<br>    return CB_SUCCESS;<br> }<br> <br>-uintptr_t fsp_load_vbt(void)<br>-{<br>- void *vbt_data = locate_vbt();<br>-<br>-    if (vbt_data == NULL)<br>-                printk(BIOS_NOTICE, "Could not locate a VBT file in CBFS\n");<br>-<br>-   return (uintptr_t)vbt_data;<br>-}<br>-<br> int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)<br> {<br>  enum cb_err ret;<br>diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h<br>index 402d48b..6d53fda 100644<br>--- a/src/drivers/intel/fsp2_0/include/fsp/util.h<br>+++ b/src/drivers/intel/fsp2_0/include/fsp/util.h<br>@@ -85,13 +85,6 @@<br> enum cb_err fsp_validate_component(struct fsp_header *hdr,<br>                                        const struct region_device *rdev);<br> <br>-/* Load a vbt.bin file for graphics. Returns 0 if a valid VBT is not found. */<br>-#if IS_ENABLED(CONFIG_RUN_FSP_GOP)<br>-uintptr_t fsp_load_vbt(void);<br>-#else<br>-static inline uintptr_t fsp_load_vbt(void) { return 0; }<br>-#endif<br>-<br> /* Get igd framebuffer bar from SoC */<br> uintptr_t fsp_soc_get_igd_bar(void);<br> <br>diff --git a/src/soc/intel/skylake/chip_fsp20.c b/src/soc/intel/skylake/chip_fsp20.c<br>index b1697ae..6e8ed48 100644<br>--- a/src/soc/intel/skylake/chip_fsp20.c<br>+++ b/src/soc/intel/skylake/chip_fsp20.c<br>@@ -116,9 +116,9 @@<br>   /* Load VBT */<br>        if (is_s3_wakeup) {<br>           printk(BIOS_DEBUG, "S3 resume do not pass VBT to GOP\n");<br>-  } else if (display_init_required()) {<br>+        } else if (display_init_required() && IS_ENABLED(CONFIG_RUN_FSP_GOP)) {<br>               /* Get VBT data */<br>-           vbt_data = fsp_load_vbt();<br>+           vbt_data = (uintptr_t)locate_vbt();<br>           if (vbt_data)<br>                         printk(BIOS_DEBUG, "Passing VBT to GOP\n");<br>                 else<br></pre><p>To view, visit <a href="https://review.coreboot.org/21898">change 21898</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/21898"/><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: I65c423660ab1778f5dd9243e428a4d005bd1699a </div>
<div style="display:none"> Gerrit-Change-Number: 21898 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Georgi <pgeorgi@google.com> </div>