From patchwork Mon Jul 2 23:03:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 168653 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 00DBE2C009F for ; Tue, 3 Jul 2012 09:03:51 +1000 (EST) Received: from localhost ([::1]:60277 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Slpem-000335-Qu for incoming@patchwork.ozlabs.org; Mon, 02 Jul 2012 19:03:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlpeV-00030r-PA for qemu-devel@nongnu.org; Mon, 02 Jul 2012 19:03:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SlpeT-0007Gu-OA for qemu-devel@nongnu.org; Mon, 02 Jul 2012 19:03:31 -0400 Received: from ch1ehsobe001.messaging.microsoft.com ([216.32.181.181]:18816 helo=ch1outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlpeT-0007GJ-CB; Mon, 02 Jul 2012 19:03:29 -0400 Received: from mail144-ch1-R.bigfish.com (10.43.68.245) by CH1EHSOBE004.bigfish.com (10.43.70.54) with Microsoft SMTP Server id 14.1.225.23; Mon, 2 Jul 2012 23:01:30 +0000 Received: from mail144-ch1 (localhost [127.0.0.1]) by mail144-ch1-R.bigfish.com (Postfix) with ESMTP id F1CA3E012B; Mon, 2 Jul 2012 23:01:29 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 7 X-BigFish: VS7(z1039ozzz1202hzz8275bhz2dh2a8h668h839hd24he5bhf0ah) Received: from mail144-ch1 (localhost.localdomain [127.0.0.1]) by mail144-ch1 (MessageSwitch) id 1341270087735143_19010; Mon, 2 Jul 2012 23:01:27 +0000 (UTC) Received: from CH1EHSMHS029.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.250]) by mail144-ch1.bigfish.com (Postfix) with ESMTP id B0BAE400045; Mon, 2 Jul 2012 23:01:27 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS029.bigfish.com (10.43.70.29) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 2 Jul 2012 23:01:27 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.298.5; Mon, 2 Jul 2012 18:03:24 -0500 Received: from tyr.buserror.net ([10.214.84.6]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q62N3MV5008552; Mon, 2 Jul 2012 16:03:23 -0700 From: Scott Wood To: Alex Graf Date: Mon, 2 Jul 2012 18:03:18 -0500 Message-ID: <1341270201-7456-2-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1341270201-7456-1-git-send-email-scottwood@freescale.com> References: <20120627234639.GA8974@tyr.buserror.net> <1341270201-7456-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-detected-operating-system: by eggs.gnu.org: Windows XP/2000 (RFC1323+, w+, tstamp-) X-Received-From: 216.32.181.181 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RESEND PATCH v2 1/4] 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 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 --- 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"