From 1afdfddc41fe1b0a79b3a713d3e2393a165cb1bb Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 21 Mar 2010 19:47:00 +0000 Subject: [PATCH] Compile vga-pci only once Signed-off-by: Blue Swirl --- Makefile.objs | 3 +++ Makefile.target | 8 ++++---- default-configs/i386-softmmu.mak | 1 + default-configs/mips-softmmu.mak | 1 + default-configs/mips64-softmmu.mak | 1 + default-configs/mips64el-softmmu.mak | 1 + default-configs/mipsel-softmmu.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/sparc64-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + 12 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 6594eda..7ebff44 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -155,6 +155,9 @@ hw-obj-$(CONFIG_ESP) += esp.o hw-obj-y += dma-helpers.o sysbus.o isa-bus.o hw-obj-$(CONFIG_QDEV_ADDR) += qdev-addr.o +# VGA +hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o + ###################################################################### # libdis # NOTE: the disassembler code is only needed for debugging diff --git a/Makefile.target b/Makefile.target index 0d8a927..42b9a48 100644 --- a/Makefile.target +++ b/Makefile.target @@ -199,7 +199,7 @@ obj-y += e1000.o # Hardware support obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o obj-i386-y += pckbd.o $(sound-obj-y) dma.o -obj-i386-y += vga.o vga-pci.o vga-isa.o +obj-i386-y += vga.o vga-isa.o obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o @@ -209,7 +209,7 @@ obj-i386-y += ne2000-isa.o debugcon.o multiboot.o # shared objects obj-ppc-y = ppc.o ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/macio.o obj-ppc-y += ide/cmd646.o -obj-ppc-y += vga.o vga-pci.o $(sound-obj-y) dma.o openpic.o +obj-ppc-y += vga.o $(sound-obj-y) dma.o openpic.o # PREP target obj-ppc-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o obj-ppc-y += prep_pci.o ppc_prep.o ne2000-isa.o @@ -230,7 +230,7 @@ obj-ppc-$(CONFIG_FDT) += device_tree.o obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y += mips_addr.o mips_timer.o mips_int.o obj-mips-y += dma.o vga.o serial.o i8254.o i8259.o rc4030.o -obj-mips-y += vga-pci.o vga-isa.o vga-isa-mm.o +obj-mips-y += vga-isa.o vga-isa-mm.o obj-mips-y += g364fb.o jazz_led.o dp8393x.o obj-mips-y += ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o @@ -266,7 +266,7 @@ obj-cris-y += pflash_cfi02.o ifeq ($(TARGET_ARCH), sparc64) obj-sparc-y = sun4u.o pckbd.o apb_pci.o obj-sparc-y += ide/core.o ide/qdev.o ide/pci.o ide/cmd646.o -obj-sparc-y += vga.o vga-pci.o +obj-sparc-y += vga.o obj-sparc-y += fdc.o mc146818rtc.o serial.o obj-sparc-y += cirrus_vga.o parallel.o else diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 9e6d565..916c2ad 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,3 +1,4 @@ # Default configuration for i386-softmmu CONFIG_USB_OHCI=y +CONFIG_VGA_PCI=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index b452b9a..5e32232 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -2,3 +2,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y +CONFIG_VGA_PCI=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 2896675..3b50353 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -2,3 +2,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y +CONFIG_VGA_PCI=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 7fbd9a3..7e0e088 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -2,3 +2,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y +CONFIG_VGA_PCI=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index 9e02e93..2c07cad 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -2,3 +2,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y +CONFIG_VGA_PCI=y diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 17dc12f..9afe485 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -5,3 +5,4 @@ CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y +CONFIG_VGA_PCI=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index d56f5c2..f5b76b6 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -5,3 +5,4 @@ CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y +CONFIG_VGA_PCI=y diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index cb460c1..0a1a1e2 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -5,3 +5,4 @@ CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y +CONFIG_VGA_PCI=y diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak index b4bb0b0..4b346ba 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -3,3 +3,4 @@ CONFIG_ISA_MMIO=y CONFIG_M48T59=y CONFIG_PTIMER=y +CONFIG_VGA_PCI=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index e0f7fc0..c982c3c 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -1,3 +1,4 @@ # Default configuration for x86_64-softmmu CONFIG_USB_OHCI=y +CONFIG_VGA_PCI=y -- 2.7.4