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

diff --git a/src/Kconfig b/src/Kconfig
index 022f7bfe2f050dc840d2844c051e96c216af94a2..225ef2ec9f473453bbf7779a0b3c564f6170ee3b 100644 (file)
--- 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 1704215f1dfa1c3cdcd81939a348d2f412e10c70..c7fea0c82b06edf556ef43c6c8d2256afeab11f8 100644 (file)
--- 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 37ff9b927cc015b35313d226b0ccdc4383a8dc2d..e73ee3cf9c7894533865e198721ab12a5b229c55 100644 (file)
--- 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 3b97c86248e3fc8b74e55f7ece47c2f26d75a167..daa884d8fb06557e1c6158f55256a91a122d78e6 100644 (file)
--- 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