From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aS-0000CG-RH for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a7-0000aR-Kf for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:16 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:06:43 +0100 Message-Id: <1362773228-1747-42-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 41/66] target-ppc: Extract 970 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 | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 3fa131f..bcb22cc 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7320,14 +7320,12 @@ enum { CPU_POWERPC_POWER7_v21 =3D 0x003F0201, CPU_POWERPC_POWER7_v23 =3D 0x003F0203, CPU_POWERPC_970 =3D 0x00390202, -#define CPU_POWERPC_970FX CPU_POWERPC_970FX_v31 CPU_POWERPC_970FX_v10 =3D 0x00391100, CPU_POWERPC_970FX_v20 =3D 0x003C0200, CPU_POWERPC_970FX_v21 =3D 0x003C0201, CPU_POWERPC_970FX_v30 =3D 0x003C0300, CPU_POWERPC_970FX_v31 =3D 0x003C0301, CPU_POWERPC_970GX =3D 0x00450000, -#define CPU_POWERPC_970MP CPU_POWERPC_970MP_v11 CPU_POWERPC_970MP_v10 =3D 0x00440100, CPU_POWERPC_970MP_v11 =3D 0x00440101, #define CPU_POWERPC_CELL CPU_POWERPC_CELL_v32 @@ -8711,8 +8709,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("POWER7_v2.3", CPU_POWERPC_POWER7_v23, POW= ER7) /* PowerPC 970 = */ POWERPC_DEF("970", CPU_POWERPC_970, 970= ) - /* PowerPC 970FX (G5) = */ - POWERPC_DEF("970fx", CPU_POWERPC_970FX, 970= FX) /* PowerPC 970FX v1.0 (G5) = */ POWERPC_DEF("970fx_v1.0", CPU_POWERPC_970FX_v10, 970= FX) /* PowerPC 970FX v2.0 (G5) = */ @@ -8725,8 +8721,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("970fx_v3.1", CPU_POWERPC_970FX_v31, 970= FX) /* PowerPC 970GX (G5) = */ POWERPC_DEF("970gx", CPU_POWERPC_970GX, 970= GX) - /* PowerPC 970MP = */ - POWERPC_DEF("970mp", CPU_POWERPC_970MP, 970= MP) /* PowerPC 970MP v1.0 = */ POWERPC_DEF("970mp_v1.0", CPU_POWERPC_970MP_v10, 970= MP) /* PowerPC 970MP v1.1 = */ @@ -8959,6 +8953,8 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] =3D = { { "Boxer", "POWER3" }, { "Dino", "POWER3" }, { "POWER3+", "631" }, + { "970fx", "970fx_v3.1" }, + { "970mp", "970mp_v1.1" }, { "Apache", "RS64" }, { "A35", "RS64" }, { "NorthStar", "RS64-II" }, --=20 1.6.0.2