Patchwork VGA BIOS image support for Kbuild

login
register
about
Submitter Cristi Magherusan
Date 2009-08-14 02:31:29
Message ID <1250217089.17640.16.camel@ufo>
Download mbox | patch
Permalink /patch/129/
State Accepted
Headers show

Comments

Cristi Magherusan - 2009-08-14 02:31:29
This patch introduces support for adding VGA BIOS images in Kbuild

http://github.com/cristim/coreboot-v2/commit/cb49325cab944cf42c74d84f09aac4ff6fee542e.patch

Cristi

From cb49325cab944cf42c74d84f09aac4ff6fee542e Mon Sep 17 00:00:00 2001
From: Cristi M <cristi@corebooter.utcluj.ro>
Date: Fri, 14 Aug 2009 05:26:20 +0300
Subject: [PATCH] added VGA BIOS support in Kbuild

---
 src/Kconfig                |   26 ++++++++++++++++++++++++++
 src/arch/i386/Makefile.inc |   11 ++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)
Patrick Georgi - 2009-08-17 14:48:08
Am 14.08.2009 04:31, schrieb Cristi Magherusan:
> This patch introduces support for adding VGA BIOS images in Kbuild
>
>    
Acked and committed, r4545

Thanks,
Patrick

Patch

diff --git a/src/Kconfig b/src/Kconfig
index 596653b..cee3352 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
@@ -257,6 +269,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 cca8917..7fed6f5 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