From patchwork Wed Sep 28 21:50:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 116857 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9D5811007D3 for ; Thu, 29 Sep 2011 07:50:42 +1000 (EST) Received: from localhost ([::1]:40062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R921X-0007AB-7C for incoming@patchwork.ozlabs.org; Wed, 28 Sep 2011 17:50:39 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R921R-0007A5-D2 for qemu-devel@nongnu.org; Wed, 28 Sep 2011 17:50:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R921P-0000bt-SH for qemu-devel@nongnu.org; Wed, 28 Sep 2011 17:50:33 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:33607) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R921P-0000bo-EL for qemu-devel@nongnu.org; Wed, 28 Sep 2011 17:50:31 -0400 Received: from smtp08.web.de ( [172.20.5.216]) by fmmailgate02.web.de (Postfix) with ESMTP id 022881ACCCBB9; Wed, 28 Sep 2011 23:50:04 +0200 (CEST) Received: from [88.65.45.85] (helo=mchn199C.mchp.siemens.de) by smtp08.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1R920x-0001Vw-00; Wed, 28 Sep 2011 23:50:03 +0200 Message-ID: <4E83968B.6070606@web.de> Date: Wed, 28 Sep 2011 23:50:03 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Blue Swirl , Anthony Liguori References: In-Reply-To: X-Enigmail-Version: 1.3.2 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX18CeaIvuoz5DcDAD4PK2zctW4C0TxuN45UsU4JU h1IaDuztmciAtDHUnoYpTbh3oqI+uIjZTwjTAs+r3uu58QQb7l Z67nY4DC4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.227 Cc: qemu-devel Subject: [Qemu-devel] [PATCH v2 22/22] i8259: Move to hw library X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka No target-specific bits remaining, let's move it over. Signed-off-by: Jan Kiszka --- Changes in v2: - Use defconfigs to control the existence in hwlib Makefile.objs | 1 + Makefile.target | 8 ++++---- default-configs/alpha-softmmu.mak | 1 + 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/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + 12 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 1c65087..d457997 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -220,6 +220,7 @@ hw-obj-$(CONFIG_APPLESMC) += applesmc.o hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o +hw-obj-$(CONFIG_I8259) += i8259.o # PPC devices hw-obj-$(CONFIG_OPENPIC) += openpic.o diff --git a/Makefile.target b/Makefile.target index 88d2f1f..393f58d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -219,7 +219,7 @@ obj-$(CONFIG_IVSHMEM) += ivshmem.o # Hardware support obj-i386-y += vga.o -obj-i386-y += mc146818rtc.o i8259.o pc.o +obj-i386-y += mc146818rtc.o pc.o obj-i386-y += cirrus_vga.o sga.o apic.o ioapic.o piix_pci.o obj-i386-y += vmport.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o @@ -232,7 +232,7 @@ obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o obj-ppc-y = ppc.o obj-ppc-y += vga.o # PREP target -obj-ppc-y += i8259.o mc146818rtc.o +obj-ppc-y += mc146818rtc.o obj-ppc-y += ppc_prep.o # OldWorld PowerMac obj-ppc-y += ppc_oldworld.o @@ -283,7 +283,7 @@ obj-lm32-y += framebuffer.o obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y += mips_addr.o mips_timer.o mips_int.o -obj-mips-y += vga.o i8259.o +obj-mips-y += vga.o obj-mips-y += jazz_led.o obj-mips-y += gt64xxx.o mc146818rtc.o obj-mips-y += cirrus_vga.o @@ -365,7 +365,7 @@ obj-m68k-y += m68k-semi.o dummy_m68k.o obj-s390x-y = s390-virtio-bus.o s390-virtio.o -obj-alpha-y = i8259.o mc146818rtc.o +obj-alpha-y = mc146818rtc.o obj-alpha-y += vga.o cirrus_vga.o obj-xtensa-y += xtensa_pic.o diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak index abadcff..3889213 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -7,3 +7,4 @@ CONFIG_VGA_PCI=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_VMWARE_VGA=y +CONFIG_I8259=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 55589fa..e67ebb3 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -21,3 +21,4 @@ CONFIG_PIIX_PCI=y CONFIG_SOUND=y CONFIG_HPET=y CONFIG_APPLESMC=y +CONFIG_I8259=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index 45bdefb..94a3486 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -27,3 +27,4 @@ CONFIG_DS1225Y=y CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y CONFIG_G364FB=y +CONFIG_I8259=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index d43e33c..b5d3108 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -27,3 +27,4 @@ CONFIG_DS1225Y=y CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y CONFIG_G364FB=y +CONFIG_I8259=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index f307e8d..2831f44 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -29,3 +29,4 @@ CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y CONFIG_FULONG=y CONFIG_G364FB=y +CONFIG_I8259=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index 1a66bc3..14c949d 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -27,3 +27,4 @@ CONFIG_DS1225Y=y CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y CONFIG_G364FB=y +CONFIG_I8259=y diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 4563742..c85cdce 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -31,3 +31,4 @@ CONFIG_SOUND=y CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y +CONFIG_I8259=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index d5073b3..8874115 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -31,3 +31,4 @@ CONFIG_SOUND=y CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y +CONFIG_I8259=y diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index 9f0730c..5db7205 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -31,3 +31,4 @@ CONFIG_SOUND=y CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y +CONFIG_I8259=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 8895028..b75757e 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -21,3 +21,4 @@ CONFIG_PIIX_PCI=y CONFIG_SOUND=y CONFIG_HPET=y CONFIG_APPLESMC=y +CONFIG_I8259=y