Commit 42e5b4c9 authored Jul 06, 2013 by Alexey Kardashevskiy Committed by Alexander Graf Jul 11, 2013

pseries: move interrupt controllers to hw/intc/



Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>

parent 8e7ea787

default-configs/ppc64-softmmu.mak

+2 −0

Original line number	Diff line number	Diff line
		@@ -45,5 +45,7 @@ CONFIG_OPENPIC=y
		CONFIG_PSERIES=y
		CONFIG_E500=y
		CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
		# For pSeries
		CONFIG_XICS=$(CONFIG_PSERIES)
		# For PReP
		CONFIG_MC146818RTC=y

hw/intc/Makefile.objs

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,3 +22,4 @@ obj-$(CONFIG_IOAPIC) += ioapic.o
		obj-$(CONFIG_OMAP) += omap_intc.o
		obj-$(CONFIG_OPENPIC_KVM) += openpic_kvm.o
		obj-$(CONFIG_SH4) += sh_intc.o
		obj-$(CONFIG_XICS) += xics.o

hw/ppc/xics.c→hw/intc/xics.c

+0 −0

File moved.

hw/ppc/Makefile.objs

+1 −1

Original line number	Diff line number	Diff line
		# 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