diff options
| author | Myles Watson <mylesgw@gmail.com> | 2009-09-17 16:54:46 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2009-09-17 16:54:46 +0000 |
| commit | 28412f58b62c73cee47ad3f09a4a056e64d422a6 (patch) | |
| tree | c41bfea7bdff9c523a04820e92768cd066bedfac | |
| parent | a758ca2ba9adc5b6ad01e5fe2515e0d636fffad2 (diff) | |
Separate CONFIG_VGA_CONSOLE from CONFIG_VGA_BRIDGE_SETUP.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4643 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | src/Kconfig | 3 | ||||
| -rw-r--r-- | src/console/Kconfig | 2 | ||||
| -rw-r--r-- | src/devices/Kconfig | 22 | ||||
| -rw-r--r-- | src/devices/device.c | 4 |
4 files changed, 20 insertions, 11 deletions
diff --git a/src/Kconfig b/src/Kconfig index 022f7bfe2f..225ef2ec9f 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -282,7 +282,8 @@ config FALLBACK_VGA_BIOS_ID 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 diff --git a/src/console/Kconfig b/src/console/Kconfig index 1704215f1d..c7fea0c82b 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -29,7 +29,7 @@ config USBDEBUG_DIRECT # TODO: FIX DEPENDENCY HERE config CONSOLE_VGA - bool + bool "Use VGA console, once initialized." default n config MAXIMUM_CONSOLE_LOGLEVEL diff --git a/src/devices/Kconfig b/src/devices/Kconfig index 37ff9b927c..e73ee3cf9c 100644 --- a/src/devices/Kconfig +++ b/src/devices/Kconfig @@ -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 @@ config PCI_ROM_RUN 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 @@ config YABEL_DEBUG_FLAGS endmenu +config CONSOLE_VGA_MULTI + bool + default n + config PCI_64BIT_PREF_MEM bool default n @@ -85,6 +96,3 @@ config AGP_PLUGIN_SUPPORT config CARDBUS_PLUGIN_SUPPORT bool default n - - - diff --git a/src/devices/device.c b/src/devices/device.c index 3b97c86248..daa884d8fb 100644 --- a/src/devices/device.c +++ b/src/devices/device.c @@ -667,7 +667,7 @@ static void avoid_fixed_resources(struct device *dev) } } -#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 @@ void dev_configure(void) struct device *child; int i; -#if CONFIG_CONSOLE_VGA == 1 +#if CONFIG_VGA_BRIDGE_SETUP == 1 set_vga_bridge_bits(); #endif |