Author: myles Date: 2009-11-17 16:20:22 +0100 (Tue, 17 Nov 2009) New Revision: 4947
Modified: trunk/src/cpu/amd/dualcore/amd_sibling.c trunk/src/devices/pci_rom.c Log: Silence two warnings. Only use the Qemu hard-coded address for VGA devices. Signed-off-by: Myles Watson <[email protected]> Acked-by: Myles Watson <[email protected]> Modified: trunk/src/cpu/amd/dualcore/amd_sibling.c =================================================================== --- trunk/src/cpu/amd/dualcore/amd_sibling.c 2009-11-17 11:52:18 UTC (rev 4946) +++ trunk/src/cpu/amd/dualcore/amd_sibling.c 2009-11-17 15:20:22 UTC (rev 4947) @@ -13,7 +13,6 @@ #include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/amdk8_sysconf.h> -static int first_time = 1; static int disable_siblings = !CONFIG_LOGICAL_CPUS; #include "dualcore_id.c" @@ -116,7 +115,10 @@ return apicid_base; } + #if 0 +static int first_time = 1; + void amd_sibling_init(device_t cpu) { unsigned i, siblings; Modified: trunk/src/devices/pci_rom.c =================================================================== --- trunk/src/devices/pci_rom.c 2009-11-17 11:52:18 UTC (rev 4946) +++ trunk/src/devices/pci_rom.c 2009-11-17 15:20:22 UTC (rev 4947) @@ -46,11 +46,13 @@ rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS); if (rom_address == 0x00000000 || rom_address == 0xffffffff) { - #if CONFIG_BOARD_EMULATION_QEMU_X86 - rom_address = 0xc0000; - #else - return NULL; + #if defined(CONFIG_BOARD_EMULATION_QEMU_X86) \ + && CONFIG_BOARD_EMULATION_QEMU_X86 + if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA) + rom_address = 0xc0000; + else #endif + return NULL; } else { /* enable expansion ROM address decoding */ pci_write_config32(dev, PCI_ROM_ADDRESS, -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
