Commit e0aa3116 authored by David Gibson's avatar David Gibson
Browse files

ppc: Remove some stub POWER6 models 



The CPU model table includes stub (commented out) definitions for
CPU_POWERPC_POWER6_5 and CPU_POWERPC_POWER6A.  These are not real cpu
models, but represent the POWER6 in some compatiblity modes.  If we ever
do implement POWER6 (unlikely), we'll implement its compatibility modes in
a different way (similar to what we do for POWER7 and POWER8).  So these
stub definitions can be removed.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
parent ec575aa0

target-ppc/cpu-models.c

+0 −4
Original line number Diff line number Diff line
@@ -1130,10 +1130,6 @@ 
#if defined(TODO)

    POWERPC_DEF("POWER6",        CPU_POWERPC_POWER6,                 POWER6,

                "POWER6")

    POWERPC_DEF("POWER6_5",      CPU_POWERPC_POWER6_5,               POWER5,

                "POWER6 running in POWER5 mode")

    POWERPC_DEF("POWER6A",       CPU_POWERPC_POWER6A,                POWER6,

                "POWER6A")

#endif

    POWERPC_DEF("POWER7_v2.3",   CPU_POWERPC_POWER7_v23,             POWER7,

                "POWER7 v2.3")

target-ppc/cpu-models.h

+0 −2
Original line number Diff line number Diff line
@@ -549,8 +549,6 @@ enum { 
    CPU_POWERPC_POWER5             = 0x003A0203,

    CPU_POWERPC_POWER5P_v21        = 0x003B0201,

    CPU_POWERPC_POWER6             = 0x003E0000,

    CPU_POWERPC_POWER6_5           = 0x0F000001, /* POWER6 in POWER5 mode */

    CPU_POWERPC_POWER6A            = 0x0F000002,

    CPU_POWERPC_POWER_SERVER_MASK  = 0xFFFF0000,

    CPU_POWERPC_POWER7_BASE        = 0x003F0000,

    CPU_POWERPC_POWER7_v23         = 0x003F0203,