GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Myles Watson 2009-11-17 15:20:22 +00:00
parent 61c6aec071
commit ae3e9989ed
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/amd/dualcore/amd_sibling.c
View File

@ -13,7 +13,6 @@
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include <cpu/amd/amdk8_sysconf.h> #include <cpu/amd/amdk8_sysconf.h>
static int first_time = 1;
static int disable_siblings = !CONFIG_LOGICAL_CPUS; static int disable_siblings = !CONFIG_LOGICAL_CPUS;
#include "dualcore_id.c" #include "dualcore_id.c"
@ -116,7 +115,10 @@ unsigned get_apicid_base(unsigned ioapic_num)
return apicid_base; return apicid_base;
} }
#if 0 #if 0
static int first_time = 1;
void amd_sibling_init(device_t cpu) void amd_sibling_init(device_t cpu)
{ {
unsigned i, siblings; unsigned i, siblings;

8
src/devices/pci_rom.c
View File

@ -46,11 +46,13 @@ struct rom_header * pci_rom_probe(struct device *dev)
rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS); rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS);
if (rom_address == 0x00000000 || rom_address == 0xffffffff) { if (rom_address == 0x00000000 || rom_address == 0xffffffff) {
#if CONFIG_BOARD_EMULATION_QEMU_X86 #if defined(CONFIG_BOARD_EMULATION_QEMU_X86) \
&& CONFIG_BOARD_EMULATION_QEMU_X86
if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
rom_address = 0xc0000; rom_address = 0xc0000;
#else else
return NULL;
#endif #endif
return NULL;
} else { } else {
/* enable expansion ROM address decoding */ /* enable expansion ROM address decoding */
pci_write_config32(dev, PCI_ROM_ADDRESS, pci_write_config32(dev, PCI_ROM_ADDRESS,