[Qemu-devel] [PATCH ppc-next 10/39] target-ppc: Extract 74x5 as aliases

[Andreas Färber]

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

diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index cbf13f2..cd21e9e 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -7363,7 +7363,6 @@ enum {
     CPU_POWERPC_74x1_v23           = 0x80000203, /* aka G: 2.3 */
     /* XXX: this entry might be a bug in some documentation */
     CPU_POWERPC_74x1_v210          = 0x80000210, /* aka G: 2.3 ? */
-#define CPU_POWERPC_74x5             CPU_POWERPC_74x5_v32
     CPU_POWERPC_74x5_v10           = 0x80010100,
     /* XXX: missing 0x80010200 */
     CPU_POWERPC_74x5_v21           = 0x80010201, /* aka C: 2.1 */
@@ -8905,10 +8904,6 @@ static const ppc_def_t ppc_defs[] = {
     POWERPC_DEF("7441_v2.10",    CPU_POWERPC_74x1_v210,              7440)
     /* PowerPC 7451 v2.10 (G4)                                               */
     POWERPC_DEF("7451_v2.10",    CPU_POWERPC_74x1_v210,              7450)
-    /* PowerPC 7445 (G4)                                                     */
-    POWERPC_DEF("7445",          CPU_POWERPC_74x5,                   7445)
-    /* PowerPC 7455 (G4)                                                     */
-    POWERPC_DEF("7455",          CPU_POWERPC_74x5,                   7455)
     /* PowerPC 7445 v1.0 (G4)                                                */
     POWERPC_DEF("7445_v1.0",     CPU_POWERPC_74x5_v10,               7445)
     /* PowerPC 7455 v1.0 (G4)                                                */
@@ -9200,6 +9195,10 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = {
     { "Nitro", "7410" },
     /* Code name for PowerPC 7450 */
     { "Vger", "7450" },
+    /* PowerPC 7445 (G4) */
+    { "7445", "7445_v3.2" },
+    /* PowerPC 7455 (G4) */
+    { "7455", "7455_v3.2" },
     /* Code name for PowerPC 7445/7455 */
     { "Apollo6", "7455" },
     /* PowerPC 7447 (G4) */
-- 
1.7.10.4