Silence two warnings. Only use the Qemu hard-coded address for VGA devices.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4947 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
diff --git a/src/cpu/amd/dualcore/amd_sibling.c b/src/cpu/amd/dualcore/amd_sibling.c
index 8401818..deaa78c 100644
--- a/src/cpu/amd/dualcore/amd_sibling.c
+++ b/src/cpu/amd/dualcore/amd_sibling.c
@@ -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;
diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c
index 9b2d281..c4af191 100644
--- a/src/devices/pci_rom.c
+++ b/src/devices/pci_rom.c
@@ -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,