From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1aNZ-000194-BY for qemu-devel@nongnu.org; Wed, 15 Aug 2012 05:59:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1aNY-0006tc-3m for qemu-devel@nongnu.org; Wed, 15 Aug 2012 05:59:09 -0400 From: Alexander Graf Date: Wed, 15 Aug 2012 11:58:41 +0200 Message-Id: <1345024742-18394-4-git-send-email-agraf@suse.de> In-Reply-To: <1345024742-18394-1-git-send-email-agraf@suse.de> References: <1345024742-18394-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 03/24] PPC: e500: rename mpc8544ds into generic file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc Mailing List Cc: Blue Swirl , Scott Wood , qemu-devel qemu-devel , Aurelien Jarno From: 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 Reviewed-by: Andreas F=C3=A4rber [agraf: conditionalize on CONFIG_FDT] Signed-off-by: Alexander Graf --- hw/ppc/Makefile.objs | 4 +++- hw/{ppce500_mpc8544ds.c =3D> ppc/e500.c} | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) rename hw/{ppce500_mpc8544ds.c =3D> ppc/e500.c} (99%) diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index aa4bbeb..e86c524 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -15,7 +15,7 @@ obj-$(CONFIG_PSERIES) +=3D spapr_pci.o pci-hotplug.o sp= apr_iommu.o obj-y +=3D ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o obj-y +=3D ppc440_bamboo.o # PowerPC E500 boards -obj-$(CONFIG_FDT) +=3D ppce500_mpc8544ds.o mpc8544_guts.o ppce500_spin.o +obj-$(CONFIG_FDT) +=3D mpc8544_guts.o ppce500_spin.o # PowerPC 440 Xilinx ML507 reference board. obj-y +=3D virtex_ml507.o # PowerPC OpenPIC @@ -26,3 +26,5 @@ obj-$(CONFIG_FDT) +=3D ../device_tree.o obj-y +=3D xilinx_ethlite.o =20 obj-y :=3D $(addprefix ../,$(obj-y)) + +obj-$(CONFIG_FDT) +=3D 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" =20 --=20 1.6.0.2