Revision 1afdfddc

b/Makefile.objs
155 155
hw-obj-y += dma-helpers.o sysbus.o isa-bus.o
156 156
hw-obj-$(CONFIG_QDEV_ADDR) += qdev-addr.o
157 157

  
158
# VGA
159
hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o
160

  
158 161
######################################################################
159 162
# libdis
160 163
# NOTE: the disassembler code is only needed for debugging
b/Makefile.target
199 199
# Hardware support
200 200
obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o
201 201
obj-i386-y += pckbd.o $(sound-obj-y) dma.o
202
obj-i386-y += vga.o vga-pci.o vga-isa.o
202
obj-i386-y += vga.o vga-isa.o
203 203
obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
204 204
obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o
205 205
obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
......
209 209
# shared objects
210 210
obj-ppc-y = ppc.o ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/macio.o
211 211
obj-ppc-y += ide/cmd646.o
212
obj-ppc-y += vga.o vga-pci.o $(sound-obj-y) dma.o openpic.o
212
obj-ppc-y += vga.o $(sound-obj-y) dma.o openpic.o
213 213
# PREP target
214 214
obj-ppc-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o
215 215
obj-ppc-y += prep_pci.o ppc_prep.o ne2000-isa.o
......
230 230
obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
231 231
obj-mips-y += mips_addr.o mips_timer.o mips_int.o
232 232
obj-mips-y += dma.o vga.o serial.o i8254.o i8259.o rc4030.o
233
obj-mips-y += vga-pci.o vga-isa.o vga-isa-mm.o
233
obj-mips-y += vga-isa.o vga-isa-mm.o
234 234
obj-mips-y += g364fb.o jazz_led.o dp8393x.o
235 235
obj-mips-y += ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o
236 236
obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
......
266 266
ifeq ($(TARGET_ARCH), sparc64)
267 267
obj-sparc-y = sun4u.o pckbd.o apb_pci.o
268 268
obj-sparc-y += ide/core.o ide/qdev.o ide/pci.o ide/cmd646.o
269
obj-sparc-y += vga.o vga-pci.o
269
obj-sparc-y += vga.o
270 270
obj-sparc-y += fdc.o mc146818rtc.o serial.o
271 271
obj-sparc-y += cirrus_vga.o parallel.o
272 272
else
b/default-configs/i386-softmmu.mak
1 1
# Default configuration for i386-softmmu
2 2

  
3 3
CONFIG_USB_OHCI=y
4
CONFIG_VGA_PCI=y
b/default-configs/mips-softmmu.mak
2 2

  
3 3
CONFIG_ISA_MMIO=y
4 4
CONFIG_ESP=y
5
CONFIG_VGA_PCI=y
b/default-configs/mips64-softmmu.mak
2 2

  
3 3
CONFIG_ISA_MMIO=y
4 4
CONFIG_ESP=y
5
CONFIG_VGA_PCI=y
b/default-configs/mips64el-softmmu.mak
2 2

  
3 3
CONFIG_ISA_MMIO=y
4 4
CONFIG_ESP=y
5
CONFIG_VGA_PCI=y
b/default-configs/mipsel-softmmu.mak
2 2

  
3 3
CONFIG_ISA_MMIO=y
4 4
CONFIG_ESP=y
5
CONFIG_VGA_PCI=y
b/default-configs/ppc-softmmu.mak
5 5
CONFIG_ISA_MMIO=y
6 6
CONFIG_ESCC=y
7 7
CONFIG_M48T59=y
8
CONFIG_VGA_PCI=y
b/default-configs/ppc64-softmmu.mak
5 5
CONFIG_ISA_MMIO=y
6 6
CONFIG_ESCC=y
7 7
CONFIG_M48T59=y
8
CONFIG_VGA_PCI=y
b/default-configs/ppcemb-softmmu.mak
5 5
CONFIG_ISA_MMIO=y
6 6
CONFIG_ESCC=y
7 7
CONFIG_M48T59=y
8
CONFIG_VGA_PCI=y
b/default-configs/sparc64-softmmu.mak
3 3
CONFIG_ISA_MMIO=y
4 4
CONFIG_M48T59=y
5 5
CONFIG_PTIMER=y
6
CONFIG_VGA_PCI=y
b/default-configs/x86_64-softmmu.mak
1 1
# Default configuration for x86_64-softmmu
2 2

  
3 3
CONFIG_USB_OHCI=y
4
CONFIG_VGA_PCI=y

Also available in: Unified diff