[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RESEND PATCH v2 1/4] PPC: e500: rename mpc8544ds into gene
From: |
Scott Wood |
Subject: |
[Qemu-devel] [RESEND PATCH v2 1/4] PPC: e500: rename mpc8544ds into generic file |
Date: |
Mon, 2 Jul 2012 18:03:18 -0500 |
Rename the file (with no changes other than fixing up the header paths)
in preparation for refactoring into a generic e500 platform. Also move
it into the newly created ppc/ directory.
Signed-off-by: Scott Wood <address@hidden>
---
v2: Use the right part of the makefile for hw/ppc files
hw/ppc/Makefile.objs | 4 +++-
hw/{ppce500_mpc8544ds.c => ppc/e500.c} | 16 ++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
rename hw/{ppce500_mpc8544ds.c => ppc/e500.c} (99%)
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index aa4bbeb..39a6c31 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -15,7 +15,7 @@ obj-$(CONFIG_PSERIES) += spapr_pci.o pci-hotplug.o
spapr_iommu.o
obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
obj-y += ppc440_bamboo.o
# PowerPC E500 boards
-obj-$(CONFIG_FDT) += ppce500_mpc8544ds.o mpc8544_guts.o ppce500_spin.o
+obj-$(CONFIG_FDT) += mpc8544_guts.o ppce500_spin.o
# PowerPC 440 Xilinx ML507 reference board.
obj-y += virtex_ml507.o
# PowerPC OpenPIC
@@ -26,3 +26,5 @@ obj-$(CONFIG_FDT) += ../device_tree.o
obj-y += xilinx_ethlite.o
obj-y := $(addprefix ../,$(obj-y))
+
+obj-y += e500.o
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppc/e500.c
similarity index 99%
rename from hw/ppce500_mpc8544ds.c
rename to hw/ppc/e500.c
index 8b9fd83..0b383e6 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppc/e500.c
@@ -17,19 +17,19 @@
#include "config.h"
#include "qemu-common.h"
#include "net.h"
-#include "hw.h"
-#include "pc.h"
-#include "pci.h"
-#include "boards.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/pci.h"
+#include "hw/boards.h"
#include "sysemu.h"
#include "kvm.h"
#include "kvm_ppc.h"
#include "device_tree.h"
-#include "openpic.h"
-#include "ppc.h"
-#include "loader.h"
+#include "hw/openpic.h"
+#include "hw/ppc.h"
+#include "hw/loader.h"
#include "elf.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
#include "exec-memory.h"
#include "host-utils.h"
--
1.7.5.4
- [Qemu-devel] [RESEND PATCH v2 0/4] PPC: e500 platform refactoring, Scott Wood, 2012/07/02
- [Qemu-devel] [RESEND PATCH v2 1/4] PPC: e500: rename mpc8544ds into generic file,
Scott Wood <=
- [Qemu-devel] [RESEND PATCH v2 4/4] PPC: e500: add generic e500 platform, Scott Wood, 2012/07/02
- [Qemu-devel] [RESEND PATCH v2 2/4] PPC: e500: change internal references away from mpc8544ds, Scott Wood, 2012/07/02
- [Qemu-devel] [RESEND PATCH v2 3/4] PPC: e500: split mpc8544ds machine from generic e500 code, Scott Wood, 2012/07/02
- Re: [Qemu-devel] [RESEND PATCH v2 0/4] PPC: e500 platform refactoring, Alexander Graf, 2012/07/06
- Re: [Qemu-devel] [RESEND PATCH v2 0/4] PPC: e500 platform refactoring, Alexander Graf, 2012/07/07