From patchwork Thu Mar 25 20:24:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 48591 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3BF4AB7067 for ; Fri, 26 Mar 2010 08:10:54 +1100 (EST) Received: from localhost ([127.0.0.1]:44747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuuKJ-0007OO-CF for incoming@patchwork.ozlabs.org; Thu, 25 Mar 2010 17:10:51 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NutbR-0007fc-S1 for qemu-devel@nongnu.org; Thu, 25 Mar 2010 16:24:29 -0400 Received: from [140.186.70.92] (port=54926 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NutbQ-0007de-4X for qemu-devel@nongnu.org; Thu, 25 Mar 2010 16:24:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NutbO-00064w-D8 for qemu-devel@nongnu.org; Thu, 25 Mar 2010 16:24:27 -0400 Received: from mail-pw0-f45.google.com ([209.85.160.45]:41999) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NutbO-00064m-7s for qemu-devel@nongnu.org; Thu, 25 Mar 2010 16:24:26 -0400 Received: by pwi9 with SMTP id 9so5441797pwi.4 for ; Thu, 25 Mar 2010 13:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=PBl5RpIMzwy3CNXYymqQXvCRA3siw7WiTcAaZOAPBPI=; b=fSJYEDXxr8AV6gBKZfn8FKQpB5ancaeh6EavaaMEBblNUHkDbBRV3V+5MHE8XQE5+X oSlAMuBKn3lzbSKLb9JwtOTALDZQdEX6b2+WPj3hHOiYcxSBhiOzjLeQNtT2EI9121j5 /ULegsFVde/6w5+YOP52RWEOnnCaL/Re8FD7E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=QRwctc37WxexjbgRChceWArdX0Bpcq2xi8mK6XuZZPTfb/9hZVb+imALk24hrZK+ht Us4gsSa3jbUWfFGffOo1EIx6GPhnnBAzKKTbManKAxcS1kF+BrAFTUUGtHzzs0MWzsyN 4b2abwmOK6lcH1SkX8aNx/qJ9hixiJXIfB/E4= MIME-Version: 1.0 Received: by 10.140.56.2 with SMTP id e2mr2511678rva.190.1269548664996; Thu, 25 Mar 2010 13:24:24 -0700 (PDT) Date: Thu, 25 Mar 2010 22:24:24 +0200 Message-ID: From: Blue Swirl To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 2/3] Compile vmware_vga only once X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 77d1fb9..1f38416 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -179,6 +179,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 59eb670..43c8d62 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 c438c1c..44399f0 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 a0d7f31..9d9d7ab 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 5ff0581..5b8f966 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 d5b9d79..e36b373 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 e7e32d7..c75bc02 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