Author: oxygene Date: 2009-08-17 16:46:13 +0200 (Mon, 17 Aug 2009) New Revision: 4545
Modified: trunk/coreboot-v2/src/Kconfig trunk/coreboot-v2/src/arch/i386/Makefile.inc Log: Allow setting up a VGABIOS image in Kconfig Signed-off-by: Cristi Magherusan <[email protected]> Acked-by: Patrick Georgi <[email protected]> Modified: trunk/coreboot-v2/src/Kconfig =================================================================== --- trunk/coreboot-v2/src/Kconfig 2009-08-17 14:33:03 UTC (rev 4544) +++ trunk/coreboot-v2/src/Kconfig 2009-08-17 14:46:13 UTC (rev 4545) @@ -238,6 +238,18 @@ 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 @@ 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 Modified: trunk/coreboot-v2/src/arch/i386/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-08-17 14:33:03 UTC (rev 4544) +++ trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-08-17 14:46:13 UTC (rev 4545) @@ -18,16 +18,21 @@ $(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 ####################################################################### -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
