From: Alexey Kardashevskiy Date: Fri, 11 Apr 2014 17:34:27 +0000 (+1000) Subject: target-ppc: Remove redundant POWER7 declarations X-Git-Tag: v2.1.0-rc0~53^2~147 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70d246c335d7fef745c3068f109926a8cee08220;p=thirdparty%2Fqemu.git target-ppc: Remove redundant POWER7 declarations At the moment there are 3 versions of POWER7 CPUs defined. However we do not emulate these CPUs diffent and it does not make much sense to keep them all. This removes POWER7_v2.0 and POWER7_v2.1 and leaves just one versioned CPU per family which is POWER7_v2.3 with POWER7 alias. Signed-off-by: Alexey Kardashevskiy Signed-off-by: Alexander Graf --- diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c index f6c9b3ab012..57cb4e48fbb 100644 --- a/target-ppc/cpu-models.c +++ b/target-ppc/cpu-models.c @@ -1134,10 +1134,6 @@ POWERPC_DEF("POWER6A", CPU_POWERPC_POWER6A, POWER6, "POWER6A") #endif - POWERPC_DEF("POWER7_v2.0", CPU_POWERPC_POWER7_v20, POWER7, - "POWER7 v2.0") - POWERPC_DEF("POWER7_v2.1", CPU_POWERPC_POWER7_v21, POWER7, - "POWER7 v2.1") POWERPC_DEF("POWER7_v2.3", CPU_POWERPC_POWER7_v23, POWER7, "POWER7 v2.3") POWERPC_DEF("POWER7+_v2.1", CPU_POWERPC_POWER7P_v21, POWER7P, diff --git a/target-ppc/cpu-models.h b/target-ppc/cpu-models.h index 644a1264599..9a003b43b48 100644 --- a/target-ppc/cpu-models.h +++ b/target-ppc/cpu-models.h @@ -555,8 +555,6 @@ enum { CPU_POWERPC_POWER6A = 0x0F000002, CPU_POWERPC_POWER7_BASE = 0x003F0000, CPU_POWERPC_POWER7_MASK = 0xFFFF0000, - CPU_POWERPC_POWER7_v20 = 0x003F0200, - CPU_POWERPC_POWER7_v21 = 0x003F0201, CPU_POWERPC_POWER7_v23 = 0x003F0203, CPU_POWERPC_POWER7P_BASE = 0x004A0000, CPU_POWERPC_POWER7P_MASK = 0xFFFF0000,