From patchwork Tue Feb 12 10:13:29 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: 219776 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 71D802C0327 for ; Tue, 12 Feb 2013 21:40:38 +1100 (EST) Received: from localhost ([::1]:50580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5DHw-0000TU-M3 for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2013 05:40:36 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41808) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Csm-0005Wr-Of for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5Csd-0003Zh-G5 for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:36 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42819 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Csd-0003ZR-5I; Tue, 12 Feb 2013 05:14:27 -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 B9132A520C; Tue, 12 Feb 2013 11:14:26 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 12 Feb 2013 11:13:29 +0100 Message-Id: <1360664012-16824-37-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 36/39] target-ppc: Extract 970 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 aa31f81..5e8756c 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7322,14 +7322,12 @@ enum { CPU_POWERPC_POWER7_v21 = 0x003F0201, CPU_POWERPC_POWER7_v23 = 0x003F0203, CPU_POWERPC_970 = 0x00390202, -#define CPU_POWERPC_970FX CPU_POWERPC_970FX_v31 CPU_POWERPC_970FX_v10 = 0x00391100, CPU_POWERPC_970FX_v20 = 0x003C0200, CPU_POWERPC_970FX_v21 = 0x003C0201, CPU_POWERPC_970FX_v30 = 0x003C0300, CPU_POWERPC_970FX_v31 = 0x003C0301, CPU_POWERPC_970GX = 0x00450000, -#define CPU_POWERPC_970MP CPU_POWERPC_970MP_v11 CPU_POWERPC_970MP_v10 = 0x00440100, CPU_POWERPC_970MP_v11 = 0x00440101, #define CPU_POWERPC_CELL CPU_POWERPC_CELL_v32 @@ -8713,8 +8711,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("POWER7_v2.3", CPU_POWERPC_POWER7_v23, POWER7) /* PowerPC 970 */ POWERPC_DEF("970", CPU_POWERPC_970, 970) - /* PowerPC 970FX (G5) */ - POWERPC_DEF("970fx", CPU_POWERPC_970FX, 970FX) /* PowerPC 970FX v1.0 (G5) */ POWERPC_DEF("970fx_v1.0", CPU_POWERPC_970FX_v10, 970FX) /* PowerPC 970FX v2.0 (G5) */ @@ -8727,8 +8723,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("970fx_v3.1", CPU_POWERPC_970FX_v31, 970FX) /* PowerPC 970GX (G5) */ POWERPC_DEF("970gx", CPU_POWERPC_970GX, 970GX) - /* PowerPC 970MP */ - POWERPC_DEF("970mp", CPU_POWERPC_970MP, 970MP) /* PowerPC 970MP v1.0 */ POWERPC_DEF("970mp_v1.0", CPU_POWERPC_970MP_v10, 970MP) /* PowerPC 970MP v1.1 */ @@ -9075,6 +9069,8 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "Boxer", "POWER3" }, { "Dino", "POWER3" }, { "POWER3+", "631" }, + { "970fx", "970fx_v3.1" }, + { "970mp", "970mp_v1.1" }, { "Apache", "RS64" }, { "A35", "RS64" }, { "NorthStar", "RS64-II" },