From patchwork Mon Feb 18 09:16:39 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: 221188 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 5D0532C0091 for ; Mon, 18 Feb 2013 21:16:35 +1100 (EST) Received: from localhost ([::1]:50393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Nlw-0000vy-4O for incoming@patchwork.ozlabs.org; Mon, 18 Feb 2013 05:16:32 -0500 Received: from eggs.gnu.org ([208.118.235.92]:37440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7MrN-0003IV-PJ for qemu-devel@nongnu.org; Mon, 18 Feb 2013 04:18:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7MrG-00049i-MS for qemu-devel@nongnu.org; Mon, 18 Feb 2013 04:18:05 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45090 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7MrG-00049b-FO; Mon, 18 Feb 2013 04:17:58 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 109CBA4E0C; Mon, 18 Feb 2013 10:17:58 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2013 10:16:39 +0100 Message-Id: <1361179011-7226-41-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 40/52] target-ppc: Extract POWER7 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 | 3 +-- 1 Datei geändert, 1 Zeile hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 1f1570a..868de5d 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7315,7 +7315,6 @@ enum { CPU_POWERPC_POWER6 = 0x003E0000, CPU_POWERPC_POWER6_5 = 0x0F000001, /* POWER6 in POWER5 mode */ CPU_POWERPC_POWER6A = 0x0F000002, -#define CPU_POWERPC_POWER7 CPU_POWERPC_POWER7_v20 CPU_POWERPC_POWER7_v20 = 0x003F0200, CPU_POWERPC_POWER7_v21 = 0x003F0201, CPU_POWERPC_POWER7_v23 = 0x003F0203, @@ -8703,7 +8702,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("POWER6A", CPU_POWERPC_POWER6A, POWER6) #endif /* POWER7 */ - POWERPC_DEF("POWER7", CPU_POWERPC_POWER7, POWER7) POWERPC_DEF("POWER7_v2.0", CPU_POWERPC_POWER7_v20, POWER7) POWERPC_DEF("POWER7_v2.1", CPU_POWERPC_POWER7_v21, POWER7) POWERPC_DEF("POWER7_v2.3", CPU_POWERPC_POWER7_v23, POWER7) @@ -8953,6 +8951,7 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "Boxer", "POWER3" }, { "Dino", "POWER3" }, { "POWER3+", "631" }, + { "POWER7", "POWER7_v2.0" }, { "970fx", "970fx_v3.1" }, { "970mp", "970mp_v1.1" }, { "Apache", "RS64" },