From patchwork Wed Sep 28 11:01:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 116754 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 9F13FB6F8A for ; Wed, 28 Sep 2011 21:01:36 +1000 (EST) Received: from localhost ([::1]:59512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8rtM-0004qD-4D for incoming@patchwork.ozlabs.org; Wed, 28 Sep 2011 07:01:32 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8rt5-0004iy-US for qemu-devel@nongnu.org; Wed, 28 Sep 2011 07:01:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8rt3-0004GO-Qc for qemu-devel@nongnu.org; Wed, 28 Sep 2011 07:01:15 -0400 Received: from david.siemens.de ([192.35.17.14]:33146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8rt3-0004FU-Az for qemu-devel@nongnu.org; Wed, 28 Sep 2011 07:01:13 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p8SB1B3T013499; Wed, 28 Sep 2011 13:01:11 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p8SB18WA017664; Wed, 28 Sep 2011 13:01:11 +0200 From: Jan Kiszka To: Anthony Liguori , qemu-devel Date: Wed, 28 Sep 2011 13:01:08 +0200 Message-Id: X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.14 Cc: Blue Swirl Subject: [Qemu-devel] [PATCH 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 No target-specific bits remaining, let's move it over. Signed-off-by: Jan Kiszka --- Makefile.objs | 2 +- Makefile.target | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 1c65087..e56c18a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -276,7 +276,7 @@ hw-obj-$(CONFIG_AHCI) += ide/ich.o hw-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o hw-obj-$(CONFIG_ESP) += esp.o -hw-obj-y += dma-helpers.o sysbus.o isa-bus.o +hw-obj-y += dma-helpers.o sysbus.o isa-bus.o i8259.o hw-obj-y += qdev-addr.o # VGA 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