From patchwork Tue Feb 12 10:13:26 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: 219792 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 34D042C032D for ; Tue, 12 Feb 2013 22:19:00 +1100 (EST) Received: from localhost ([::1]:54738 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Dt4-0003QY-BR for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2013 06:18:58 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Csk-0005TJ-R7 for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5Csa-0003YN-3e for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:34 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42815 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5CsZ-0003Y4-PI; Tue, 12 Feb 2013 05:14:23 -0500 Received: from relay2.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 4E6BEA520C; Tue, 12 Feb 2013 11:14:23 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 12 Feb 2013 11:13:26 +0100 Message-Id: <1360664012-16824-34-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 33/39] target-ppc: Extract MPC5200/MPC5200B 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 | 12 ++---------- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index abe9557..1f4f4c9 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7039,11 +7039,9 @@ enum { CPU_POWERPC_G2LEgp3 = 0x80822013, /* MPC52xx microcontrollers */ /* XXX: MPC 5121 ? */ -#define CPU_POWERPC_MPC5200 CPU_POWERPC_MPC5200_v12 #define CPU_POWERPC_MPC5200_v10 CPU_POWERPC_G2LEgp1 #define CPU_POWERPC_MPC5200_v11 CPU_POWERPC_G2LEgp1 #define CPU_POWERPC_MPC5200_v12 CPU_POWERPC_G2LEgp1 -#define CPU_POWERPC_MPC5200B CPU_POWERPC_MPC5200B_v21 #define CPU_POWERPC_MPC5200B_v20 CPU_POWERPC_G2LEgp1 #define CPU_POWERPC_MPC5200B_v21 CPU_POWERPC_G2LEgp1 /* MPC82xx microcontrollers */ @@ -7365,11 +7363,9 @@ enum { /* System version register (used on MPC 8xxx) */ enum { POWERPC_SVR_NONE = 0x00000000, -#define POWERPC_SVR_5200 POWERPC_SVR_5200_v12 POWERPC_SVR_5200_v10 = 0x80110010, POWERPC_SVR_5200_v11 = 0x80110011, POWERPC_SVR_5200_v12 = 0x80110012, -#define POWERPC_SVR_5200B POWERPC_SVR_5200B_v21 POWERPC_SVR_5200B_v20 = 0x80110020, POWERPC_SVR_5200B_v21 = 0x80110021, #define POWERPC_SVR_55xx POWERPC_SVR_5567 @@ -7914,9 +7910,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF_SVR("MPC5121", CPU_POWERPC_MPC5121, POWERPC_SVR_5121, G2LE) #endif - /* MPC5200 */ - POWERPC_DEF_SVR("MPC5200", - CPU_POWERPC_MPC5200, POWERPC_SVR_5200, G2LE) /* MPC5200 v1.0 */ POWERPC_DEF_SVR("MPC5200_v10", CPU_POWERPC_MPC5200_v10, POWERPC_SVR_5200_v10, G2LE) @@ -7926,9 +7919,6 @@ static const ppc_def_t ppc_defs[] = { /* MPC5200 v1.2 */ POWERPC_DEF_SVR("MPC5200_v12", CPU_POWERPC_MPC5200_v12, POWERPC_SVR_5200_v12, G2LE) - /* MPC5200B */ - POWERPC_DEF_SVR("MPC5200B", - CPU_POWERPC_MPC5200B, POWERPC_SVR_5200B, G2LE) /* MPC5200B v2.0 */ POWERPC_DEF_SVR("MPC5200B_v20", CPU_POWERPC_MPC5200B_v20, POWERPC_SVR_5200B_v20, G2LE) @@ -8899,6 +8889,8 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "MPC885", "MPC8xx" }, { "MPC52xx", "MPC5200" }, + { "MPC5200", "MPC5200_v12" }, + { "MPC5200B", "MPC5200B_v21" }, { "MPC82xx", "MPC8280" }, /* Codename for MPC82xx */