[coreboot-gerrit] Change in coreboot[master]: Intel/SeaBIOS/NGI: Hook up intelvbttool

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/22432


Change subject: Intel/SeaBIOS/NGI: Hook up intelvbttool
......................................................................

Intel/SeaBIOS/NGI: Hook up intelvbttool

Build and use intelvbttool to patch SeaVGABIOS with a VBT if the following
criterias are met:
* Native graphics init is enabled
* Intel VBT has been provided
* CONFIG_INTEL_PATCH_SEAVGABIOS_VBT is checked

Change-Id: I88c2e05be393b9cab1f06fd1b5164835b6a79548
Signed-off-by: Patrick Rudolph <siro at das-labor.org>
---
M Makefile.inc
M src/device/Kconfig
2 files changed, 26 insertions(+), 0 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/22432/1

diff --git a/Makefile.inc b/Makefile.inc
index e6e9eae..9efa805 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -500,6 +500,13 @@
 	+$(MAKE) -C $(top)/util/blobtool
 	cp -a $(top)/util/ifdtool/blobtool $@
 
+INTELVBTTOOL:=$(objutil)/intelvbttool/intelvbttool
+$(INTELVBTTOOL): $(top)/util/intelvbttool/intelvbttool.c
+	@printf "    Compile INTELVBTTOOL\n"
+	+$(MAKE) -C $(top)/util/intelvbttool
+	mkdir -p $(dir $(INTELVBTTOOL))
+	cp -a $(top)/util/intelvbttool/intelvbttool $@
+
 IFDTOOL:=$(objutil)/ifdtool/ifdtool
 $(IFDTOOL):
 	@printf "    Compile IFDTOOL\n"
@@ -987,7 +994,19 @@
 $(CONFIG_CBFS_PREFIX)/refcode-compression := $(CBFS_COMPRESS_FLAG)
 
 cbfs-files-$(CONFIG_SEABIOS_VGA_COREBOOT) += vgaroms/seavgabios.bin
+ifeq ($(CONFIG_INTEL_PATCH_SEAVGABIOS_VBT),y)
+
+$(objcbfs)/seavgabiosvbt.bin: $(call strip_quotes,$(CONFIG_PAYLOAD_VGABIOS_FILE)) $(INTELVBTTOOL) \
+				$(call strip_quotes,$(CONFIG_INTEL_GMA_VBT_FILE))
+	printf "    Patching SeaVGABIOS.\n"
+	cp $(CONFIG_PAYLOAD_VGABIOS_FILE) $(objcbfs)/seavgabiosvbt.bin
+	$(INTELVBTTOOL) --invbt $(call strip_quotes,$(CONFIG_INTEL_GMA_VBT_FILE)) \
+		--patchoprom $(objcbfs)/seavgabiosvbt.bin
+
+vgaroms/seavgabios.bin-file := $(objcbfs)/seavgabiosvbt.bin
+else
 vgaroms/seavgabios.bin-file := $(CONFIG_PAYLOAD_VGABIOS_FILE)
+endif
 vgaroms/seavgabios.bin-type := raw
 
 cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += config
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 28298d5..08e7705 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -605,6 +605,13 @@
 	help
 	  The path and filename of the VBT binary.
 
+config INTEL_PATCH_SEAVGABIOS_VBT
+	depends on MAINBOARD_DO_NATIVE_VGA_INIT && INTEL_GMA_ADD_VBT_DATA_FILE
+	bool "Patch SeaVGABios to include the VBT provided"
+	help
+	  Required for old properitery drivers that search for the VBT in the
+	  PCI option ROM only.
+
 config INTEL_MBI
 	bool "Add an MBI image"
 	depends on NORTHBRIDGE_INTEL_I82830

-- 
To view, visit https://review.coreboot.org/22432
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88c2e05be393b9cab1f06fd1b5164835b6a79548
Gerrit-Change-Number: 22432
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <siro at das-labor.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171111/41eb41ab/attachment.html>