Patchwork Kconfig VGA console

login
register
about
Submitter Myles Watson
Date 2009-08-28 16:32:43
Message ID <2831fecf0908280932n5e8f87d0k6c5e1b11583091bd@mail.gmail.com>
Download mbox | patch
Permalink /patch/228/
State Accepted
Headers show

Comments

Myles Watson - 2009-08-28 16:32:43
Separate CONFIG_CONSOLE_VGA from CONFIG_VGA_BRIDGE_SETUP.

CONSOLE_VGA means use VGA for the boot console.
VGA_BRIDGE_SETUP means set the bits so that VGA can be used.

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles
Myles Watson - 2009-09-17 16:07:32
On Fri, Aug 28, 2009 at 10:32 AM, Myles Watson <mylesgw@gmail.com> wrote:

> Separate CONFIG_CONSOLE_VGA from CONFIG_VGA_BRIDGE_SETUP.
>
> CONSOLE_VGA means use VGA for the boot console.
> VGA_BRIDGE_SETUP means set the bits so that VGA can be used.
>
> Signed-off-by: Myles Watson <mylesgw@gmail.com>
>

Ping.

I realize it no longer applies cleanly since Peter implemented part of it.
There haven't been any comments on the rest of it, though.

Thanks,
Myles
Peter Stuge - 2009-09-17 16:35:14
Myles Watson wrote:
> > Separate CONFIG_CONSOLE_VGA from CONFIG_VGA_BRIDGE_SETUP.
> >
> > CONSOLE_VGA means use VGA for the boot console.
> > VGA_BRIDGE_SETUP means set the bits so that VGA can be used.
> >
> > Signed-off-by: Myles Watson <mylesgw@gmail.com>
> 
> Ping.

Acked-by: Peter Stuge <peter@stuge.se>


> I realize it no longer applies cleanly since Peter implemented part
> of it. There haven't been any comments on the rest of it, though.

I think I only touched another part? I only moved CONFIG_VGABIOS out
of the payload menu.

Anyway, please go ahead with this fine patch! :)


//Peter
Myles Watson - 2009-09-17 16:55:31
On Thu, Sep 17, 2009 at 10:35 AM, Peter Stuge <peter@stuge.se> wrote:

> Myles Watson wrote:
> > > Separate CONFIG_CONSOLE_VGA from CONFIG_VGA_BRIDGE_SETUP.
> > >
> > > CONSOLE_VGA means use VGA for the boot console.
> > > VGA_BRIDGE_SETUP means set the bits so that VGA can be used.
> > >
> > > Signed-off-by: Myles Watson <mylesgw@gmail.com>
> >
> > Ping.
>
> Acked-by: Peter Stuge <peter@stuge.se>
>
>
> > I realize it no longer applies cleanly since Peter implemented part
> > of it. There haven't been any comments on the rest of it, though.
>
> I think I only touched another part? I only moved CONFIG_VGABIOS out
> of the payload menu. <http://www.coreboot.org/mailman/listinfo/coreboot>
>
You're right.  The overlap was smaller than I remembered.  I must have
wanted to do what you did, but not gotten around to it :)

Rev 4643.

Thanks,
Myles

Patch

Index: svn/src/devices/device.c
===================================================================
--- svn.orig/src/devices/device.c
+++ svn/src/devices/device.c
@@ -667,7 +667,7 @@  static void avoid_fixed_resources(struct
 	}
 }
 
-#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
 
Index: svn/src/console/Kconfig
===================================================================
--- svn.orig/src/console/Kconfig
+++ svn/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
Index: svn/src/devices/Kconfig
===================================================================
--- svn.orig/src/devices/Kconfig
+++ svn/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
-
-
-