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

diff --git a/src/Kconfig b/src/Kconfig
index ca7fa61443d353655f7067cfc4185f4f96cd6f3a..2d7f872bc0915e279518ea297a8975088ef684b2 100644 (file)
--- 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 cca89173472e36af472b023494f594ad1ca67390..7fed6f53872bf826021d77767d1737a7358a7a40 100644 (file)
--- 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