From patchwork Sun Feb 13 21:09:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 83007 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 20615B7123 for ; Mon, 14 Feb 2011 08:12:05 +1100 (EST) Received: from localhost ([127.0.0.1]:49852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PojEZ-0005TF-7B for incoming@patchwork.ozlabs.org; Sun, 13 Feb 2011 16:11:55 -0500 Received: from [140.186.70.92] (port=53299 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PojC7-0004CS-Um for qemu-devel@nongnu.org; Sun, 13 Feb 2011 16:09:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PojC6-0004CX-Rz for qemu-devel@nongnu.org; Sun, 13 Feb 2011 16:09:23 -0500 Received: from mail-vx0-f173.google.com ([209.85.220.173]:50197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PojC6-0004CS-Kx for qemu-devel@nongnu.org; Sun, 13 Feb 2011 16:09:22 -0500 Received: by vxb40 with SMTP id 40so2284196vxb.4 for ; Sun, 13 Feb 2011 13:09:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:from:date:message-id:subject:to :content-type; bh=PHRrUAvdTdCjfA+Xxwgul7e5MS3gxqBZ4ozVBc/+GOE=; b=RSsL2G7OBa01BVo9O7JKbGTS+nomKxSb73CuchH6zvtraLBD+w692zObOxx29sznqu LrQNQeHpRiNKmSmP5QTJWu88vNcfdoMSf7sNIaS6VinwI0I2RSD/RIL0srs3iRtBgoki LMVbGMGXqeqKWBIr/5x9W6IfHGrEd/ftASQJ4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=QTBpz9Fq6bcAHGwn1ivWh53FXK6Nvu2alpfH39z5FtK3St7yZGjdfaUT7Czf4FQrfT BTkVy0xR+GmEGKo8W7osAzKgwXrU1AkrfZKu/c5dVQHd1Gicv+rxqToRQa9jIYLU1DZA B9ckrtDUuht7huzBr9s4T/sSAhAyPBPdjsd/4= Received: by 10.220.180.66 with SMTP id bt2mr3886566vcb.134.1297631362137; Sun, 13 Feb 2011 13:09:22 -0800 (PST) MIME-Version: 1.0 Received: by 10.220.186.7 with HTTP; Sun, 13 Feb 2011 13:09:01 -0800 (PST) From: Blue Swirl Date: Sun, 13 Feb 2011 23:09:01 +0200 Message-ID: To: qemu-devel , "David S. Ahern" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.220.173 Cc: Subject: [Qemu-devel] [PATCH 1/4] applesmc: make optional 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 Based on patch by David Ahern. Signed-off-by: Blue Swirl --- Makefile.objs | 1 + Makefile.target | 2 +- default-configs/i386-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + 4 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index adb5842..25ff8a5 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -196,6 +196,7 @@ hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o hw-obj-$(CONFIG_DMA) += dma.o hw-obj-$(CONFIG_HPET) += hpet.o +hw-obj-$(CONFIG_APPLESMC) += applesmc.o # PPC devices hw-obj-$(CONFIG_OPENPIC) += openpic.o diff --git a/Makefile.target b/Makefile.target index a6c30dd..e4b1210 100644 --- a/Makefile.target +++ b/Makefile.target @@ -215,7 +215,7 @@ obj-$(CONFIG_KVM) += ivshmem.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 piix_pci.o -obj-i386-y += vmport.o applesmc.o +obj-i386-y += vmport.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += debugcon.o multiboot.o obj-i386-y += pc_piix.o diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 3e0eddf..55589fa 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -20,3 +20,4 @@ CONFIG_NE2000_ISA=y CONFIG_PIIX_PCI=y CONFIG_SOUND=y CONFIG_HPET=y +CONFIG_APPLESMC=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 1cc1b61..59b7893 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -20,3 +20,4 @@ CONFIG_NE2000_ISA=y CONFIG_PIIX_PCI=y CONFIG_SOUND=y CONFIG_HPET=y +CONFIG_APPLESMC=y