linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ralf@linux-mips.org
Date: Fri, 22 Jul 2005 17:27:07 +0100
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/07/22 17:27:00

Modified files:
        arch/mips      : Makefile 
        arch/mips/vr41xx/casio-e55: setup.c 
        arch/mips/vr41xx/common: Makefile 
        arch/mips/vr41xx/ibm-workpad: setup.c 
        arch/mips/vr41xx/nec-cmbvr4133: init.c 
Added files:
        arch/mips/vr41xx/common: type.c 
Removed files:
        arch/mips/vr41xx/tanbac-tb0226: Makefile setup.c 
        arch/mips/vr41xx/tanbac-tb0229: Makefile setup.c 
        arch/mips/vr41xx/victor-mpc30x: Makefile setup.c 
        arch/mips/vr41xx/zao-capcella: Makefile setup.c 

Log message:
        Use a single machine type for all VR41xx systems.

diff -urN linux/arch/mips/Makefile linux/arch/mips/Makefile
--- linux/arch/mips/Makefile    2005/07/14 17:47:57     1.204
+++ linux/arch/mips/Makefile    2005/07/22 16:26:59     1.205
@@ -534,13 +534,11 @@
 #
 # ZAO Networks Capcella (VR4131)
 #
-core-$(CONFIG_ZAO_CAPCELLA)    += arch/mips/vr41xx/zao-capcella/
 load-$(CONFIG_ZAO_CAPCELLA)    += 0xffffffff80000000
 
 #
 # Victor MP-C303/304 (VR4122)
 #
-core-$(CONFIG_VICTOR_MPC30X)   += arch/mips/vr41xx/victor-mpc30x/
 load-$(CONFIG_VICTOR_MPC30X)   += 0xffffffff80001000
 
 #
@@ -558,13 +556,11 @@
 #
 # TANBAC TB0226 Mbase (VR4131)
 #
-core-$(CONFIG_TANBAC_TB0226)   += arch/mips/vr41xx/tanbac-tb0226/
 load-$(CONFIG_TANBAC_TB0226)   += 0xffffffff80000000
 
 #
 # TANBAC TB0229 VR4131DIMM (VR4131)
 #
-core-$(CONFIG_TANBAC_TB0229)   += arch/mips/vr41xx/tanbac-tb0229/
 load-$(CONFIG_TANBAC_TB0229)   += 0xffffffff80000000
 
 #
diff -urN linux/arch/mips/vr41xx/casio-e55/setup.c 
linux/arch/mips/vr41xx/casio-e55/setup.c
--- linux/arch/mips/vr41xx/casio-e55/setup.c    2005/05/23 11:14:28     1.14
+++ linux/arch/mips/vr41xx/casio-e55/setup.c    2005/07/22 16:26:59     1.15
@@ -23,11 +23,6 @@
 #include <asm/io.h>
 #include <asm/vr41xx/e55.h>
 
-const char *get_system_type(void)
-{
-       return "CASIO CASSIOPEIA E-11/15/55/65";
-}
-
 static int __init casio_e55_setup(void)
 {
        set_io_port_base(IO_PORT_BASE);
diff -urN linux/arch/mips/vr41xx/common/type.c 
linux/arch/mips/vr41xx/common/type.c
--- linux/arch/mips/vr41xx/common/type.c        1970/01/01 00:00:00
+++ linux/arch/mips/vr41xx/common/type.c        2005-07-22 17:26:59.881586000 
+0100     1.1
@@ -0,0 +1,24 @@
+/*
+ *  type.c, System type for NEC VR4100 series.
+ *
+ *  Copyright (C) 2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+const char *get_system_type(void)
+{
+       return "NEC VR4100 series";
+}
diff -urN linux/arch/mips/vr41xx/common/Makefile 
linux/arch/mips/vr41xx/common/Makefile
--- linux/arch/mips/vr41xx/common/Makefile      2005/07/15 17:19:02     1.21
+++ linux/arch/mips/vr41xx/common/Makefile      2005/07/22 16:26:59     1.22
@@ -2,7 +2,7 @@
 # Makefile for common code of the NEC VR4100 series.
 #
 
-obj-y                          += bcu.o cmu.o icu.o init.o int-handler.o irq.o 
pmu.o
+obj-y                          += bcu.o cmu.o icu.o init.o int-handler.o irq.o 
pmu.o type.o
 obj-$(CONFIG_VRC4173)          += vrc4173.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff -urN linux/arch/mips/vr41xx/ibm-workpad/setup.c 
linux/arch/mips/vr41xx/ibm-workpad/setup.c
--- linux/arch/mips/vr41xx/ibm-workpad/setup.c  2005/05/23 11:14:28     1.14
+++ linux/arch/mips/vr41xx/ibm-workpad/setup.c  2005/07/22 16:26:59     1.15
@@ -23,11 +23,6 @@
 #include <asm/io.h>
 #include <asm/vr41xx/workpad.h>
 
-const char *get_system_type(void)
-{
-       return "IBM WorkPad z50";
-}
-
 static int __init ibm_workpad_setup(void)
 {
        set_io_port_base(IO_PORT_BASE);
diff -urN linux/arch/mips/vr41xx/nec-cmbvr4133/init.c 
linux/arch/mips/vr41xx/nec-cmbvr4133/init.c
--- linux/arch/mips/vr41xx/nec-cmbvr4133/init.c 2005/07/10 10:29:01     1.2
+++ linux/arch/mips/vr41xx/nec-cmbvr4133/init.c 2005/07/22 16:27:00     1.3
@@ -16,11 +16,6 @@
  * Manish Lachwani (mlachwani@mvista.com)
  */
 #include <linux/config.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-
-#include <asm/bootinfo.h>
 
 #ifdef CONFIG_ROCKHOPPER
 #include <asm/io.h>
@@ -28,14 +23,7 @@
 
 #define PCICONFDREG    0xaf000c14
 #define PCICONFAREG    0xaf000c18
-#endif
-
-const char *get_system_type(void)
-{
-       return "NEC CMB-VR4133";
-}
 
-#ifdef CONFIG_ROCKHOPPER
 void disable_pcnet(void)
 {
        u32 data;
diff -urN linux/arch/mips/vr41xx/tanbac-tb0226/Makefile 
linux/arch/mips/vr41xx/tanbac-tb0226/Makefile
--- linux/arch/mips/vr41xx/tanbac-tb0226/Attic/Makefile 2005-07-22 
17:27:00.233754000 +0100     1.4
+++ linux/arch/mips/vr41xx/tanbac-tb0226/Attic/Makefile 1970/01/01 00:00:00+0100
@@ -1,5 +0,0 @@
-#
-# Makefile for the TANBAC TB0226 specific parts of the kernel
-#
-
-obj-y                  += setup.o
diff -urN linux/arch/mips/vr41xx/tanbac-tb0226/setup.c 
linux/arch/mips/vr41xx/tanbac-tb0226/setup.c
--- linux/arch/mips/vr41xx/tanbac-tb0226/Attic/setup.c  2005-07-22 
17:27:00.247838000 +0100     1.14
+++ linux/arch/mips/vr41xx/tanbac-tb0226/Attic/setup.c  1970/01/01 00:00:00+0100
@@ -1,24 +0,0 @@
-/*
- *  setup.c, Setup for the TANBAC TB0226.
- *
- *  Copyright (C) 2002-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-const char *get_system_type(void)
-{
-       return "TANBAC TB0226";
-}
diff -urN linux/arch/mips/vr41xx/tanbac-tb0229/Makefile 
linux/arch/mips/vr41xx/tanbac-tb0229/Makefile
--- linux/arch/mips/vr41xx/tanbac-tb0229/Attic/Makefile 2005-07-22 
17:27:00.341030000 +0100     1.7
+++ linux/arch/mips/vr41xx/tanbac-tb0229/Attic/Makefile 1970/01/01 00:00:00+0100
@@ -1,5 +0,0 @@
-#
-# Makefile for the TANBAC TB0229(VR4131DIMM) specific parts of the kernel
-#
-
-obj-y                          := setup.o
diff -urN linux/arch/mips/vr41xx/tanbac-tb0229/setup.c 
linux/arch/mips/vr41xx/tanbac-tb0229/setup.c
--- linux/arch/mips/vr41xx/tanbac-tb0229/Attic/setup.c  2005-07-22 
17:27:00.359862000 +0100     1.15
+++ linux/arch/mips/vr41xx/tanbac-tb0229/Attic/setup.c  1970/01/01 00:00:00+0100
@@ -1,27 +0,0 @@
-/*
- *  setup.c, Setup for the TANBAC TB0229 (VR4131DIMM)
- *
- *  Copyright (C) 2002-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
- *
- *  Modified for TANBAC TB0229:
- *  Copyright (C) 2003  Megasolution Inc.  <matsu@megasolution.jp>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-const char *get_system_type(void)
-{
-       return "TANBAC TB0229";
-}
diff -urN linux/arch/mips/vr41xx/victor-mpc30x/Makefile 
linux/arch/mips/vr41xx/victor-mpc30x/Makefile
--- linux/arch/mips/vr41xx/victor-mpc30x/Attic/Makefile 2005-07-22 
17:27:00.445759000 +0100     1.7
+++ linux/arch/mips/vr41xx/victor-mpc30x/Attic/Makefile 1970/01/01 00:00:00+0100
@@ -1,5 +0,0 @@
-#
-# Makefile for the Victor MP-C303/304 specific parts of the kernel
-#
-
-obj-y                  += setup.o
diff -urN linux/arch/mips/vr41xx/victor-mpc30x/setup.c 
linux/arch/mips/vr41xx/victor-mpc30x/setup.c
--- linux/arch/mips/vr41xx/victor-mpc30x/Attic/setup.c  2005-07-22 
17:27:00.471949000 +0100     1.16
+++ linux/arch/mips/vr41xx/victor-mpc30x/Attic/setup.c  1970/01/01 00:00:00+0100
@@ -1,24 +0,0 @@
-/*
- *  setup.c, Setup for the Victor MP-C303/304.
- *
- *  Copyright (C) 2002-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-const char *get_system_type(void)
-{
-       return "Victor MP-C303/304";
-}
diff -urN linux/arch/mips/vr41xx/zao-capcella/Makefile 
linux/arch/mips/vr41xx/zao-capcella/Makefile
--- linux/arch/mips/vr41xx/zao-capcella/Attic/Makefile  2005-07-22 
17:27:00.563181000 +0100     1.8
+++ linux/arch/mips/vr41xx/zao-capcella/Attic/Makefile  1970/01/01 00:00:00+0100
@@ -1,5 +0,0 @@
-#
-# Makefile for the ZAO Networks Capcella  specific parts of the kernel
-#
-
-obj-y                  += setup.o
diff -urN linux/arch/mips/vr41xx/zao-capcella/setup.c 
linux/arch/mips/vr41xx/zao-capcella/setup.c
--- linux/arch/mips/vr41xx/zao-capcella/Attic/setup.c   2005-07-22 
17:27:00.585614000 +0100     1.17
+++ linux/arch/mips/vr41xx/zao-capcella/Attic/setup.c   1970/01/01 00:00:00+0100
@@ -1,24 +0,0 @@
-/*
- *  setup.c, Setup for the ZAO Networks Capcella.
- *
- *  Copyright (C) 2002-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-const char *get_system_type(void)
-{
-       return "ZAO Networks Capcella";
-}

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