linux-mips
[Top] [All Lists]

[-mm patch] more vr4181 removal

To: Andrew Morton <akpm@osdl.org>, Ralf Baechle <ralf@linux-mips.org>
Subject: [-mm patch] more vr4181 removal
From: Adrian Bunk <bunk@stusta.de>
Date: Sun, 7 Aug 2005 17:43:00 +0200
Cc: linux-kernel@vger.kernel.org, linux-mips@linux-mips.org
In-reply-to: <20050807014214.45968af3.akpm@osdl.org>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20050807014214.45968af3.akpm@osdl.org>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.9i
On Sun, Aug 07, 2005 at 01:42:14AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.13-rc4-mm1:
>...
> +mips-remove-vr4181-support.patch
>...
>  MIPS stuff
>...



Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 arch/mips/Kconfig            |   12 +-----------
 arch/mips/Makefile           |    7 -------
 arch/mips/kernel/cpu-probe.c |    6 ------
 3 files changed, 1 insertion(+), 24 deletions(-)

--- linux-2.6.13-rc5-mm1-full/arch/mips/Kconfig.old     2005-08-07 
17:31:12.000000000 +0200
+++ linux-2.6.13-rc5-mm1-full/arch/mips/Kconfig 2005-08-07 17:32:04.000000000 
+0200
@@ -445,11 +445,6 @@
        depends on DDB5477
        default 0
 
-config NEC_OSPREY
-       bool "Support for NEC Osprey board"
-       select DMA_NONCOHERENT
-       select IRQ_CPU
-
 config SGI_IP22
        bool "Support for SGI IP22 (Indy/Indigo2)"
        select ARC
@@ -974,7 +969,7 @@
 
 config CPU_LITTLE_ENDIAN
        bool "Generate little endian code"
-       default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 
|| MACH_DECSTATION || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || 
MIPS_IVR || SOC_AU1X00 || NEC_OSPREY || OLIVETTI_M700 || SNI_RM200_PCI || 
VICTOR_MPC30X || ZAO_CAPCELLA
+       default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 
|| MACH_DECSTATION || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || 
MIPS_IVR || SOC_AU1X00 || OLIVETTI_M700 || SNI_RM200_PCI || VICTOR_MPC30X || 
ZAO_CAPCELLA
        default n if MIPS_EV64120 || MIPS_EV96100 || MOMENCO_OCELOT || 
MOMENCO_OCELOT_G || SGI_IP22 || SGI_IP27 || SGI_IP32 || TOSHIBA_JMR3927
        help
          Some MIPS machines can be configured for either little or big endian
@@ -1091,11 +1086,6 @@
 config HAVE_STD_PC_SERIAL_PORT
        bool
 
-config VR4181
-       bool
-       depends on NEC_OSPREY
-       default y
-
 config ARC_CONSOLE
        bool "ARC console support"
        depends on SGI_IP22 || SNI_RM200_PCI
--- linux-2.6.13-rc5-mm1-full/arch/mips/Makefile.old    2005-08-07 
17:32:19.000000000 +0200
+++ linux-2.6.13-rc5-mm1-full/arch/mips/Makefile        2005-08-07 
17:32:30.000000000 +0200
@@ -469,13 +469,6 @@
 load-$(CONFIG_LASAT)           += 0xffffffff80000000
 
 #
-# NEC Osprey (vr4181) board
-#
-core-$(CONFIG_NEC_OSPREY)      += arch/mips/vr4181/common/ \
-                                  arch/mips/vr4181/osprey/
-load-$(CONFIG_NEC_OSPREY)      += 0xffffffff80002000
-
-#
 # Common VR41xx
 #
 core-$(CONFIG_MACH_VR41XX)     += arch/mips/vr41xx/common/
--- linux-2.6.13-rc5-mm1-full/arch/mips/kernel/cpu-probe.c.old  2005-08-07 
17:32:45.000000000 +0200
+++ linux-2.6.13-rc5-mm1-full/arch/mips/kernel/cpu-probe.c      2005-08-07 
17:33:46.000000000 +0200
@@ -229,15 +229,9 @@
                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;


<Prev in Thread] Current Thread [Next in Thread>
  • [-mm patch] more vr4181 removal, Adrian Bunk <=