diff options
| author | Alexey Kardashevskiy | 2013-07-06 15:53:58 +0200 |
|---|---|---|
| committer | Alexander Graf | 2013-07-11 18:51:23 +0200 |
| commit | 42e5b4c9884c2c69825d6b6c6ddfbf25290856db (patch) | |
| tree | ff60c5955d3f3eb283e09e1a727cb6a4f1f7bee1 | |
| parent | spapr: Respect -bios command line option for SLOF (diff) | |
| download | qemu-42e5b4c9884c2c69825d6b6c6ddfbf25290856db.tar.gz qemu-42e5b4c9884c2c69825d6b6c6ddfbf25290856db.tar.xz qemu-42e5b4c9884c2c69825d6b6c6ddfbf25290856db.zip | |
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>
| -rw-r--r-- | default-configs/ppc64-softmmu.mak | 2 | ||||
| -rw-r--r-- | hw/intc/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/intc/xics.c (renamed from hw/ppc/xics.c) | 0 | ||||
| -rw-r--r-- | hw/ppc/Makefile.objs | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index 5a72b5f038..6d1933bbf9 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -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 diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 86f9d5b9df..2851eed25f 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -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 diff --git a/hw/ppc/xics.c b/hw/intc/xics.c index 091912e2ca..091912e2ca 100644 --- a/hw/ppc/xics.c +++ b/hw/intc/xics.c diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index be00d1da3b..7a1cd5d89e 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 |