From patchwork Tue Jun 29 19:47:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 57313 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 50BC3B6F04 for ; Wed, 30 Jun 2010 05:52:17 +1000 (EST) Received: from localhost ([127.0.0.1]:35487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTgqs-00029u-QA for incoming@patchwork.ozlabs.org; Tue, 29 Jun 2010 15:52:14 -0400 Received: from [140.186.70.92] (port=44477 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTgn0-0000f1-Hi for qemu-devel@nongnu.org; Tue, 29 Jun 2010 15:48:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OTgmy-0002Kx-MY for qemu-devel@nongnu.org; Tue, 29 Jun 2010 15:48:14 -0400 Received: from mail-px0-f173.google.com ([209.85.212.173]:41065) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OTgmy-0002Kj-H6 for qemu-devel@nongnu.org; Tue, 29 Jun 2010 15:48:12 -0400 Received: by pxi2 with SMTP id 2so2788pxi.4 for ; Tue, 29 Jun 2010 12:48:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:from:date :message-id:subject:to:content-type; bh=oWJiBkq5y1EmXlCIO3DnKZjmlONH2gvWkvM3LZas6Dk=; b=WWfXuNXa/JPdu8nzSZQoQkaBku597ZTVwySRhWgSVoTXM+8th13kjfaNeyx90Wiahl qYAi5YonbJRdozbQqTI+hDKOnYzikbWGue24M25uhBzzbQ/VME9AYA+oarBJiT2DoBjX 7zqeDrq9OHRiANEu3tNbON1pxmsLFRtAWOE2c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=jBImKTdgbf5LNYd2JlXnmnd3WsphB4MlvqXkqtuhfXDs+V4Fy8a3D1HdiWHi6vBIQx 9XoMBYDkGm4Szad0sPnk4s1EaowPPy9SKnHv42EEJdhM6MWJU4dOioD0dOQInz/chgKz GJ4siOQleYbHw+EFawqcZwALnEfL82u91cyYU= Received: by 10.142.207.12 with SMTP id e12mr8774742wfg.32.1277840891175; Tue, 29 Jun 2010 12:48:11 -0700 (PDT) MIME-Version: 1.0 Received: by 10.142.225.15 with HTTP; Tue, 29 Jun 2010 12:47:51 -0700 (PDT) From: Blue Swirl Date: Tue, 29 Jun 2010 19:47:51 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] piix4: compile 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 Compile piix4 in hwlib. Two compilations less for the full build. Signed-off-by: Blue Swirl --- Makefile.objs | 3 +++ Makefile.target | 2 +- default-configs/mips-softmmu.mak | 1 + default-configs/mips64-softmmu.mak | 1 + default-configs/mips64el-softmmu.mak | 1 + default-configs/mipsel-softmmu.mak | 1 + 6 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 53fb68e..3acf59e 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -180,6 +180,9 @@ hw-obj-$(CONFIG_DEC_PCI) += dec_pci.o # PowerPC E500 boards hw-obj-$(CONFIG_PPCE500_PCI) += ppce500_pci.o +# MIPS devices +hw-obj-$(CONFIG_PIIX4) += piix4.o + # PCI watchdog devices hw-obj-y += wdt_i6300esb.o diff --git a/Makefile.target b/Makefile.target index f64702b..3957cfe 100644 --- a/Makefile.target +++ b/Makefile.target @@ -220,7 +220,7 @@ obj-mips-y += mips_addr.o mips_timer.o mips_int.o obj-mips-y += vga.o i8259.o obj-mips-y += g364fb.o jazz_led.o obj-mips-y += gt64xxx.o mc146818rtc.o -obj-mips-y += piix4.o cirrus_vga.o +obj-mips-y += cirrus_vga.o obj-microblaze-y = petalogix_s3adsp1800_mmu.o diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index 29be52e..3d0af83 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -16,6 +16,7 @@ CONFIG_FDC=y CONFIG_ACPI=y CONFIG_APM=y CONFIG_DMA=y +CONFIG_PIIX4=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 9bae8a7..0030de4 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -16,6 +16,7 @@ CONFIG_FDC=y CONFIG_ACPI=y CONFIG_APM=y CONFIG_DMA=y +CONFIG_PIIX4=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index b372c1d..7157e26 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -16,6 +16,7 @@ CONFIG_FDC=y CONFIG_ACPI=y CONFIG_APM=y CONFIG_DMA=y +CONFIG_PIIX4=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index 10ef483..238b73a 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -16,6 +16,7 @@ CONFIG_FDC=y CONFIG_ACPI=y CONFIG_APM=y CONFIG_DMA=y +CONFIG_PIIX4=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y