From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aU-0000CM-F7 for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a7-0000b8-OK for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:18 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:06:40 +0100 Message-Id: <1362773228-1747-39-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 38/66] target-ppc: Extract MPC5200/MPC5200B 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 Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- target-ppc/translate_init.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 625811e..2e41f0b 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7037,11 +7037,9 @@ enum { CPU_POWERPC_G2LEgp3 =3D 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 */ @@ -7363,11 +7361,9 @@ enum { /* System version register (used on MPC 8xxx) = */ enum { POWERPC_SVR_NONE =3D 0x00000000, -#define POWERPC_SVR_5200 POWERPC_SVR_5200_v12 POWERPC_SVR_5200_v10 =3D 0x80110010, POWERPC_SVR_5200_v11 =3D 0x80110011, POWERPC_SVR_5200_v12 =3D 0x80110012, -#define POWERPC_SVR_5200B POWERPC_SVR_5200B_v21 POWERPC_SVR_5200B_v20 =3D 0x80110020, POWERPC_SVR_5200B_v21 =3D 0x80110021, #define POWERPC_SVR_55xx POWERPC_SVR_5567 @@ -7912,9 +7908,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF_SVR("MPC5121", CPU_POWERPC_MPC5121, POWERPC_SVR_5121, G2L= E) #endif - /* MPC5200 = */ - POWERPC_DEF_SVR("MPC5200", - CPU_POWERPC_MPC5200, POWERPC_SVR_5200, G2L= E) /* MPC5200 v1.0 = */ POWERPC_DEF_SVR("MPC5200_v10", CPU_POWERPC_MPC5200_v10, POWERPC_SVR_5200_v10, G2L= E) @@ -7924,9 +7917,6 @@ static const ppc_def_t ppc_defs[] =3D { /* MPC5200 v1.2 = */ POWERPC_DEF_SVR("MPC5200_v12", CPU_POWERPC_MPC5200_v12, POWERPC_SVR_5200_v12, G2L= E) - /* MPC5200B = */ - POWERPC_DEF_SVR("MPC5200B", - CPU_POWERPC_MPC5200B, POWERPC_SVR_5200B, G2L= E) /* MPC5200B v2.0 = */ POWERPC_DEF_SVR("MPC5200B_v20", CPU_POWERPC_MPC5200B_v20, POWERPC_SVR_5200B_v20, G2L= E) @@ -8863,6 +8853,8 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] =3D = { { "MPC885", "MPC8xx" }, =20 { "MPC52xx", "MPC5200" }, + { "MPC5200", "MPC5200_v12" }, + { "MPC5200B", "MPC5200B_v21" }, =20 { "MPC82xx", "MPC8280" }, { "PowerQUICC-II", "MPC82xx" }, --=20 1.6.0.2