From patchwork Tue Feb 12 10:13:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ppc-next,24/39] target-ppc: Extract e500v1/e500v2 aliases Date: Tue, 12 Feb 2013 00:13:17 -0000 From: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 219800 Message-Id: <1360664012-16824-25-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 | 10 ++++------ 1 Datei geändert, 4 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index a2f1030..9b4c30b 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7136,8 +7136,6 @@ enum { /* e500 family */ /* e500 cores */ #define CPU_POWERPC_e500 CPU_POWERPC_e500v2_v22 -#define CPU_POWERPC_e500v1 CPU_POWERPC_e500v1_v20 -#define CPU_POWERPC_e500v2 CPU_POWERPC_e500v2_v22 CPU_POWERPC_e500v1_v10 = 0x80200010, CPU_POWERPC_e500v1_v20 = 0x80200020, CPU_POWERPC_e500v2_v10 = 0x80210010, @@ -8318,14 +8316,10 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF_SVR("MPC8379E", CPU_POWERPC_MPC837x, POWERPC_SVR_8379E, e300) /* e500 family */ - /* PowerPC e500v1 core */ - POWERPC_DEF("e500v1", CPU_POWERPC_e500v1, e500v1) /* PowerPC e500 v1.0 core */ POWERPC_DEF("e500_v10", CPU_POWERPC_e500v1_v10, e500v1) /* PowerPC e500 v2.0 core */ POWERPC_DEF("e500_v20", CPU_POWERPC_e500v1_v20, e500v1) - /* PowerPC e500v2 core */ - POWERPC_DEF("e500v2", CPU_POWERPC_e500v2, e500v2) /* PowerPC e500v2 v1.0 core */ POWERPC_DEF("e500v2_v10", CPU_POWERPC_e500v2_v10, e500v2) /* PowerPC e500v2 v2.0 core */ @@ -9018,6 +9012,10 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "PowerQUICC-II", "MPC82xx" }, /* PowerPC e500 core */ { "e500", "e500v2_v22" }, + /* PowerPC e500v1 core */ + { "e500v1", "e500_v20" }, + /* PowerPC e500v2 core */ + { "e500v2", "e500v2_v22" }, /* MPC8533 */ { "MPC8533", "MPC8533_v11" }, /* MPC8533E */