Permalink
Browse files

target-ppc: Turn POWER5gr CPU into alias for POWER5

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1375321323-29954-3-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
  • Loading branch information...
afaerber authored and Anthony Liguori committed Aug 1, 2013
1 parent 171777a commit 469296f1578e1e7b69c267de39d17134b950b93a
Showing with 1 addition and 3 deletions.
  1. +1 −2 target-ppc/cpu-models.c
  2. +0 −1 target-ppc/cpu-models.h
View
@@ -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,
@@ -1389,6 +1387,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
{ "Boxer", "POWER3" },
{ "Dino", "POWER3" },
{ "POWER3+", "631" },
+ { "POWER5gr", "POWER5" },
{ "POWER5gs", "POWER5+" },
{ "POWER7", "POWER7_v2.3" },
{ "POWER7+", "POWER7+_v2.1" },
View
@@ -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 */

0 comments on commit 469296f

Please sign in to comment.