[Qemu-ppc] [PATCH ppc-next 25/39] target-ppc: Extract MPC83xx aliases

[Andreas Färber]

Signed-off-by: Andreas Färber <address@hidden>
---
 target-ppc/translate_init.c |   24 ++++++++----------------
 1 Datei geändert, 8 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-)

diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 9b4c30b..c05f0a5 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -7463,16 +7463,12 @@ enum {
     POWERPC_SVR_8343A              = 0x80570030,
     POWERPC_SVR_8343E              = 0x80560010,
     POWERPC_SVR_8343EA             = 0x80560030,
-#define POWERPC_SVR_8347             POWERPC_SVR_8347T
     POWERPC_SVR_8347P              = 0x80550010, /* PBGA package */
     POWERPC_SVR_8347T              = 0x80530010, /* TBGA package */
-#define POWERPC_SVR_8347A            POWERPC_SVR_8347AT
     POWERPC_SVR_8347AP             = 0x80550030, /* PBGA package */
     POWERPC_SVR_8347AT             = 0x80530030, /* TBGA package */
-#define POWERPC_SVR_8347E            POWERPC_SVR_8347ET
     POWERPC_SVR_8347EP             = 0x80540010, /* PBGA package */
     POWERPC_SVR_8347ET             = 0x80520010, /* TBGA package */
-#define POWERPC_SVR_8347EA            POWERPC_SVR_8347EAT
     POWERPC_SVR_8347EAP            = 0x80540030, /* PBGA package */
     POWERPC_SVR_8347EAT            = 0x80520030, /* TBGA package */
     POWERPC_SVR_8349               = 0x80510010,
@@ -8239,36 +8235,24 @@ static const ppc_def_t ppc_defs[] = {
     /* MPC8343EA                                                             */
     POWERPC_DEF_SVR("MPC8343EA",
                     CPU_POWERPC_MPC834x,      POWERPC_SVR_8343EA,    e300)
-    /* MPC8347                                                               */
-    POWERPC_DEF_SVR("MPC8347",
-                    CPU_POWERPC_MPC834x,      POWERPC_SVR_8347,      e300)
     /* MPC8347T                                                              */
     POWERPC_DEF_SVR("MPC8347T",
                     CPU_POWERPC_MPC834x,      POWERPC_SVR_8347T,     e300)
     /* MPC8347P                                                              */
     POWERPC_DEF_SVR("MPC8347P",
                     CPU_POWERPC_MPC834x,      POWERPC_SVR_8347P,     e300)
-    /* MPC8347A                                                              */
-    POWERPC_DEF_SVR("MPC8347A",
-                    CPU_POWERPC_MPC834x,      POWERPC_SVR_8347A,     e300)
     /* MPC8347AT                                                             */
     POWERPC_DEF_SVR("MPC8347AT",
                     CPU_POWERPC_MPC834x,      POWERPC_SVR_8347AT,    e300)
     /* MPC8347AP                                                             */
     POWERPC_DEF_SVR("MPC8347AP",
                     CPU_POWERPC_MPC834x,      POWERPC_SVR_8347AP,    e300)
-    /* MPC8347E                                                              */
-    POWERPC_DEF_SVR("MPC8347E",
-                    CPU_POWERPC_MPC834x,      POWERPC_SVR_8347E,     e300)
     /* MPC8347ET                                                             */
     POWERPC_DEF_SVR("MPC8347ET",
                     CPU_POWERPC_MPC834x,      POWERPC_SVR_8347ET,    e300)
     /* MPC8343EP                                                             */
     POWERPC_DEF_SVR("MPC8347EP",
                     CPU_POWERPC_MPC834x,      POWERPC_SVR_8347EP,    e300)
-    /* MPC8347EA                                                             */
-    POWERPC_DEF_SVR("MPC8347EA",
-                    CPU_POWERPC_MPC834x,      POWERPC_SVR_8347EA,    e300)
     /* MPC8347EAT                                                            */
     POWERPC_DEF_SVR("MPC8347EAT",
                     CPU_POWERPC_MPC834x,      POWERPC_SVR_8347EAT,   e300)
@@ -9010,6 +8994,14 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = {
     { "MPC885", "MPC8xx" },
     /* Codename for MPC82xx */
     { "PowerQUICC-II", "MPC82xx" },
+    /* MPC8347 */
+    { "MPC8347", "MPC8347T" },
+    /* MPC8347A */
+    { "MPC8347A", "MPC8347AT" },
+    /* MPC8347E */
+    { "MPC8347E", "MPC8347ET" },
+    /* MPC8347EA */
+    { "MPC8347EA", "MPC8347EAT" },
     /* PowerPC e500 core */
     { "e500", "e500v2_v22" },
     /* PowerPC e500v1 core */
-- 
1.7.10.4