Author: myles Date: 2009-09-17 18:54:46 +0200 (Thu, 17 Sep 2009) New Revision: 4643
Modified: trunk/coreboot-v2/src/Kconfig trunk/coreboot-v2/src/console/Kconfig trunk/coreboot-v2/src/devices/Kconfig trunk/coreboot-v2/src/devices/device.c Log: Separate CONFIG_VGA_CONSOLE from CONFIG_VGA_BRIDGE_SETUP. Signed-off-by: Myles Watson <[email protected]> Acked-by: Peter Stuge <[email protected]> Modified: trunk/coreboot-v2/src/Kconfig =================================================================== --- trunk/coreboot-v2/src/Kconfig 2009-09-17 16:21:31 UTC (rev 4642) +++ trunk/coreboot-v2/src/Kconfig 2009-09-17 16:54:46 UTC (rev 4643) @@ -282,7 +282,8 @@ depends on VGA_BIOS default "1106,3230" help - The ID that would associate your VGA BIOS to your video card. + The ID that would associate your VGA BIOS to your video card. + (PCI VendorID, PCI Device ID) endmenu Modified: trunk/coreboot-v2/src/console/Kconfig =================================================================== --- trunk/coreboot-v2/src/console/Kconfig 2009-09-17 16:21:31 UTC (rev 4642) +++ trunk/coreboot-v2/src/console/Kconfig 2009-09-17 16:54:46 UTC (rev 4643) @@ -29,7 +29,7 @@ # TODO: FIX DEPENDENCY HERE config CONSOLE_VGA - bool + bool "Use VGA console, once initialized." default n config MAXIMUM_CONSOLE_LOGLEVEL Modified: trunk/coreboot-v2/src/devices/Kconfig =================================================================== --- trunk/coreboot-v2/src/devices/Kconfig 2009-09-17 16:21:31 UTC (rev 4642) +++ trunk/coreboot-v2/src/devices/Kconfig 2009-09-17 16:54:46 UTC (rev 4643) @@ -20,6 +20,13 @@ menu "Devices" +config VGA_BRIDGE_SETUP + bool "Setup bridges on path to VGA adapter" + default y + help + Allow bridges to set up legacy decoding ranges for VGA. Don't disable + this unless you're sure you don't want the briges setup for VGA. + config VGA_ROM_RUN bool "Run VGA Option ROMs" help @@ -32,11 +39,11 @@ Execute non-VGA PCI option ROMs if found. choice - prompt "Option ROM Execution" - default PCI_OPTION_ROM_RUN_REALMODE + prompt "Option ROM Execution" + default PCI_OPTION_ROM_RUN_REALMODE depends on PCI_ROM_RUN || VGA_ROM_RUN - help - You can choose to execute PCI option ROMs natively (32bit x86 system + help + You can choose to execute PCI option ROMs natively (32bit x86 system required) or in an emulator (x86emu or YABEL). config PCI_OPTION_ROM_RUN_REALMODE @@ -62,6 +69,10 @@ endmenu +config CONSOLE_VGA_MULTI + bool + default n + config PCI_64BIT_PREF_MEM bool default n @@ -85,6 +96,3 @@ config CARDBUS_PLUGIN_SUPPORT bool default n - - - Modified: trunk/coreboot-v2/src/devices/device.c =================================================================== --- trunk/coreboot-v2/src/devices/device.c 2009-09-17 16:21:31 UTC (rev 4642) +++ trunk/coreboot-v2/src/devices/device.c 2009-09-17 16:54:46 UTC (rev 4643) @@ -667,7 +667,7 @@ } } -#if CONFIG_CONSOLE_VGA == 1 +#if CONFIG_VGA_BRIDGE_SETUP == 1 device_t vga_pri = 0; static void set_vga_bridge_bits(void) { @@ -926,7 +926,7 @@ struct device *child; int i; -#if CONFIG_CONSOLE_VGA == 1 +#if CONFIG_VGA_BRIDGE_SETUP == 1 set_vga_bridge_bits(); #endif -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
