From patchwork Tue Feb 12 10:13:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ppc-next,20/39] target-ppc: Extract 603e alias Date: Tue, 12 Feb 2013 00:13:13 -0000 From: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 219802 Message-Id: <1360664012-16824-21-git-send-email-afaerber@suse.de> To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Signed-off-by: Andreas Färber --- target-ppc/translate_init.c | 5 ++--- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 8ec1de0..c1619a4 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7234,7 +7234,6 @@ enum { CPU_POWERPC_601_v2 = 0x00010002, CPU_POWERPC_602 = 0x00050100, CPU_POWERPC_603 = 0x00030100, -#define CPU_POWERPC_603E CPU_POWERPC_603E_v41 CPU_POWERPC_603E_v11 = 0x00060101, CPU_POWERPC_603E_v12 = 0x00060102, CPU_POWERPC_603E_v13 = 0x00060103, @@ -8610,8 +8609,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("602", CPU_POWERPC_602, 602) /* PowerPC 603 */ POWERPC_DEF("603", CPU_POWERPC_603, 603) - /* PowerPC 603e (aka PID6) */ - POWERPC_DEF("603e", CPU_POWERPC_603E, 603E) /* PowerPC 603e v1.1 */ POWERPC_DEF("603e_v1.1", CPU_POWERPC_603E_v11, 603E) /* PowerPC 603e v1.2 */ @@ -9117,6 +9114,8 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "e500", "e500v2_v22" }, /* Code name for PowerPC 603 */ { "Vanilla", "603" }, + /* PowerPC 603e (aka PID6) */ + { "603e", "603e_v4.1" }, /* Code name for PowerPC 603e */ { "Stretch", "603e" }, /* Code name for PowerPC 603ev */