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
This commit is contained in:
parent
a758ca2ba9
commit
28412f58b6
|
@ -283,6 +283,7 @@ config FALLBACK_VGA_BIOS_ID
|
||||||
default "1106,3230"
|
default "1106,3230"
|
||||||
help
|
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
|
endmenu
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ config USBDEBUG_DIRECT
|
||||||
# TODO: FIX DEPENDENCY HERE
|
# TODO: FIX DEPENDENCY HERE
|
||||||
|
|
||||||
config CONSOLE_VGA
|
config CONSOLE_VGA
|
||||||
bool
|
bool "Use VGA console, once initialized."
|
||||||
default n
|
default n
|
||||||
|
|
||||||
config MAXIMUM_CONSOLE_LOGLEVEL
|
config MAXIMUM_CONSOLE_LOGLEVEL
|
||||||
|
|
|
@ -20,6 +20,13 @@
|
||||||
|
|
||||||
menu "Devices"
|
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
|
config VGA_ROM_RUN
|
||||||
bool "Run VGA Option ROMs"
|
bool "Run VGA Option ROMs"
|
||||||
help
|
help
|
||||||
|
@ -62,6 +69,10 @@ config YABEL_DEBUG_FLAGS
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
|
config CONSOLE_VGA_MULTI
|
||||||
|
bool
|
||||||
|
default n
|
||||||
|
|
||||||
config PCI_64BIT_PREF_MEM
|
config PCI_64BIT_PREF_MEM
|
||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
@ -85,6 +96,3 @@ config AGP_PLUGIN_SUPPORT
|
||||||
config CARDBUS_PLUGIN_SUPPORT
|
config CARDBUS_PLUGIN_SUPPORT
|
||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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;
|
device_t vga_pri = 0;
|
||||||
static void set_vga_bridge_bits(void)
|
static void set_vga_bridge_bits(void)
|
||||||
{
|
{
|
||||||
|
@ -926,7 +926,7 @@ void dev_configure(void)
|
||||||
struct device *child;
|
struct device *child;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
#if CONFIG_CONSOLE_VGA == 1
|
#if CONFIG_VGA_BRIDGE_SETUP == 1
|
||||||
set_vga_bridge_bits();
|
set_vga_bridge_bits();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue