From patchwork Tue Feb 12 10:13:13 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: 219802 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 352B02C0325 for ; Tue, 12 Feb 2013 22:27:09 +1100 (EST) Received: from localhost ([::1]:42395 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5E0x-0004NH-AM for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2013 06:27:07 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5CsQ-0005Bo-3T for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5CsK-0003R8-Lo for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:13 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42796 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5CsK-0003Qx-Em; Tue, 12 Feb 2013 05:14:08 -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 0F092A520C; Tue, 12 Feb 2013 11:14:08 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 12 Feb 2013 11:13:13 +0100 Message-Id: <1360664012-16824-21-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 20/39] target-ppc: Extract 603e alias 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 | 5 ++--- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 8ec1de0..c1619a4 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7234,7 +7234,6 @@ enum { CPU_POWERPC_601_v2 = 0x00010002, CPU_POWERPC_602 = 0x00050100, CPU_POWERPC_603 = 0x00030100, -#define CPU_POWERPC_603E CPU_POWERPC_603E_v41 CPU_POWERPC_603E_v11 = 0x00060101, CPU_POWERPC_603E_v12 = 0x00060102, CPU_POWERPC_603E_v13 = 0x00060103, @@ -8610,8 +8609,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("602", CPU_POWERPC_602, 602) /* PowerPC 603 */ POWERPC_DEF("603", CPU_POWERPC_603, 603) - /* PowerPC 603e (aka PID6) */ - POWERPC_DEF("603e", CPU_POWERPC_603E, 603E) /* PowerPC 603e v1.1 */ POWERPC_DEF("603e_v1.1", CPU_POWERPC_603E_v11, 603E) /* PowerPC 603e v1.2 */ @@ -9117,6 +9114,8 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "e500", "e500v2_v22" }, /* Code name for PowerPC 603 */ { "Vanilla", "603" }, + /* PowerPC 603e (aka PID6) */ + { "603e", "603e_v4.1" }, /* Code name for PowerPC 603e */ { "Stretch", "603e" }, /* Code name for PowerPC 603ev */