From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvSwb-0002Fw-KT for qemu-devel@nongnu.org; Sat, 06 Jul 2013 09:54:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UvSwa-0001p8-Mj for qemu-devel@nongnu.org; Sat, 06 Jul 2013 09:54:33 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:58531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvSwa-0001p1-HF for qemu-devel@nongnu.org; Sat, 06 Jul 2013 09:54:32 -0400 Received: by mail-pd0-f174.google.com with SMTP id 10so2738708pdc.19 for ; Sat, 06 Jul 2013 06:54:31 -0700 (PDT) From: Alexey Kardashevskiy Date: Sat, 6 Jul 2013 23:53:58 +1000 Message-Id: <1373118856-30171-2-git-send-email-aik@ozlabs.ru> In-Reply-To: <1373118856-30171-1-git-send-email-aik@ozlabs.ru> References: <1373118856-30171-1-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 01/19] pseries: move interrupt controllers to hw/intc/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Alexey Kardashevskiy , Alexander Graf , qemu-ppc@nongnu.org, Paul Mackerras , David Gibson Signed-off-by: Alexey Kardashevskiy Reviewed-by: Andreas Färber --- default-configs/ppc64-softmmu.mak | 1 + hw/intc/Makefile.objs | 1 + hw/{ppc => intc}/xics.c | 0 hw/ppc/Makefile.objs | 2 +- 4 files changed, 3 insertions(+), 1 deletion(-) rename hw/{ppc => intc}/xics.c (100%) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index cb279cb..69a9f8d 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -47,5 +47,6 @@ CONFIG_E500=y CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM)) # For pSeries CONFIG_PCI_HOTPLUG=y +CONFIG_XICS=$(CONFIG_PSERIES) # For PReP CONFIG_MC146818RTC=y diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 2ba49d0..abe8f80 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -22,3 +22,4 @@ obj-$(CONFIG_OMAP) += omap_intc.o obj-$(CONFIG_OPENPIC) += openpic.o obj-$(CONFIG_OPENPIC_KVM) += openpic_kvm.o obj-$(CONFIG_SH4) += sh_intc.o +obj-$(CONFIG_XICS) += xics.o diff --git a/hw/ppc/xics.c b/hw/intc/xics.c similarity index 100% rename from hw/ppc/xics.c rename to hw/intc/xics.c diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index be00d1d..7a1cd5d 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,7 +1,7 @@ # shared objects obj-y += ppc.o ppc_booke.o # IBM pSeries (sPAPR) -obj-$(CONFIG_PSERIES) += spapr.o xics.o spapr_vio.o spapr_events.o +obj-$(CONFIG_PSERIES) += spapr.o spapr_vio.o spapr_events.o obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o obj-$(CONFIG_PSERIES) += spapr_pci.o # PowerPC 4xx boards -- 1.8.3.2