[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/18] ppc: move files referencing CPU to hw/ppc/
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 16/18] ppc: move files referencing CPU to hw/ppc/ |
Date: |
Tue, 5 Mar 2013 18:17:43 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/ppc/Makefile.objs | 13 ++++++-------
hw/{ => ppc}/mpc8544_guts.c | 0
hw/{ => ppc}/ppc4xx_devs.c | 0
hw/{ => ppc}/ppce500_spin.c | 0
hw/{ => ppc}/spapr_vio.c | 0
hw/{ => ppc}/xics.c | 0
6 files changed, 6 insertions(+), 7 deletions(-)
rename hw/{ => ppc}/mpc8544_guts.c (100%)
rename hw/{ => ppc}/ppc4xx_devs.c (100%)
rename hw/{ => ppc}/ppce500_spin.c (100%)
rename hw/{ => ppc}/spapr_vio.c (100%)
rename hw/{ => ppc}/xics.c (100%)
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 294d0de..acc9961 100644
--- 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
--
1.8.1.2
- [Qemu-devel] [PATCH 08/18] ppc: do not use ../ in include files, (continued)
- [Qemu-devel] [PATCH 08/18] ppc: do not use ../ in include files, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 06/18] virtio-9p: remove PCI dependencies from hw/9pfs/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 11/18] ppc: express FDT dependency of pSeries and e500 boards via default-configs/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 10/18] build: always link device_tree.o into emulators if libfdt available, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 13/18] arm: move files referencing CPU to hw/arm/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 14/18] i386: move files referencing CPU to hw/i386/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 17/18] ppc: move more files to hw/ppc, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 15/18] m68k: move files referencing CPU to hw/m68k/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 12/18] hw: move boards and other isolated files to hw/ARCH, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 18/18] sh: move files referencing CPU to hw/sh4/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 16/18] ppc: move files referencing CPU to hw/ppc/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/18] hw: include hw header files with full paths, Paolo Bonzini, 2013/03/05
- Re: [Qemu-devel] [PULL 00/18] hw/ reorganization, part 1, Paolo Bonzini, 2013/03/09