From 488c36c8e755106ff85fc4e6873af75c2b6a79dd Mon Sep 17 00:00:00 2001
From: Cristi Magherusan <cristi.magherusan@net.utcluj.ro>
Date: Mon, 17 Aug 2009 14:46:13 +0000
Subject: Allow setting up a VGABIOS image in Kconfig

Signed-off-by: Cristi Magherusan <cristi.magherusan@net.utcluj.ro>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4545 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/Kconfig                | 26 ++++++++++++++++++++++++++
 src/arch/i386/Makefile.inc | 11 ++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Kconfig b/src/Kconfig
index ca7fa61443..2d7f872bc0 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -238,6 +238,18 @@ config PAYLOAD_ELF
 	  You will be able to specify the location and file name of the
 	  payload image later.
 
+config VGA_BIOS
+	bool "Add a VGA BIOS image"
+	depends on PAYLOAD_ELF
+	help
+	  Select this option if you have a VGA BIOS image that you would 
+	  like to add to your ROM.
+
+	  You will be able to specify the location and file name of the
+	  image later.
+
+
+
 config PAYLOAD_NONE
 	bool "No payload"
 	help
@@ -264,6 +276,20 @@ config FALLBACK_PAYLOAD_FILE
 	help
 	  The path and filename of the ELF executable file to use as fallback payload.
 
+config FALLBACK_VGA_BIOS_FILE
+	string "VGA BIOS path and filename"
+	depends on VGA_BIOS
+	default "vgabios.bin"
+	help
+	  The path and filename of the file to use as VGA BIOS.
+
+config FALLBACK_VGA_BIOS_ID
+	string "VGA BIOS ID"
+	depends on VGA_BIOS
+	default "1106,3230"
+	help
+	 The ID that would associate your VGA BIOS to your video card.
+
 endmenu
 
 config GDB_STUB
diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index cca8917347..7fed6f5387 100644
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -18,15 +18,20 @@ $(obj)/coreboot.rom: $(obj)/coreboot.bootblock $(obj)/coreboot_ram $(CBFSTOOL)
 	$(Q)$(CBFSTOOL) $@ create $(shell expr 1024 \* $(CONFIG_COREBOOT_ROMSIZE_KB)) $(BOOTBLOCK_SIZE) $(obj)/coreboot.bootblock
 	$(Q)if [ -f fallback/coreboot_apc ]; \
 	then \
-		$(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \
+		$(Q) $(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \
 	fi
 	$(Q)$(CBFSTOOL) $@ add-stage  $(obj)/coreboot_ram fallback/coreboot_ram $(CBFS_COMPRESS_FLAG)
 ifeq ($(CONFIG_PAYLOAD_NONE),y)
 	$(Q)printf "    PAYLOAD    none (as specified by user)\n"
 else
-	printf "    PAYLOAD    $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n"
+	$(Q) printf "    PAYLOAD    $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n"
 	$(Q)$(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE)  fallback/payload $(CBFS_COMPRESS_FLAG)
-	$(CBFSTOOL) ./build/coreboot.rom print
+ifeq ($(CONFIG_VGA_BIOS),y)
+	$(Q) printf "    VGABIOS    $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID) $(COMPRESSFLAG)\n"
+	$(Q) $(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom 
+endif
+	$(Q) printf "    CBFSPRINT  ./build/coreboot.rom\n\n"
+	$(CBFSTOOL) build/coreboot.rom print
 endif
 
 
-- 
cgit v1.2.3