---

yaml --- r: 6941 b: refs/heads/master c: 8bb670c h: refs/heads/master i: 6939: c552f6d v: v3
git-mirror · Sep 5, 2005 · b5be2d1 · b5be2d1
1 parent 85c5e2c
commit b5be2d1
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 126 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 979934da9e7a0005bd9c8b1d7d00febb59ff67f7
+refs/heads/master: 8bb670c1407c2a4890810fd3e348dac1b89e669e
diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile
@@ -490,13 +490,11 @@ load-$(CONFIG_NEC_CMBVR4133)	+= 0xffffffff80100000
 #
 # 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
 
 #
@@ -514,13 +512,11 @@ load-$(CONFIG_CASIO_E55)	+= 0xffffffff80004000
 #
 # 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 --git a/trunk/arch/mips/vr41xx/casio-e55/setup.c b/trunk/arch/mips/vr41xx/casio-e55/setup.c
@@ -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 --git a/trunk/arch/mips/vr41xx/common/Makefile b/trunk/arch/mips/vr41xx/common/Makefile
@@ -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 --git a/trunk/arch/mips/vr41xx/tanbac-tb0226/setup.c → trunk/arch/mips/vr41xx/common/type.c b/trunk/arch/mips/vr41xx/tanbac-tb0226/setup.c → trunk/arch/mips/vr41xx/common/type.c
@@ -1,7 +1,7 @@
 /*
- *  setup.c, Setup for the TANBAC TB0226.
+ *  type.c, System type for NEC VR4100 series.
  *
- *  Copyright (C) 2002-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+ *  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
@@ -20,5 +20,5 @@
 
 const char *get_system_type(void)
 {
-	return "TANBAC TB0226";
+	return "NEC VR4100 series";
 }
diff --git a/trunk/arch/mips/vr41xx/ibm-workpad/setup.c b/trunk/arch/mips/vr41xx/ibm-workpad/setup.c
@@ -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 --git a/trunk/arch/mips/vr41xx/nec-cmbvr4133/init.c b/trunk/arch/mips/vr41xx/nec-cmbvr4133/init.c
@@ -16,26 +16,14 @@
  * 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>
 #include <linux/pci.h>
 
 #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 --git a/trunk/arch/mips/vr41xx/tanbac-tb0226/Makefile b/trunk/arch/mips/vr41xx/tanbac-tb0226/Makefile
diff --git a/trunk/arch/mips/vr41xx/tanbac-tb0229/Makefile b/trunk/arch/mips/vr41xx/tanbac-tb0229/Makefile
diff --git a/trunk/arch/mips/vr41xx/tanbac-tb0229/setup.c b/trunk/arch/mips/vr41xx/tanbac-tb0229/setup.c
diff --git a/trunk/arch/mips/vr41xx/victor-mpc30x/Makefile b/trunk/arch/mips/vr41xx/victor-mpc30x/Makefile
diff --git a/trunk/arch/mips/vr41xx/victor-mpc30x/setup.c b/trunk/arch/mips/vr41xx/victor-mpc30x/setup.c
diff --git a/trunk/arch/mips/vr41xx/zao-capcella/Makefile b/trunk/arch/mips/vr41xx/zao-capcella/Makefile
diff --git a/trunk/arch/mips/vr41xx/zao-capcella/setup.c b/trunk/arch/mips/vr41xx/zao-capcella/setup.c