From patchwork Tue Feb 12 10:13:17 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: 219800 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 4F9BB2C0089 for ; Tue, 12 Feb 2013 22:26:23 +1100 (EST) Received: from localhost ([::1]:39278 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5E0D-0002db-FZ for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2013 06:26:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5CsV-0005Rl-Vh for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5CsP-0003TK-J2 for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:19 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42803 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5CsP-0003TA-9B; Tue, 12 Feb 2013 05:14:13 -0500 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 D2ADCA520C; Tue, 12 Feb 2013 11:14:12 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 12 Feb 2013 11:13:17 +0100 Message-Id: <1360664012-16824-25-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360664012-16824-1-git-send-email-afaerber@suse.de> References: <1360664012-16824-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 24/39] target-ppc: Extract e500v1/e500v2 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 | 10 ++++------ 1 Datei geändert, 4 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index a2f1030..9b4c30b 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7136,8 +7136,6 @@ enum { /* e500 family */ /* e500 cores */ #define CPU_POWERPC_e500 CPU_POWERPC_e500v2_v22 -#define CPU_POWERPC_e500v1 CPU_POWERPC_e500v1_v20 -#define CPU_POWERPC_e500v2 CPU_POWERPC_e500v2_v22 CPU_POWERPC_e500v1_v10 = 0x80200010, CPU_POWERPC_e500v1_v20 = 0x80200020, CPU_POWERPC_e500v2_v10 = 0x80210010, @@ -8318,14 +8316,10 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF_SVR("MPC8379E", CPU_POWERPC_MPC837x, POWERPC_SVR_8379E, e300) /* e500 family */ - /* PowerPC e500v1 core */ - POWERPC_DEF("e500v1", CPU_POWERPC_e500v1, e500v1) /* PowerPC e500 v1.0 core */ POWERPC_DEF("e500_v10", CPU_POWERPC_e500v1_v10, e500v1) /* PowerPC e500 v2.0 core */ POWERPC_DEF("e500_v20", CPU_POWERPC_e500v1_v20, e500v1) - /* PowerPC e500v2 core */ - POWERPC_DEF("e500v2", CPU_POWERPC_e500v2, e500v2) /* PowerPC e500v2 v1.0 core */ POWERPC_DEF("e500v2_v10", CPU_POWERPC_e500v2_v10, e500v2) /* PowerPC e500v2 v2.0 core */ @@ -9018,6 +9012,10 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "PowerQUICC-II", "MPC82xx" }, /* PowerPC e500 core */ { "e500", "e500v2_v22" }, + /* PowerPC e500v1 core */ + { "e500v1", "e500_v20" }, + /* PowerPC e500v2 core */ + { "e500v2", "e500v2_v22" }, /* MPC8533 */ { "MPC8533", "MPC8533_v11" }, /* MPC8533E */