Commit fda276c7 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Alexander Graf
Browse files

target-ppc: Remove POWER5+ v0.0 that never existed 



IBM uses low 16bits to specify the chip version of a POWER CPU.
So there has never been an actual silicon with PVR = 0x003B0000.
The first silicon would have PVR 0x003B0100 but it is very unlikely
to find it in any machine shipped to any customer as it was too raw.

This removes CPU_POWERPC_POWER5P_v00 definition and changes
POWER5+ and POWERgs aliases (which are synonyms) to point to
POWER5+_v2.1 which can still be found in real machines.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
[agraf: fix commit message]
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 4c56440d

target-ppc/cpu-models.c

+2 −4
Original line number Diff line number Diff line
@@ -1124,8 +1124,6 @@ 
    POWERPC_DEF("POWER5",        CPU_POWERPC_POWER5,                 POWER5,

                "POWER5")

#endif

    POWERPC_DEF("POWER5+_v0.0",  CPU_POWERPC_POWER5P_v00,            POWER5P,

                "POWER5+ v0.0")

    POWERPC_DEF("POWER5+_v2.1",  CPU_POWERPC_POWER5P_v21,            POWER5P,

                "POWER5+ v2.1")

#if defined(TODO)
@@ -1387,8 +1385,8 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { 
    { "Dino",  "POWER3" },

    { "POWER3+", "631" },

    { "POWER5gr", "POWER5" },

    { "POWER5+", "POWER5+_v0.0" },

    { "POWER5gs", "POWER5+_v0.0" },

    { "POWER5+", "POWER5+_v2.1" },

    { "POWER5gs", "POWER5+_v2.1" },

    { "POWER7", "POWER7_v2.3" },

    { "POWER7+", "POWER7+_v2.1" },

    { "POWER8E", "POWER8E_v1.0" },

target-ppc/cpu-models.h

+0 −1
Original line number Diff line number Diff line
@@ -547,7 +547,6 @@ enum { 
    CPU_POWERPC_POWER4P            = 0x00380000,

     /* XXX: missing 0x003A0201 */

    CPU_POWERPC_POWER5             = 0x003A0203,

    CPU_POWERPC_POWER5P_v00        = 0x003B0000,

    CPU_POWERPC_POWER5P_v21        = 0x003B0201,

    CPU_POWERPC_POWER6             = 0x003E0000,

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