Compile vmware_vga only once

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/Makefile.objs b/Makefile.objs
index 981770f367efd1c94dd2979ed8f93890abe32428..50ae89039f7c73c7f51a5b6057b43689e6400b59 100644 (file)
--- 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 db9f50c229c82596a6a76f633a77a37710948733..16ea4431faee5792d26b81eba8dde6c5730c9a22 100644 (file)
--- 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 7780cf5edc561da7d737f7d583d8622914ddf3c8..d60203f39cb53488f40bdc3d0484fb78156af169 100644 (file)
--- 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 759d12334b2a1484f4972956afc6d99364be4bd6..a4e12220923ca5c3e3fd4b4c947b06d542bdfef8 100644 (file)
--- 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 6765da51eb7a2759cf1604466410fad4a13989c9..1cf4288d12376021dc618cd57eb5df33f22b9e53 100644 (file)
--- 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 951cdd7e60b8e5c11cf942797d7410716df9b22a..ceaf70307bdd125f0b18721c611dd4d562f4129c 100644 (file)
--- 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 015a2967969c2a839c115165d24e70c9c19c4be9..a7e20adb986c1db0b084dd4f02b2a1f134730fcc 100644 (file)
--- 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 19fb69f01a58744c2ff9ee22889a221314176275..c2793fe9d8b59ee582459600148697f5db708992 100644 (file)
--- 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