From patchwork Wed Aug 15 09:58:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 177611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3721D2C0098 for ; Wed, 15 Aug 2012 20:25:31 +1000 (EST) Received: from localhost ([::1]:38590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1aOF-0003EF-G9 for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 05:59:51 -0400 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 Received: from cantor2.suse.de ([195.135.220.15]:38699 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1aNX-0006tQ-Pw; Wed, 15 Aug 2012 05:59:08 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 35548A3DE0; Wed, 15 Aug 2012 11:59:07 +0200 (CEST) From: Alexander Graf To: qemu-ppc Mailing List Date: Wed, 15 Aug 2012 11:58:41 +0200 Message-Id: <1345024742-18394-4-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Blue Swirl , Scott Wood , qemu-devel qemu-devel , Aurelien Jarno Subject: [Qemu-devel] [PATCH 03/24] PPC: e500: rename mpc8544ds into generic file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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ärber [agraf: conditionalize on CONFIG_FDT] Signed-off-by: Alexander Graf --- 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..e86c524 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-$(CONFIG_FDT) += 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"