[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 05/22] pseries: move interrupt controllers to hw/intc/
From: |
Alexander Graf |
Subject: |
[Qemu-ppc] [PATCH 05/22] pseries: move interrupt controllers to hw/intc/ |
Date: |
Thu, 11 Jul 2013 19:01:08 +0200 |
From: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
default-configs/ppc64-softmmu.mak | 2 ++
hw/intc/Makefile.objs | 1 +
hw/{ppc => intc}/xics.c | 0
hw/ppc/Makefile.objs | 2 +-
4 files changed, 4 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 5a72b5f..6d1933b 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 86f9d5b..2851eed 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
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.1.4
- [Qemu-ppc] [PULL 00/22] ppc patch queue 2013-07-11, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 04/22] spapr: Respect -bios command line option for SLOF, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 09/22] PPC: Macio: Replace tabs with spaces, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 05/22] pseries: move interrupt controllers to hw/intc/,
Alexander Graf <=
- [Qemu-ppc] [PATCH 02/22] spapr: Fix compiler warnings for some versions of gcc, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 12/22] PPC: dbdma: Fix debug print, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 21/22] PPC: Add timer handler for newworld mac-io, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 03/22] spapr: Use named enum for function remove_hpte, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 22/22] PPC: dbdma: Support more multi-issue DMA requests, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 18/22] PPC: dbdma: Move processing to io, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 15/22] PPC: dbdma: Introduce kick function, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 01/22] e600 core for MPC86xx processors, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 07/22] PPC: Mac: Fix guest exported tbfreq values, Alexander Graf, 2013/07/11
- [Qemu-ppc] [PATCH 13/22] PPC: dbdma: Allow new commands in RUN state, Alexander Graf, 2013/07/11