[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH for-next 2/4] target-ppc: Turn POWER5gr CPU into alias
From: |
Andreas Färber |
Subject: |
[Qemu-ppc] [PATCH for-next 2/4] target-ppc: Turn POWER5gr CPU into alias for POWER5 |
Date: |
Thu, 1 Aug 2013 03:42:01 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
target-ppc/cpu-models.c | 3 +--
target-ppc/cpu-models.h | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c
index 49b193f..3f7a6f4 100644
--- a/target-ppc/cpu-models.c
+++ b/target-ppc/cpu-models.c
@@ -1120,8 +1120,6 @@
#if defined(TODO)
POWERPC_DEF("POWER5", CPU_POWERPC_POWER5, POWER5,
"POWER5")
- POWERPC_DEF("POWER5gr", CPU_POWERPC_POWER5GR, POWER5,
- "POWER5GR")
#endif
#if defined(TODO)
POWERPC_DEF("POWER5+", CPU_POWERPC_POWER5P, POWER5P,
@@ -1387,6 +1385,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
{ "Boxer", "POWER3" },
{ "Dino", "POWER3" },
{ "POWER3+", "631" },
+ { "POWER5gr", "POWER5" },
{ "POWER5gs", "POWER5+" },
{ "POWER7", "POWER7_v2.3" },
{ "POWER8", "POWER8_v1.0" },
diff --git a/target-ppc/cpu-models.h b/target-ppc/cpu-models.h
index 0e4db11..a844d0d 100644
--- a/target-ppc/cpu-models.h
+++ b/target-ppc/cpu-models.h
@@ -547,7 +547,6 @@ enum {
CPU_POWERPC_POWER4P = 0x00380000,
/* XXX: missing 0x003A0201 */
CPU_POWERPC_POWER5 = 0x003A0203,
-#define CPU_POWERPC_POWER5GR CPU_POWERPC_POWER5
CPU_POWERPC_POWER5P = 0x003B0000,
CPU_POWERPC_POWER6 = 0x003E0000,
CPU_POWERPC_POWER6_5 = 0x0F000001, /* POWER6 in POWER5 mode */
--
1.8.1.4