diff options
| author | Stefan Reinauer <stepan@coreboot.org> | 2010-11-22 08:09:50 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-11-22 08:09:50 +0000 |
| commit | abc0c8551604933ca54e9eaa48c3f00e4915dc90 (patch) | |
| tree | 2b8b2b7c07329b72f9adeea737e5049435fe4549 /src/devices | |
| parent | e9c447326a0ff5565886b0c18c806c77c4a03cb8 (diff) | |
Printing coreboot debug messages on VGA console is pretty much useless, since
initializing VGA happens pretty much as the last thing before starting the
payload. Hence, drop VGA console support, as we did in coreboot v3.
- Drop VGA and BTEXT console support.
Console is meant to be debugging only, and by the time graphics comes up
99% of the risky stuff has already happened. Note: This patch does not remove
hardware init but only the actual output functionality.
The ragexl driver needs some extra love, but that's for another day
- factor out die() and post()
- drop some leftover RAMBASE < 0x100000 checks.
Signed-off-by: Stefan Reinauer <stepan@coreboot.org>
Acked-by: QingPei Wang<wangqingpei@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6111 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices')
| -rw-r--r-- | src/devices/Kconfig | 2 | ||||
| -rw-r--r-- | src/devices/device.c | 2 | ||||
| -rw-r--r-- | src/devices/pci_device.c | 5 | ||||
| -rw-r--r-- | src/devices/pci_rom.c | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/src/devices/Kconfig b/src/devices/Kconfig index 3d0049e28d..9e5ea6e094 100644 --- a/src/devices/Kconfig +++ b/src/devices/Kconfig @@ -116,7 +116,7 @@ config YABEL_DIRECTHW they can still access all devices in the system. Enable this option for a good compromise between security and speed. -config CONSOLE_VGA_MULTI +config MULTIPLE_VGA_ADAPTERS bool default n diff --git a/src/devices/device.c b/src/devices/device.c index 4143f96d66..a2619bf000 100644 --- a/src/devices/device.c +++ b/src/devices/device.c @@ -722,7 +722,7 @@ static void set_vga_bridge_bits(void) if (!vga) vga = vga_first; -#if CONFIG_CONSOLE_VGA_ONBOARD_AT_FIRST == 1 +#if CONFIG_ONBOARD_VGA_IS_PRIMARY == 1 if (vga_onboard) /* Will use onboard VGA as primary. */ #else if (!vga) /* Will use last add-on adapter as primary. */ diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c index 01fd815f4d..ed066900e4 100644 --- a/src/devices/pci_device.c +++ b/src/devices/pci_device.c @@ -675,11 +675,6 @@ void pci_dev_init(struct device *dev) return; run_bios(dev, (unsigned long)ram); - -#if CONFIG_CONSOLE_VGA == 1 - if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA) - vga_console_init(); -#endif /* CONFIG_CONSOLE_VGA */ #endif /* CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN */ } diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c index 1ae79e137d..e721eb5751 100644 --- a/src/devices/pci_rom.c +++ b/src/devices/pci_rom.c @@ -130,7 +130,7 @@ struct rom_header *pci_rom_load(struct device *dev, * devices have a mismatch between the hardware and the ROM. */ if (PCI_CLASS_DISPLAY_VGA == (dev->class >> 8)) { -#if CONFIG_CONSOLE_VGA == 1 && CONFIG_CONSOLE_VGA_MULTI == 0 +#if CONFIG_MULTIPLE_VGA_ADAPTERS == 0 extern device_t vga_pri; /* Primary VGA device (device.c). */ if (dev != vga_pri) return NULL; /* Only one VGA supported. */ #endif |