ppc: move files referencing CPU to hw/ppc/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 294d0de2119c3c4341acf5213ecdee4782e9d1f9..acc9961ab00240b62f2689e2ca68706c549e4be1 100644 (file)
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -1,14 +1,12 @@
 # PREP target
 obj-y += mc146818rtc.o
 # IBM pSeries (sPAPR)
-obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_rtas.o spapr_vio.o
-obj-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o
+obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_rtas.o
+obj-$(CONFIG_PSERIES) += spapr_vty.o spapr_llan.o spapr_vscsi.o
 obj-$(CONFIG_PSERIES) += spapr_pci.o pci/pci-hotplug.o spapr_iommu.o
 obj-$(CONFIG_PSERIES) += spapr_events.o spapr_nvram.o
 # PowerPC 4xx boards
-obj-y += ppc4xx_devs.o ppc4xx_pci.o
-# PowerPC E500 boards
-obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o
+obj-y += ppc4xx_pci.o
 # PowerPC OpenPIC
 obj-y += openpic.o
 
@@ -20,9 +18,9 @@ obj-y := $(addprefix ../,$(obj-y))
 # shared objects
 obj-y += ppc.o ppc_booke.o
 # IBM pSeries (sPAPR)
-obj-$(CONFIG_PSERIES) += spapr.o
+obj-$(CONFIG_PSERIES) += spapr.o xics.o spapr_vio.o
 # PowerPC 4xx boards
-obj-y += ppc405_boards.o ppc405_uc.o ppc440_bamboo.o
+obj-y += ppc405_boards.o ppc4xx_devs.o ppc405_uc.o ppc440_bamboo.o
 # PReP
 obj-y += prep.o
 # OldWorld PowerMac
@@ -31,5 +29,6 @@ obj-y += mac_oldworld.o
 obj-y += mac_newworld.o
 # e500
 obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o
+obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o
 # PowerPC 440 Xilinx ML507 reference board.
 obj-y += virtex_ml507.o

diff --git a/hw/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
similarity index 100%
rename from hw/mpc8544_guts.c
rename to hw/ppc/mpc8544_guts.c

diff --git a/hw/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
similarity index 100%
rename from hw/ppc4xx_devs.c
rename to hw/ppc/ppc4xx_devs.c

diff --git a/hw/ppce500_spin.c b/hw/ppc/ppce500_spin.c
similarity index 100%
rename from hw/ppce500_spin.c
rename to hw/ppc/ppce500_spin.c

diff --git a/hw/spapr_vio.c b/hw/ppc/spapr_vio.c
similarity index 100%
rename from hw/spapr_vio.c
rename to hw/ppc/spapr_vio.c

diff --git a/hw/xics.c b/hw/ppc/xics.c
similarity index 100%
rename from hw/xics.c
rename to hw/ppc/xics.c