Author: stepan Date: 2007-04-10 00:50:12 +0200 (Tue, 10 Apr 2007) New Revision: 2600
Modified: trunk/LinuxBIOSv2/src/devices/pci_rom.c Log: This patch corrects r2587. It makes sure that the VGA is initialized when CONFIG_CONSOLE_VGA==0 and CONFIG_PCI_ROM_RUN==1
Signed-off-by: Roman Kononov kononov@dls.net Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/LinuxBIOSv2/src/devices/pci_rom.c =================================================================== --- trunk/LinuxBIOSv2/src/devices/pci_rom.c 2007-04-09 22:27:45 UTC (rev 2599) +++ trunk/LinuxBIOSv2/src/devices/pci_rom.c 2007-04-09 22:50:12 UTC (rev 2600) @@ -62,10 +62,6 @@
static void *pci_ram_image_start = (void *)PCI_RAM_IMAGE_START;
-#if CONFIG_CONSOLE_VGA == 1 && CONFIG_CONSOLE_VGA_MULTI == 0 -extern device_t vga_pri; // the primary vga device, defined in device.c -#endif - struct rom_header *pci_rom_load(struct device *dev, struct rom_header *rom_header) { struct pci_data * rom_data; @@ -86,15 +82,14 @@ rom_size = rom_header->size * 512;
if (PCI_CLASS_DISPLAY_VGA == rom_data->class_hi) { -#if CONFIG_CONSOLE_VGA == 1 - #if CONFIG_CONSOLE_VGA_MULTI == 0 +#if CONFIG_CONSOLE_VGA == 1 && CONFIG_CONSOLE_VGA_MULTI == 0 + extern device_t vga_pri; // the primary vga device, defined in device.c if (dev != vga_pri) return NULL; // only one VGA supported - #endif +#endif printk_debug("copying VGA ROM Image from 0x%x to 0x%x, 0x%x bytes\n", rom_header, PCI_VGA_RAM_IMAGE_START, rom_size); memcpy(PCI_VGA_RAM_IMAGE_START, rom_header, rom_size); return (struct rom_header *) (PCI_VGA_RAM_IMAGE_START); -#endif } else { printk_debug("copying non-VGA ROM Image from 0x%x to 0x%x, 0x%x bytes\n", rom_header, pci_ram_image_start, rom_size);