Re: [Qemu-devel] [PATCH 1/2] ppc: remove unused CPU definitions

[Thomas Huth]

On 19.09.2017 23:36, John Snow wrote:
> Following commit aef77960, remove now-unused definitions from
> cpu-models.h.
> 
> Signed-off-by: John Snow <address@hidden>
> ---
>  target/ppc/cpu-models.h | 32 --------------------------------
>  1 file changed, 32 deletions(-)
> 
> diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h
> index df31d7f..b34b512 100644
> --- a/target/ppc/cpu-models.h
> +++ b/target/ppc/cpu-models.h
> @@ -291,34 +291,6 @@ enum {
>  #endif
>      CPU_POWERPC_e200z5             = 0x81000000,
>      CPU_POWERPC_e200z6             = 0x81120000,
> -    /* MPC55xx microcontrollers */
> -#define CPU_POWERPC_MPC55xx          CPU_POWERPC_MPC5567
> -#if 0
> -#define CPU_POWERPC_MPC5514E         CPU_POWERPC_MPC5514E_v1
> -#define CPU_POWERPC_MPC5514E_v0      CPU_POWERPC_e200z0
> -#define CPU_POWERPC_MPC5514E_v1      CPU_POWERPC_e200z1
> -#define CPU_POWERPC_MPC5514G         CPU_POWERPC_MPC5514G_v1
> -#define CPU_POWERPC_MPC5514G_v0      CPU_POWERPC_e200z0
> -#define CPU_POWERPC_MPC5514G_v1      CPU_POWERPC_e200z1
> -#define CPU_POWERPC_MPC5515S         CPU_POWERPC_e200z1
> -#define CPU_POWERPC_MPC5516E         CPU_POWERPC_MPC5516E_v1
> -#define CPU_POWERPC_MPC5516E_v0      CPU_POWERPC_e200z0
> -#define CPU_POWERPC_MPC5516E_v1      CPU_POWERPC_e200z1
> -#define CPU_POWERPC_MPC5516G         CPU_POWERPC_MPC5516G_v1
> -#define CPU_POWERPC_MPC5516G_v0      CPU_POWERPC_e200z0
> -#define CPU_POWERPC_MPC5516G_v1      CPU_POWERPC_e200z1
> -#define CPU_POWERPC_MPC5516S         CPU_POWERPC_e200z1
> -#endif
> -#if 0
> -#define CPU_POWERPC_MPC5533          CPU_POWERPC_e200z3
> -#define CPU_POWERPC_MPC5534          CPU_POWERPC_e200z3
> -#endif
> -#define CPU_POWERPC_MPC5553          CPU_POWERPC_e200z6
> -#define CPU_POWERPC_MPC5554          CPU_POWERPC_e200z6
> -#define CPU_POWERPC_MPC5561          CPU_POWERPC_e200z6
> -#define CPU_POWERPC_MPC5565          CPU_POWERPC_e200z6
> -#define CPU_POWERPC_MPC5566          CPU_POWERPC_e200z6
> -#define CPU_POWERPC_MPC5567          CPU_POWERPC_e200z6
>      /* e300 family */
>      /* e300 cores */
>      CPU_POWERPC_e300c1             = 0x00830010,
> @@ -326,11 +298,7 @@ enum {
>      CPU_POWERPC_e300c3             = 0x00850010,
>      CPU_POWERPC_e300c4             = 0x00860010,
>      /* MPC83xx microcontrollers */

I think you should also remove the above comment now?

> -#define CPU_POWERPC_MPC831x          CPU_POWERPC_e300c3
> -#define CPU_POWERPC_MPC832x          CPU_POWERPC_e300c2
>  #define CPU_POWERPC_MPC834x          CPU_POWERPC_e300c1
> -#define CPU_POWERPC_MPC835x          CPU_POWERPC_e300c1
> -#define CPU_POWERPC_MPC836x          CPU_POWERPC_e300c1
>  #define CPU_POWERPC_MPC837x          CPU_POWERPC_e300c4
>      /* e500 family */
>      /* e500 cores  */

With the above comment removed:

Reviewed-by: Thomas Huth <address@hidden>