Received: from eggs.gnu.org ([208.118.235.92]:48542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aX-0000CS-2I for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a7-0000a9-Jb for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:20 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:06:39 +0100 Message-Id: <1362773228-1747-38-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 37/66] target-ppc: Extract MPC52xx alias 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 | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 89c9e24..625811e 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7037,7 +7037,6 @@ enum { CPU_POWERPC_G2LEgp3 =3D 0x80822013, /* MPC52xx microcontrollers */ /* XXX: MPC 5121 ? */ -#define CPU_POWERPC_MPC52xx CPU_POWERPC_MPC5200 #define CPU_POWERPC_MPC5200 CPU_POWERPC_MPC5200_v12 #define CPU_POWERPC_MPC5200_v10 CPU_POWERPC_G2LEgp1 #define CPU_POWERPC_MPC5200_v11 CPU_POWERPC_G2LEgp1 @@ -7364,7 +7363,6 @@ enum { /* System version register (used on MPC 8xxx) = */ enum { POWERPC_SVR_NONE =3D 0x00000000, -#define POWERPC_SVR_52xx POWERPC_SVR_5200 #define POWERPC_SVR_5200 POWERPC_SVR_5200_v12 POWERPC_SVR_5200_v10 =3D 0x80110010, POWERPC_SVR_5200_v11 =3D 0x80110011, @@ -7881,9 +7879,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("MPC8xx", CPU_POWERPC_MPC8xx, MPC= 8xx) #endif /* MPC82xx family (aka PowerQUICC-II) = */ - /* Generic MPC52xx core = */ - POWERPC_DEF_SVR("MPC52xx", - CPU_POWERPC_MPC52xx, POWERPC_SVR_52xx, G2L= E) /* PowerPC G2 core = */ POWERPC_DEF("G2", CPU_POWERPC_G2, G2) /* PowerPC G2 H4 core = */ @@ -8867,6 +8862,8 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] =3D = { { "MPC880", "MPC8xx" }, { "MPC885", "MPC8xx" }, =20 + { "MPC52xx", "MPC5200" }, + { "MPC82xx", "MPC8280" }, { "PowerQUICC-II", "MPC82xx" }, { "MPC8241", "G2HiP4" }, --=20 1.6.0.2