<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22432">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Intel/SeaBIOS/NGI: Hook up intelvbttool<br><br>Build and use intelvbttool to patch SeaVGABIOS with a VBT if the following<br>criterias are met:<br>* Native graphics init is enabled<br>* Intel VBT has been provided<br>* CONFIG_INTEL_PATCH_SEAVGABIOS_VBT is checked<br><br>Change-Id: I88c2e05be393b9cab1f06fd1b5164835b6a79548<br>Signed-off-by: Patrick Rudolph <siro@das-labor.org><br>---<br>M Makefile.inc<br>M src/device/Kconfig<br>2 files changed, 26 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/32/22432/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/Makefile.inc b/Makefile.inc<br>index e6e9eae..9efa805 100644<br>--- a/Makefile.inc<br>+++ b/Makefile.inc<br>@@ -500,6 +500,13 @@<br>      +$(MAKE) -C $(top)/util/blobtool<br>      cp -a $(top)/util/ifdtool/blobtool $@<br> <br>+INTELVBTTOOL:=$(objutil)/intelvbttool/intelvbttool<br>+$(INTELVBTTOOL): $(top)/util/intelvbttool/intelvbttool.c<br>+     @printf "    Compile INTELVBTTOOL\n"<br>+       +$(MAKE) -C $(top)/util/intelvbttool<br>+ mkdir -p $(dir $(INTELVBTTOOL))<br>+      cp -a $(top)/util/intelvbttool/intelvbttool $@<br>+<br> IFDTOOL:=$(objutil)/ifdtool/ifdtool<br> $(IFDTOOL):<br>         @printf "    Compile IFDTOOL\n"<br>@@ -987,7 +994,19 @@<br> $(CONFIG_CBFS_PREFIX)/refcode-compression := $(CBFS_COMPRESS_FLAG)<br> <br> cbfs-files-$(CONFIG_SEABIOS_VGA_COREBOOT) += vgaroms/seavgabios.bin<br>+ifeq ($(CONFIG_INTEL_PATCH_SEAVGABIOS_VBT),y)<br>+<br>+$(objcbfs)/seavgabiosvbt.bin: $(call strip_quotes,$(CONFIG_PAYLOAD_VGABIOS_FILE)) $(INTELVBTTOOL) \<br>+                               $(call strip_quotes,$(CONFIG_INTEL_GMA_VBT_FILE))<br>+    printf "    Patching SeaVGABIOS.\n"<br>+        cp $(CONFIG_PAYLOAD_VGABIOS_FILE) $(objcbfs)/seavgabiosvbt.bin<br>+       $(INTELVBTTOOL) --invbt $(call strip_quotes,$(CONFIG_INTEL_GMA_VBT_FILE)) \<br>+          --patchoprom $(objcbfs)/seavgabiosvbt.bin<br>+<br>+vgaroms/seavgabios.bin-file := $(objcbfs)/seavgabiosvbt.bin<br>+else<br> vgaroms/seavgabios.bin-file := $(CONFIG_PAYLOAD_VGABIOS_FILE)<br>+endif<br> vgaroms/seavgabios.bin-type := raw<br> <br> cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += config<br>diff --git a/src/device/Kconfig b/src/device/Kconfig<br>index 28298d5..08e7705 100644<br>--- a/src/device/Kconfig<br>+++ b/src/device/Kconfig<br>@@ -605,6 +605,13 @@<br>         help<br>    The path and filename of the VBT binary.<br> <br>+config INTEL_PATCH_SEAVGABIOS_VBT<br>+    depends on MAINBOARD_DO_NATIVE_VGA_INIT && INTEL_GMA_ADD_VBT_DATA_FILE<br>+       bool "Patch SeaVGABios to include the VBT provided"<br>+        help<br>+   Required for old properitery drivers that search for the VBT in the<br>+          PCI option ROM only.<br>+<br> config INTEL_MBI<br>  bool "Add an MBI image"<br>     depends on NORTHBRIDGE_INTEL_I82830<br></pre><p>To view, visit <a href="https://review.coreboot.org/22432">change 22432</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/22432"/><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: I88c2e05be393b9cab1f06fd1b5164835b6a79548 </div>
<div style="display:none"> Gerrit-Change-Number: 22432 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <siro@das-labor.org> </div>