Patchwork [RESEND,v2,1/4] PPC: e500: rename mpc8544ds into generic file

login
register
mail settings
Submitter Scott Wood
Date July 2, 2012, 11:03 p.m.
Message ID <1341270201-7456-2-git-send-email-scottwood@freescale.com>
Download mbox | patch
Permalink /patch/168653/
State New
Headers show

Comments

Scott Wood - July 2, 2012, 11:03 p.m.
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 <scottwood@freescale.com>
---
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%)
Andreas Färber - July 3, 2012, 10:40 a.m.
Am 03.07.2012 01:03, schrieb Scott Wood:
> 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 <scottwood@freescale.com>
> ---
> v2: Use the right part of the makefile for hw/ppc files

Reviewed-by: Andreas Färber <afaerber@suse.de>

Thanks,
Andreas

Patch

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"