From patchwork Fri Mar 8 20:06:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 226219 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 462C52C039E for ; Sat, 9 Mar 2013 07:20:13 +1100 (EST) Received: from localhost ([::1]:49939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3lz-0001Ia-Dx for incoming@patchwork.ozlabs.org; Fri, 08 Mar 2013 15:20:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:48391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aN-00007a-TX for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a7-0000YP-3x for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:11 -0500 Received: from cantor2.suse.de ([195.135.220.15]:39320 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3a6-0000XJ-Sm; Fri, 08 Mar 2013 15:07:55 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D2729A5200; Fri, 8 Mar 2013 21:07:10 +0100 (CET) From: Alexander Graf To: qemu-devel qemu-devel Date: Fri, 8 Mar 2013 21:06:29 +0100 Message-Id: <1362773228-1747-28-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1362773228-1747-1-git-send-email-agraf@suse.de> References: <1362773228-1747-1-git-send-email-agraf@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: Blue Swirl , "qemu-ppc@nongnu.org list:PowerPC" , =?utf-8?q?Andreas=20F=C3=A4rber?= , =?utf-8?q?Aur=C3=A9lien=20Jarno?= Subject: [Qemu-devel] [PATCH 27/66] target-ppc: Extract 604e 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 From: Andreas Färber Signed-off-by: Andreas Färber Signed-off-by: Alexander Graf --- target-ppc/translate_init.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 03284c7..c909410 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7246,7 +7246,6 @@ enum { CPU_POWERPC_603P = 0x00070000, /* XXX: missing 0x00040303 (604) */ CPU_POWERPC_604 = 0x00040103, -#define CPU_POWERPC_604E CPU_POWERPC_604E_v24 /* XXX: missing 0x00091203 */ /* XXX: missing 0x00092110 */ /* XXX: missing 0x00092120 */ @@ -8631,8 +8630,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("603p", CPU_POWERPC_603P, 603E) /* PowerPC 604 */ POWERPC_DEF("604", CPU_POWERPC_604, 604) - /* PowerPC 604e (aka PID9) */ - POWERPC_DEF("604e", CPU_POWERPC_604E, 604E) /* PowerPC 604e v1.0 */ POWERPC_DEF("604e_v1.0", CPU_POWERPC_604E_v10, 604E) /* PowerPC 604e v2.2 */ @@ -9077,6 +9074,7 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "Vaillant", "603e7v" }, { "603r", "603e7t" }, { "Goldeneye", "603r" }, + { "604e", "604e_v2.4" }, { "Sirocco", "604e" }, { "Mach5", "604r" }, { "740", "740_v3.1" },