From patchwork Mon Feb 18 09:16:24 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: 221229 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 E118D2C0295 for ; Mon, 18 Feb 2013 21:49:10 +1100 (EST) Received: from localhost ([::1]:37083 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7OHV-0001vy-5f for incoming@patchwork.ozlabs.org; Mon, 18 Feb 2013 05:49:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:37118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Mr5-0003G3-9g for qemu-devel@nongnu.org; Mon, 18 Feb 2013 04:17:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7Mqz-00040B-80 for qemu-devel@nongnu.org; Mon, 18 Feb 2013 04:17:47 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45070 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Mqy-0003zp-Pc; Mon, 18 Feb 2013 04:17:41 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 5BCFFA4E0C; Mon, 18 Feb 2013 10:17:40 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2013 10:16:24 +0100 Message-Id: <1361179011-7226-26-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361179011-7226-1-git-send-email-afaerber@suse.de> References: <1361179011-7226-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Subject: [Qemu-devel] [PATCH ppc-next v2 25/52] target-ppc: Extract 601/601v aliases 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 --- target-ppc/translate_init.c | 8 ++------ 1 Datei geändert, 2 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 3954f93..9d8067b 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7225,10 +7225,8 @@ enum { #define CPU_POWERPC_MPC8641 CPU_POWERPC_e600 #define CPU_POWERPC_MPC8641D CPU_POWERPC_e600 /* PowerPC 6xx cores */ -#define CPU_POWERPC_601 CPU_POWERPC_601_v2 CPU_POWERPC_601_v0 = 0x00010001, CPU_POWERPC_601_v1 = 0x00010001, -#define CPU_POWERPC_601v CPU_POWERPC_601_v2 CPU_POWERPC_601_v2 = 0x00010002, CPU_POWERPC_602 = 0x00050100, CPU_POWERPC_603 = 0x00030100, @@ -8592,14 +8590,10 @@ static const ppc_def_t ppc_defs[] = { CPU_POWERPC_MPC8641D, POWERPC_SVR_8641D, 7400) /* 32 bits "classic" PowerPC */ /* PowerPC 6xx family */ - /* PowerPC 601 */ - POWERPC_DEF("601", CPU_POWERPC_601, 601v) /* PowerPC 601v0 */ POWERPC_DEF("601_v0", CPU_POWERPC_601_v0, 601) /* PowerPC 601v1 */ POWERPC_DEF("601_v1", CPU_POWERPC_601_v1, 601) - /* PowerPC 601v */ - POWERPC_DEF("601v", CPU_POWERPC_601v, 601v) /* PowerPC 601v2 */ POWERPC_DEF("601_v2", CPU_POWERPC_601_v2, 601v) /* PowerPC 602 */ @@ -9072,6 +9066,8 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "PowerQUICC-II", "MPC82xx" }, { "e500", "e500v2_v22" }, + { "601", "601_v2" }, + { "601v", "601_v2" }, { "Vanilla", "603" }, { "603e", "603e_v4.1" }, { "Stretch", "603e" },