From patchwork Wed Jan 30 09:43:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 216801 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 CA1022C0087 for ; Wed, 30 Jan 2013 20:44:28 +1100 (EST) Received: from localhost ([::1]:53482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0UDQ-0006g1-PH for incoming@patchwork.ozlabs.org; Wed, 30 Jan 2013 04:44:24 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0UD9-0006YQ-RT for qemu-devel@nongnu.org; Wed, 30 Jan 2013 04:44:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U0UD7-0008Ai-Pf for qemu-devel@nongnu.org; Wed, 30 Jan 2013 04:44:07 -0500 Received: from mout.web.de ([212.227.17.12]:53720) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0UD7-0008AO-Eq; Wed, 30 Jan 2013 04:44:05 -0500 Received: from localhost.localdomain ([84.148.60.179]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0LzKEH-1V4X5h0rL7-014QQz; Wed, 30 Jan 2013 10:44:04 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 30 Jan 2013 10:43:55 +0100 Message-Id: <1359539035-31698-4-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359539035-31698-1-git-send-email-andreas.faerber@web.de> References: <1359539035-31698-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:cnWFTIMbURGJ5w/aG+F6xq+T0GBFL+H7DNepDfn4bNZ bI5/3OmzjCfqACnNYUb4iTwZJzv4CA8IjymZtkF5mWmIYNnZju lKwKYENU33CPRzwJ+bUb47gxxiFcQYSyYK4y3hyV+BXPiSJMWt 2ORCasv93uWIoM0Wv8oQc3oN6e7e3iH1mjpwg/6TEcfT1tVkQv /muxtzOWB7mEpoa1TB1VQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.17.12 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org Subject: [Qemu-devel] [PATCH 3/3] prep: Move PReP machine to hw/ppc/ 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 Signed-off-by: Andreas Färber --- MAINTAINERS | 2 +- hw/ppc/Makefile.objs | 3 ++- hw/{ppc_prep.c => ppc/prep.c} | 28 ++++++++++++++-------------- 3 Dateien geändert, 17 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) rename hw/{ppc_prep.c => ppc/prep.c} (98%) diff --git a/MAINTAINERS b/MAINTAINERS index 9dd4c20..21043e4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -395,7 +395,7 @@ PReP M: Andreas Färber L: qemu-ppc@nongnu.org S: Odd Fixes -F: hw/ppc_prep.c +F: hw/ppc/prep.c F: hw/prep_pci.[hc] F: hw/pc87312.[hc] diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 462146b..f762050 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -2,7 +2,6 @@ obj-y = ppc.o ppc_booke.o # PREP target obj-y += mc146818rtc.o -obj-y += ppc_prep.o # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o obj-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o @@ -24,6 +23,8 @@ obj-y += xilinx_ethlite.o obj-y := $(addprefix ../,$(obj-y)) +# PReP +obj-y += prep.o # OldWorld PowerMac obj-y += mac_oldworld.o # NewWorld PowerMac diff --git a/hw/ppc_prep.c b/hw/ppc/prep.c similarity index 98% rename from hw/ppc_prep.c rename to hw/ppc/prep.c index a35fbed..e06dded 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc/prep.c @@ -21,23 +21,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "nvram.h" -#include "pc.h" -#include "serial.h" -#include "fdc.h" +#include "hw/hw.h" +#include "hw/nvram.h" +#include "hw/pc.h" +#include "hw/serial.h" +#include "hw/fdc.h" #include "net/net.h" #include "sysemu/sysemu.h" -#include "isa.h" -#include "pci/pci.h" -#include "pci/pci_host.h" -#include "ppc.h" -#include "boards.h" +#include "hw/isa.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" +#include "hw/ppc.h" +#include "hw/boards.h" #include "qemu/log.h" -#include "ide.h" -#include "loader.h" -#include "mc146818rtc.h" -#include "pc87312.h" +#include "hw/ide.h" +#include "hw/loader.h" +#include "hw/mc146818rtc.h" +#include "hw/pc87312.h" #include "sysemu/blockdev.h" #include "sysemu/arch_init.h" #include "exec/address-spaces.h"