From patchwork Tue Feb 12 10:12:58 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: 219821 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 EBA3A2C0322 for ; Tue, 12 Feb 2013 22:46:39 +1100 (EST) Received: from localhost ([::1]:59374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Csh-0005St-2n for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2013 05:14:31 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Cs9-0004QE-S6 for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5Cs3-0003Jp-3m for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:13:57 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42778 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Cs2-0003JX-Qr; Tue, 12 Feb 2013 05:13:51 -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 55351A520C; Tue, 12 Feb 2013 11:13:50 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 12 Feb 2013 11:12:58 +0100 Message-Id: <1360664012-16824-6-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 05/39] target-ppc: Extract MGT823/MPC8xx 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 They used different PVRs but were defined to MPC8xx. Signed-off-by: Andreas Färber --- target-ppc/translate_init.c | 107 +++++++++++++------------------------------ 1 Datei geändert, 31 Zeilen hinzugefügt(+), 76 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index e7605e3..7b0c21e 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7061,21 +7061,6 @@ enum { CPU_POWERPC_MPC5xx = 0x00020020, /* PowerPC MPC 8xx cores (aka PowerQUICC) */ CPU_POWERPC_MPC8xx = 0x00500000, -#define CPU_POWERPC_MGT823 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC821 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC823 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC850 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC852T CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC855T CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC857 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC859 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC860 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC862 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC866 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC870 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC875 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC880 CPU_POWERPC_MPC8xx -#define CPU_POWERPC_MPC885 CPU_POWERPC_MPC8xx /* G2 cores (aka PowerQUICC-II) */ CPU_POWERPC_G2 = 0x00810011, CPU_POWERPC_G2H4 = 0x80811010, @@ -8050,67 +8035,6 @@ static const ppc_def_t ppc_defs[] = { /* Generic MPC8xx core */ POWERPC_DEF("MPC8xx", CPU_POWERPC_MPC8xx, MPC8xx) #endif - /* MPC8xx microcontrollers */ -#if defined(TODO_USER_ONLY) - /* MGT823 */ - POWERPC_DEF("MGT823", CPU_POWERPC_MGT823, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC821 */ - POWERPC_DEF("MPC821", CPU_POWERPC_MPC821, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC823 */ - POWERPC_DEF("MPC823", CPU_POWERPC_MPC823, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC850 */ - POWERPC_DEF("MPC850", CPU_POWERPC_MPC850, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC852T */ - POWERPC_DEF("MPC852T", CPU_POWERPC_MPC852T, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC855T */ - POWERPC_DEF("MPC855T", CPU_POWERPC_MPC855T, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC857 */ - POWERPC_DEF("MPC857", CPU_POWERPC_MPC857, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC859 */ - POWERPC_DEF("MPC859", CPU_POWERPC_MPC859, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC860 */ - POWERPC_DEF("MPC860", CPU_POWERPC_MPC860, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC862 */ - POWERPC_DEF("MPC862", CPU_POWERPC_MPC862, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC866 */ - POWERPC_DEF("MPC866", CPU_POWERPC_MPC866, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC870 */ - POWERPC_DEF("MPC870", CPU_POWERPC_MPC870, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC875 */ - POWERPC_DEF("MPC875", CPU_POWERPC_MPC875, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC880 */ - POWERPC_DEF("MPC880", CPU_POWERPC_MPC880, MPC8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC885 */ - POWERPC_DEF("MPC885", CPU_POWERPC_MPC885, MPC8xx) -#endif /* MPC82xx family (aka PowerQUICC-II) */ /* Generic MPC52xx core */ POWERPC_DEF_SVR("MPC52xx", @@ -9269,6 +9193,37 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "MPC566", "MPC5xx" }, /* Codename for MPC8xx core */ { "PowerQUICC", "MPC8xx" }, + /* MPC8xx microcontrollers */ + /* MGT823 */ + { "MGT823", "MPC8xx" }, + /* MPC821 */ + { "MPC821", "MPC8xx" }, + /* MPC823 */ + { "MPC823", "MPC8xx" }, + /* MPC850 */ + { "MPC850", "MPC8xx" }, + /* MPC852T */ + { "MPC852T", "MPC8xx" }, + /* MPC855T */ + { "MPC855T", "MPC8xx" }, + /* MPC857 */ + { "MPC857", "MPC8xx" }, + /* MPC859 */ + { "MPC859", "MPC8xx" }, + /* MPC860 */ + { "MPC860", "MPC8xx" }, + /* MPC862 */ + { "MPC862", "MPC8xx" }, + /* MPC866 */ + { "MPC866", "MPC8xx" }, + /* MPC870 */ + { "MPC870", "MPC8xx" }, + /* MPC875 */ + { "MPC875", "MPC8xx" }, + /* MPC880 */ + { "MPC880", "MPC8xx" }, + /* MPC885 */ + { "MPC885", "MPC8xx" }, /* Codename for MPC82xx */ { "PowerQUICC-II", "MPC82xx" }, /* PowerPC e500 core */