From patchwork Thu Jul 22 22:04:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 59651 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 4ED091007D3 for ; Fri, 23 Jul 2010 08:10:28 +1000 (EST) Received: from localhost ([127.0.0.1]:36267 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oc3yD-00035M-5a for incoming@patchwork.ozlabs.org; Thu, 22 Jul 2010 18:10:25 -0400 Received: from [140.186.70.92] (port=42696 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oc3wW-00030V-86 for qemu-devel@nongnu.org; Thu, 22 Jul 2010 18:08:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oc3sb-0003ef-2I for qemu-devel@nongnu.org; Thu, 22 Jul 2010 18:04:37 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:34004) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oc3sa-0003bB-Vf for qemu-devel@nongnu.org; Thu, 22 Jul 2010 18:04:37 -0400 Received: by mail-vw0-f45.google.com with SMTP id 19so701201vws.4 for ; Thu, 22 Jul 2010 15:04:36 -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=vIbIN16iCDGO2P4gBcBV0SFHA4kpzTQ/YW4aIA/qqqc=; b=NkLdcfXG4TOYWVGVqjQLQdhP+s2tQQYwZZkTwweg7iNeovrg3jtaeDaeXkm2WwG3C6 6M4+BrN9ntosN1YUrcQrbAwexS6d4CoHTD2sDNAjV916k5anHVAIad40lDUH/nWSmO4m rMgibOxtwPZ13AaZklGaTn5iNmAgQn8J5OOXs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=XTzlt+Nj6wqffVNWGjtSv8Si2y/VBDpO/d43uqA9fGMSVmUfNrPqEw43Wq1AqyCZGt 7w+vHct9Xs2T1Rm2GyBDfty74ri/m8x1vPCrnzyBK6ejNIzYViGjcGpgPiWD4ftGqyC8 x5X0Ypc+cAhIXQFfEvd6r2ViX5OIMEgWUOBrY= Received: by 10.224.47.75 with SMTP id m11mr1844617qaf.54.1279836276579; Thu, 22 Jul 2010 15:04:36 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.185.146 with HTTP; Thu, 22 Jul 2010 15:04:16 -0700 (PDT) From: Blue Swirl Date: Thu, 22 Jul 2010 22:04:16 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 34/34] Compile PCI devices 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 e1000, rtl8139 and usb-ohci in hwlib. Signed-off-by: Blue Swirl --- Makefile.objs | 5 +++++ Makefile.target | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 67f1b21..8e2aebd 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -192,6 +192,8 @@ hw-obj-y += msix.o hw-obj-y += ne2000.o hw-obj-y += eepro100.o hw-obj-y += pcnet.o +hw-obj-y += rtl8139.o +hw-obj-y += e1000.o hw-obj-$(CONFIG_SMC91C111) += smc91c111.o hw-obj-$(CONFIG_LAN9118) += lan9118.o @@ -237,6 +239,9 @@ sound-obj-$(CONFIG_CS4231A) += cs4231a.o adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) +# USB layer +hw-obj-$(CONFIG_USB_OHCI) += usb-ohci.o + hw-obj-$(CONFIG_VIRTFS) += virtio-9p-debug.o virtio-9p-local.o ###################################################################### diff --git a/Makefile.target b/Makefile.target index 3ef4666..be34945 100644 --- a/Makefile.target +++ b/Makefile.target @@ -181,13 +181,6 @@ QEMU_CFLAGS += $(VNC_SASL_CFLAGS) # xen backend driver support obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o -# USB layer -obj-$(CONFIG_USB_OHCI) += usb-ohci.o - -# PCI network cards -obj-y += rtl8139.o -obj-y += e1000.o - # Hardware support obj-i386-y += vga.o obj-i386-y += mc146818rtc.o i8259.o pc.o