Commit 8bb670c1 authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Linus Torvalds
Browse files

[PATCH] mips: change system type name in proc for vr41xx



This patch has changed system type name in proc for vr41xx.
Signed-off-by: default avatarYoichi Yuasa <yuasa@hh.iij4u.or.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 979934da
...@@ -490,13 +490,11 @@ load-$(CONFIG_NEC_CMBVR4133) += 0xffffffff80100000 ...@@ -490,13 +490,11 @@ load-$(CONFIG_NEC_CMBVR4133) += 0xffffffff80100000
# #
# ZAO Networks Capcella (VR4131) # ZAO Networks Capcella (VR4131)
# #
core-$(CONFIG_ZAO_CAPCELLA) += arch/mips/vr41xx/zao-capcella/
load-$(CONFIG_ZAO_CAPCELLA) += 0xffffffff80000000 load-$(CONFIG_ZAO_CAPCELLA) += 0xffffffff80000000
# #
# Victor MP-C303/304 (VR4122) # Victor MP-C303/304 (VR4122)
# #
core-$(CONFIG_VICTOR_MPC30X) += arch/mips/vr41xx/victor-mpc30x/
load-$(CONFIG_VICTOR_MPC30X) += 0xffffffff80001000 load-$(CONFIG_VICTOR_MPC30X) += 0xffffffff80001000
# #
...@@ -514,13 +512,11 @@ load-$(CONFIG_CASIO_E55) += 0xffffffff80004000 ...@@ -514,13 +512,11 @@ load-$(CONFIG_CASIO_E55) += 0xffffffff80004000
# #
# TANBAC TB0226 Mbase (VR4131) # TANBAC TB0226 Mbase (VR4131)
# #
core-$(CONFIG_TANBAC_TB0226) += arch/mips/vr41xx/tanbac-tb0226/
load-$(CONFIG_TANBAC_TB0226) += 0xffffffff80000000 load-$(CONFIG_TANBAC_TB0226) += 0xffffffff80000000
# #
# TANBAC TB0229 VR4131DIMM (VR4131) # TANBAC TB0229 VR4131DIMM (VR4131)
# #
core-$(CONFIG_TANBAC_TB0229) += arch/mips/vr41xx/tanbac-tb0229/
load-$(CONFIG_TANBAC_TB0229) += 0xffffffff80000000 load-$(CONFIG_TANBAC_TB0229) += 0xffffffff80000000
# #
......
...@@ -23,11 +23,6 @@ ...@@ -23,11 +23,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/vr41xx/e55.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) static int __init casio_e55_setup(void)
{ {
set_io_port_base(IO_PORT_BASE); set_io_port_base(IO_PORT_BASE);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for common code of the NEC VR4100 series. # 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 obj-$(CONFIG_VRC4173) += vrc4173.o
EXTRA_AFLAGS := $(CFLAGS) EXTRA_AFLAGS := $(CFLAGS)
/* /*
* 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 * 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 * it under the terms of the GNU General Public License as published by
...@@ -20,5 +20,5 @@ ...@@ -20,5 +20,5 @@
const char *get_system_type(void) const char *get_system_type(void)
{ {
return "TANBAC TB0226"; return "NEC VR4100 series";
} }
...@@ -23,11 +23,6 @@ ...@@ -23,11 +23,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/vr41xx/workpad.h> #include <asm/vr41xx/workpad.h>
const char *get_system_type(void)
{
return "IBM WorkPad z50";
}
static int __init ibm_workpad_setup(void) static int __init ibm_workpad_setup(void)
{ {
set_io_port_base(IO_PORT_BASE); set_io_port_base(IO_PORT_BASE);
......
...@@ -16,11 +16,6 @@ ...@@ -16,11 +16,6 @@
* Manish Lachwani (mlachwani@mvista.com) * Manish Lachwani (mlachwani@mvista.com)
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <asm/bootinfo.h>
#ifdef CONFIG_ROCKHOPPER #ifdef CONFIG_ROCKHOPPER
#include <asm/io.h> #include <asm/io.h>
...@@ -28,14 +23,7 @@ ...@@ -28,14 +23,7 @@
#define PCICONFDREG 0xaf000c14 #define PCICONFDREG 0xaf000c14
#define PCICONFAREG 0xaf000c18 #define PCICONFAREG 0xaf000c18
#endif
const char *get_system_type(void)
{
return "NEC CMB-VR4133";
}
#ifdef CONFIG_ROCKHOPPER
void disable_pcnet(void) void disable_pcnet(void)
{ {
u32 data; u32 data;
......
#
# Makefile for the TANBAC TB0226 specific parts of the kernel
#
obj-y += setup.o
#
# Makefile for the TANBAC TB0229(VR4131DIMM) specific parts of the kernel
#
obj-y := setup.o
/*
* 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";
}
#
# Makefile for the Victor MP-C303/304 specific parts of the kernel
#
obj-y += setup.o
/*
* 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";
}
#
# Makefile for the ZAO Networks Capcella specific parts of the kernel
#
obj-y += setup.o
/*
* 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";
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment