From 57448a975e0aa32b8466caf48ff247e567647c4e Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 27 Mar 2010 18:18:17 +0000 Subject: [PATCH] Compile vmware_vga only once Signed-off-by: Blue Swirl --- Makefile.objs | 1 + Makefile.target | 3 +-- 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/x86_64-softmmu.mak | 1 + 8 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 981770f..50ae890 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -180,6 +180,7 @@ hw-obj-$(CONFIG_QDEV_ADDR) += qdev-addr.o hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o hw-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o +hw-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o hw-obj-$(CONFIG_RC4030) += rc4030.o hw-obj-$(CONFIG_DP8393X) += dp8393x.o diff --git a/Makefile.target b/Makefile.target index db9f50c..16ea443 100644 --- a/Makefile.target +++ b/Makefile.target @@ -185,7 +185,7 @@ obj-i386-y = pckbd.o dma.o obj-i386-y += vga.o obj-i386-y += mc146818rtc.o i8259.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o acpi.o piix_pci.o -obj-i386-y += vmmouse.o vmport.o vmware_vga.o hpet.o +obj-i386-y += vmmouse.o vmport.o hpet.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += debugcon.o multiboot.o @@ -216,7 +216,6 @@ obj-mips-y += g364fb.o jazz_led.o obj-mips-y += gt64xxx.o pckbd.o mc146818rtc.o acpi.o obj-mips-y += piix4.o cirrus_vga.o obj-mips-y += pflash_cfi01.o -obj-mips-y += vmware_vga.o obj-microblaze-y = petalogix_s3adsp1800_mmu.o diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 7780cf5..d60203f 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -3,6 +3,7 @@ CONFIG_USB_OHCI=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y +CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index 759d123..a4e1222 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -5,6 +5,7 @@ CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y +CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 6765da5..1cf4288 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -5,6 +5,7 @@ CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y +CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 951cdd7..ceaf703 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -5,6 +5,7 @@ CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y +CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index 015a296..a7e20ad 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -5,6 +5,7 @@ CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y +CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 19fb69f..c2793fe 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -3,6 +3,7 @@ CONFIG_USB_OHCI=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y +CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y -- 2.7.4