linux-mips
[Top] [All Lists]

Re: Diff between Linus' and linux-mips git: VR4181

To: Martin Michlmayr <tbm@cyrius.com>
Subject: Re: Diff between Linus' and linux-mips git: VR4181
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Mon, 20 Feb 2006 10:50:38 +0900
Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips@linux-mips.org
Envelope-id: tripeaks.co.jp
In-reply-to: <20060220014121.GC18438@deprecation.cyrius.com>
Organization: TriPeaks Corporation
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20060219234318.GA16311@deprecation.cyrius.com> <20060220000141.GX10266@deprecation.cyrius.com> <20060220001126.GA17967@deprecation.cyrius.com> <200602200107.k1K17suB021247@mbox03.po.2iij.net> <20060220012116.GB18438@deprecation.cyrius.com> <200602200132.k1K1WKtV023245@mbox02.po.2iij.net> <20060220014121.GC18438@deprecation.cyrius.com>
Sender: linux-mips-bounce@linux-mips.org
Acked-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

On Mon, 20 Feb 2006 01:41:21 +0000
Martin Michlmayr <tbm@cyrius.com> wrote:

> * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-02-20 10:32]:
> > VR4181 and VR4181A are different.
> > Please don't remove VR4181A. 
> 
> OK, this one doesn't touch VR4181A.
> 
> 
> [MIPS] Remove last portions of incomplete VR4181 support
> 
> Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
> 
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index 4ca93ff..b89088e 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -503,7 +503,8 @@ config DDB5477
>         ether port USB, AC97, PCI, etc.
>  
>  config MACH_VR41XX
> -     bool "Support for NEC VR41XX-based machines"
> +     bool "Support for NEC VR41XX based machines"
> +     select SYS_HAS_CPU_VR41XX
>  
>  config PMC_YOSEMITE
>       bool "Support for PMC-Sierra Yosemite eval board"
> @@ -1016,9 +1017,6 @@ config MIPS_L1_CACHE_SHIFT
>  config HAVE_STD_PC_SERIAL_PORT
>       bool
>  
> -config VR4181
> -     bool
> -
>  config ARC_CONSOLE
>       bool "ARC console support"
>       depends on SGI_IP22 || SNI_RM200_PCI
> diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
> index c6363ff..292f8b2 100644
> --- a/arch/mips/kernel/cpu-probe.c
> +++ b/arch/mips/kernel/cpu-probe.c
> @@ -242,15 +242,9 @@ static inline void cpu_probe_legacy(stru
>               break;
>       case PRID_IMP_VR41XX:
>               switch (c->processor_id & 0xf0) {
> -#ifndef CONFIG_VR4181
>               case PRID_REV_VR4111:
>                       c->cputype = CPU_VR4111;
>                       break;
> -#else
> -             case PRID_REV_VR4181:
> -                     c->cputype = CPU_VR4181;
> -                     break;
> -#endif
>               case PRID_REV_VR4121:
>                       c->cputype = CPU_VR4121;
>                       break;
> diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
> index 86fe15b..0fbf450 100644
> --- a/arch/mips/kernel/proc.c
> +++ b/arch/mips/kernel/proc.c
> @@ -79,7 +79,6 @@ static const char *cpu_name[] = {
>       [CPU_VR4122]    = "NEC VR4122",
>       [CPU_VR4131]    = "NEC VR4131",
>       [CPU_VR4133]    = "NEC VR4133",
> -     [CPU_VR4181]    = "NEC VR4181",
>       [CPU_VR4181A]   = "NEC VR4181A",
>       [CPU_SR71000]   = "Sandcraft SR71000",
>       [CPU_PR4450]    = "Philips PR4450",
> diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
> index 1b71d91..28a3b33 100644
> --- a/arch/mips/mm/c-r4k.c
> +++ b/arch/mips/mm/c-r4k.c
> @@ -840,7 +840,6 @@ static void __init probe_pcache(void)
>       case CPU_VR4111:
>       case CPU_VR4121:
>       case CPU_VR4122:
> -     case CPU_VR4181:
>       case CPU_VR4181A:
>               icache_size = 1 << (10 + ((config & CONF_IC) >> 9));
>               c->icache.linesz = 16 << ((config & CONF_IB) >> 5);
> diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
> index 0f94858..5a7e0a6 100644
> --- a/arch/mips/mm/tlbex.c
> +++ b/arch/mips/mm/tlbex.c
> @@ -908,7 +908,6 @@ static __init void build_tlb_write_entry
>       case CPU_VR4111:
>       case CPU_VR4121:
>       case CPU_VR4122:
> -     case CPU_VR4181:
>       case CPU_VR4181A:
>               i_nop(p);
>               i_nop(p);
> @@ -1054,9 +1053,8 @@ static __init void build_adjust_context(
>       case CPU_VR4121:
>       case CPU_VR4122:
>       case CPU_VR4131:
> -     case CPU_VR4181:
> -     case CPU_VR4181A:
>       case CPU_VR4133:
> +     case CPU_VR4181A:
>               shift += 2;
>               break;
>  
> diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h
> index 818b9a9..ef72bcd 100644
> --- a/include/asm-mips/cpu.h
> +++ b/include/asm-mips/cpu.h
> @@ -116,7 +116,6 @@
>  #define PRID_REV_TX3922      0x0030
>  #define PRID_REV_TX3927      0x0040
>  #define PRID_REV_VR4111              0x0050
> -#define PRID_REV_VR4181              0x0050  /* Same as VR4111 */
>  #define PRID_REV_VR4121              0x0060
>  #define PRID_REV_VR4122              0x0070
>  #define PRID_REV_VR4181A     0x0070  /* Same as VR4122 */
> @@ -183,7 +182,6 @@
>  #define CPU_VR4121           47
>  #define CPU_VR4122           48
>  #define CPU_VR4131           49
> -#define CPU_VR4181           50
>  #define CPU_VR4181A          51
>  #define CPU_AU1100           52
>  #define CPU_SR71000          53
> diff --git a/include/asm-mips/vr41xx/vr41xx.h 
> b/include/asm-mips/vr41xx/vr41xx.h
> 
> -- 
> Martin Michlmayr
> http://www.cyrius.com/


<Prev in Thread] Current Thread [Next in Thread>