white space fix + real fix: don't copy c0000 over c0000 ron
Fix a little white space issue. Also, don't copy the rom image if it is already in its correct location.
Signed-off-by: Ronald G. Minnich <[email protected]> Index: src/devices/pci_rom.c =================================================================== --- src/devices/pci_rom.c (revision 4350) +++ src/devices/pci_rom.c (working copy) @@ -55,7 +55,7 @@ rom_address = dev->rom_address; printk_debug("On mainboard, rom address for %s = %lx\n", dev_path(dev), rom_address); - } else { + } else { rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS); printk_debug("On card, rom address for %s = %lx\n", dev_path(dev), rom_address); @@ -126,9 +126,11 @@ extern device_t vga_pri; // the primary vga device, defined in device.c if (dev != vga_pri) return NULL; // only one VGA supported #endif - printk_debug("copying VGA ROM Image from %p to 0x%x, 0x%x bytes\n", + if ((void *)PCI_VGA_RAM_IMAGE_START != rom_header) { + printk_debug("copying VGA ROM Image from %p to 0x%x, 0x%x bytes\n", rom_header, PCI_VGA_RAM_IMAGE_START, rom_size); - memcpy((void *)PCI_VGA_RAM_IMAGE_START, rom_header, rom_size); + memcpy((void *)PCI_VGA_RAM_IMAGE_START, rom_header, rom_size); + } return (struct rom_header *) (PCI_VGA_RAM_IMAGE_START); }
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
