From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aH-000069-3o for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a6-0000WX-G7 for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:05 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:06:12 +0100 Message-Id: <1362773228-1747-11-git-send-email-agraf@suse.de> 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 10/66] target-ppc: Extract MGT823/MPC8xx as aliases List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel qemu-devel Cc: Blue Swirl , "qemu-ppc@nongnu.org list:PowerPC" , =?utf-8?q?Andreas=20F=C3=A4rber?= , =?utf-8?q?Aur=C3=A9lien=20Jarno?= From: Andreas F=C3=A4rber They used different PVRs but were defined to MPC8xx. Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- target-ppc/translate_init.c | 93 ++++++++-----------------------------= ------ 1 files changed, 17 insertions(+), 76 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 6a5f7e8..6a86e10 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7059,21 +7059,6 @@ enum { CPU_POWERPC_MPC5xx =3D 0x00020020, /* PowerPC MPC 8xx cores (aka PowerQUICC) */ CPU_POWERPC_MPC8xx =3D 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 =3D 0x00810011, CPU_POWERPC_G2H4 =3D 0x80811010, @@ -8048,67 +8033,6 @@ static const ppc_def_t ppc_defs[] =3D { /* Generic MPC8xx core = */ POWERPC_DEF("MPC8xx", CPU_POWERPC_MPC8xx, MPC= 8xx) #endif - /* MPC8xx microcontrollers = */ -#if defined(TODO_USER_ONLY) - /* MGT823 = */ - POWERPC_DEF("MGT823", CPU_POWERPC_MGT823, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC821 = */ - POWERPC_DEF("MPC821", CPU_POWERPC_MPC821, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC823 = */ - POWERPC_DEF("MPC823", CPU_POWERPC_MPC823, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC850 = */ - POWERPC_DEF("MPC850", CPU_POWERPC_MPC850, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC852T = */ - POWERPC_DEF("MPC852T", CPU_POWERPC_MPC852T, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC855T = */ - POWERPC_DEF("MPC855T", CPU_POWERPC_MPC855T, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC857 = */ - POWERPC_DEF("MPC857", CPU_POWERPC_MPC857, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC859 = */ - POWERPC_DEF("MPC859", CPU_POWERPC_MPC859, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC860 = */ - POWERPC_DEF("MPC860", CPU_POWERPC_MPC860, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC862 = */ - POWERPC_DEF("MPC862", CPU_POWERPC_MPC862, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC866 = */ - POWERPC_DEF("MPC866", CPU_POWERPC_MPC866, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC870 = */ - POWERPC_DEF("MPC870", CPU_POWERPC_MPC870, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC875 = */ - POWERPC_DEF("MPC875", CPU_POWERPC_MPC875, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC880 = */ - POWERPC_DEF("MPC880", CPU_POWERPC_MPC880, MPC= 8xx) -#endif -#if defined(TODO_USER_ONLY) - /* MPC885 = */ - POWERPC_DEF("MPC885", CPU_POWERPC_MPC885, MPC= 8xx) -#endif /* MPC82xx family (aka PowerQUICC-II) = */ /* Generic MPC52xx core = */ POWERPC_DEF_SVR("MPC52xx", @@ -9253,6 +9177,23 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] =3D= { { "MPC566", "MPC5xx" }, =20 { "PowerQUICC", "MPC8xx" }, + /* MPC8xx microcontrollers */ + { "MGT823", "MPC8xx" }, + { "MPC821", "MPC8xx" }, + { "MPC823", "MPC8xx" }, + { "MPC850", "MPC8xx" }, + { "MPC852T", "MPC8xx" }, + { "MPC855T", "MPC8xx" }, + { "MPC857", "MPC8xx" }, + { "MPC859", "MPC8xx" }, + { "MPC860", "MPC8xx" }, + { "MPC862", "MPC8xx" }, + { "MPC866", "MPC8xx" }, + { "MPC870", "MPC8xx" }, + { "MPC875", "MPC8xx" }, + { "MPC880", "MPC8xx" }, + { "MPC885", "MPC8xx" }, + { "PowerQUICC-II", "MPC82xx" }, { "e500", "e500v2_v22" }, { "Vanilla", "603" }, --=20 1.6.0.2