diff options
author | Andreas Färber <afaerber@suse.de> | 2013-08-01 03:42:00 +0200 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-08-07 12:47:43 -0500 |
commit | 171777a4b38a0f6331ae60c2546a5baf84c4b359 (patch) | |
tree | 3f7d027fae884393804b71276e3b6cab92db5e62 | |
parent | a7d6b9f084765a834110bb9a2a0329b1a96de792 (diff) | |
download | hqemu-171777a4b38a0f6331ae60c2546a5baf84c4b359.zip hqemu-171777a4b38a0f6331ae60c2546a5baf84c4b359.tar.gz |
target-ppc: Turn POWER5gs 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-2-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | target-ppc/cpu-models.c | 3 | ||||
-rw-r--r-- | target-ppc/cpu-models.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c index b5b8f42..1f62f7d 100644 --- a/target-ppc/cpu-models.c +++ b/target-ppc/cpu-models.c @@ -1126,8 +1126,6 @@ #if defined(TODO) POWERPC_DEF("POWER5+", CPU_POWERPC_POWER5P, POWER5P, "POWER5+") - POWERPC_DEF("POWER5gs", CPU_POWERPC_POWER5GS, POWER5P, - "POWER5GS") #endif #if defined(TODO) POWERPC_DEF("POWER6", CPU_POWERPC_POWER6, POWER6, @@ -1391,6 +1389,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { { "Boxer", "POWER3" }, { "Dino", "POWER3" }, { "POWER3+", "631" }, + { "POWER5gs", "POWER5+" }, { "POWER7", "POWER7_v2.3" }, { "POWER7+", "POWER7+_v2.1" }, { "POWER8", "POWER8_v1.0" }, diff --git a/target-ppc/cpu-models.h b/target-ppc/cpu-models.h index 58c4ea0..ca66d55 100644 --- a/target-ppc/cpu-models.h +++ b/target-ppc/cpu-models.h @@ -549,7 +549,6 @@ enum { CPU_POWERPC_POWER5 = 0x003A0203, #define CPU_POWERPC_POWER5GR CPU_POWERPC_POWER5 CPU_POWERPC_POWER5P = 0x003B0000, -#define CPU_POWERPC_POWER5GS CPU_POWERPC_POWER5P CPU_POWERPC_POWER6 = 0x003E0000, CPU_POWERPC_POWER6_5 = 0x0F000001, /* POWER6 in POWER5 mode */ CPU_POWERPC_POWER6A = 0x0F000002, |