From patchwork Wed Jan 30 09:31:00 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: 216797 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 B6A722C0087 for ; Wed, 30 Jan 2013 20:31:44 +1100 (EST) Received: from localhost ([::1]:47080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0U17-0002ct-W3 for incoming@patchwork.ozlabs.org; Wed, 30 Jan 2013 04:31:41 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0U0d-0002BH-2z for qemu-devel@nongnu.org; Wed, 30 Jan 2013 04:31:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U0U0a-0004OG-Si for qemu-devel@nongnu.org; Wed, 30 Jan 2013 04:31:11 -0500 Received: from mout.web.de ([212.227.17.11]:55493) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0U0a-0004O1-IX; Wed, 30 Jan 2013 04:31:08 -0500 Received: from localhost.localdomain ([84.148.60.179]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0MTPel-1USi6u2TbD-00SNrV; Wed, 30 Jan 2013 10:31:07 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 30 Jan 2013 10:31:00 +0100 Message-Id: <1359538260-31261-4-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359538260-31261-1-git-send-email-andreas.faerber@web.de> References: <1359538260-31261-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:WOslrGwz2xlOvh8cVpmgmzUPtqPo/apmIDI7QIo7s8y TA1mSmeQfJXHktHOtDFYjdoDDc3QYBYwbBhcUYuZ9F48weelvZ EYTtlZimU9R7axLmk/b3de85DkJ0MdeV52aYykRLvJukud1CQA zSCjLMGsKZ636sXOYADFRS1AqG37wmXq/mYsALQgJpJqw8lFXw qcnwnj8+ti8OF1jy/akbw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.17.11 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 --- hw/ppc/Makefile.objs | 3 ++- hw/{ppc_prep.c => ppc/prep.c} | 28 ++++++++++++++-------------- 2 Dateien geändert, 16 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-) rename hw/{ppc_prep.c => ppc/prep.c} (98%) 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"