Change in coreboot[master]: [util/vgabios_extract] hookup to build system

[Thomas Weißschuh (Code Review)]

Thomas Weißschuh has uploaded this change for review. ( https://review.coreboot.org/23047

Change subject: [util/vgabios_extract] hookup to build system
......................................................................

[util/vgabios_extract] hookup to build system

Allows the automatic extraction and usage of a VGA BIOS from an UEFI
dump.

Change-Id: Ib792ff7c22853eb11ebec7fc834353eb3cbc5ad9
Signed-off-by: Thomas Weißschuh 
---
M src/arch/x86/Makefile.inc
M src/device/Kconfig
2 files changed, 30 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/23047/1

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index cc227b3..3f2f1e4 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -38,9 +38,24 @@
    $(NVRAMTOOL) -y $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout -H $@
 endif # CONFIG_HAVE_OPTION_TABLE

+vgabios-rom=$(obj)/vgabios.rom
+
+ifeq ($(CONFIG_VGA_BIOS_EXTRACT),y)
+
+$(vgabios-rom): $(call strip_quotes,$(CONFIG_VGA_BIOS_EXTRACT_FILE))
+	@printf "    VGA_BIOS_EXTRACT $(CONFIG_VGA_BIOS_EXTRACT_FILE) $(vgabios-rom)\n"
+	util/vgabios_extract/vgabios_extract.py $(CONFIG_VGA_BIOS_EXTRACT_FILE) $(vgabios-rom)
+
+else
+
+$(vgabios-rom): $(call strip_quotes,$(CONFIG_VGA_BIOS_FILE))
+	$(CP) $(vgabios-rom) $(CONFIG_VGA_BIOS_FILE)
+
+endif
+
 stripped_vgabios_id = $(call strip_quotes,$(CONFIG_VGA_BIOS_ID))
 cbfs-files-$(CONFIG_VGA_BIOS) += pci$(stripped_vgabios_id).rom
-pci$(stripped_vgabios_id).rom-file := $(call strip_quotes,$(CONFIG_VGA_BIOS_FILE))
+pci$(stripped_vgabios_id).rom-file := $(vgabios-rom)
 pci$(stripped_vgabios_id).rom-type := optionrom

cbfs-files-$(CONFIG_INTEL_MBI) += mbi.bin
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 28298d5..a6b1168 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -566,11 +566,23 @@
      like to add to your ROM.

You will be able to specify the location and file name of the
-	  image later.
+	  false
+
+config VGA_BIOS_EXTRACT
+	bool "Extract VGA BIOS from BIOS image"
+	depends on VGA_BIOS
+	default n
+
+config VGA_BIOS_EXTRACT_FILE
+	string "VGA BIOS extract path and filename"
+	depends on VGA_BIOS_EXTRACT
+	default "3rdpart/blobs/mainboard/$(MAINBOARDDIR)/bios.bin"
+	help
+	  The path and filename of the file to extract the VGA BIOS from.

config VGA_BIOS_FILE
    string "VGA BIOS path and filename"
-	depends on VGA_BIOS
+	depends on VGA_BIOS && !VGA_BIOS_EXTRACT
    default "vgabios.bin"
    help
      The path and filename of the file to use as VGA BIOS.