From patchwork Mon Feb 18 09:16:12 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: 221230 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 423F72C007B for ; Mon, 18 Feb 2013 21:49:42 +1100 (EST) Received: from localhost ([::1]:54846 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Mrk-0003UZ-QB for incoming@patchwork.ozlabs.org; Mon, 18 Feb 2013 04:18:28 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Mqp-0002ZR-Vy for qemu-devel@nongnu.org; Mon, 18 Feb 2013 04:17:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7Mql-0003uQ-37 for qemu-devel@nongnu.org; Mon, 18 Feb 2013 04:17:31 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45044 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Mqk-0003uG-SH; Mon, 18 Feb 2013 04:17:26 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6580EA4E0C; Mon, 18 Feb 2013 10:17:26 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2013 10:16:12 +0100 Message-Id: <1361179011-7226-14-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 13/52] target-ppc: Extract 74x5 as 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 | 7 ++----- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index ad6c703..4e583e2 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7361,7 +7361,6 @@ enum { CPU_POWERPC_74x1_v23 = 0x80000203, /* aka G: 2.3 */ /* XXX: this entry might be a bug in some documentation */ CPU_POWERPC_74x1_v210 = 0x80000210, /* aka G: 2.3 ? */ -#define CPU_POWERPC_74x5 CPU_POWERPC_74x5_v32 CPU_POWERPC_74x5_v10 = 0x80010100, /* XXX: missing 0x80010200 */ CPU_POWERPC_74x5_v21 = 0x80010201, /* aka C: 2.1 */ @@ -8903,10 +8902,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("7441_v2.10", CPU_POWERPC_74x1_v210, 7440) /* PowerPC 7451 v2.10 (G4) */ POWERPC_DEF("7451_v2.10", CPU_POWERPC_74x1_v210, 7450) - /* PowerPC 7445 (G4) */ - POWERPC_DEF("7445", CPU_POWERPC_74x5, 7445) - /* PowerPC 7455 (G4) */ - POWERPC_DEF("7455", CPU_POWERPC_74x5, 7455) /* PowerPC 7445 v1.0 (G4) */ POWERPC_DEF("7445_v1.0", CPU_POWERPC_74x5_v10, 7445) /* PowerPC 7455 v1.0 (G4) */ @@ -9147,6 +9142,8 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "G4", "7400" }, { "Nitro", "7410" }, { "Vger", "7450" }, + { "7445", "7445_v3.2" }, + { "7455", "7455_v3.2" }, { "Apollo6", "7455" }, { "7447", "7447_v1.2" }, { "7457", "7457_v1.2" },