[Linux-mips-commits]CVS: linux/arch/mips Makefile,1.23,1.24 config.in,1.41,1.42

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv30742/arch/mips

Modified Files:
	Makefile config.in 
Log Message:
Merged Vr4111 (Clio-1000) patch from Jim Paris.



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile	2001/10/24 23:32:54	1.23
+++ Makefile	2001/10/28 23:04:19	1.24
@@ -62,7 +62,7 @@
 GCCFLAGS	+= -mcpu=r4300 -mips2 -Wa,--trap
 endif
 ifdef CONFIG_CPU_VR41XX
-GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
+GCCFLAGS	+= -mips2 -Wa,-m4100,--trap
 endif
 ifdef CONFIG_CPU_R4X00
 GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
@@ -325,6 +325,19 @@
 CORE_FILES    += arch/mips/ps2/ps2.o
 SUBDIRS       += arch/mips/ps2
 LOADADDR      += 0x80010000
+endif
+
+# 
+# Vadem Clio-1000 (aka Sharp Mobilon Tripad PV-6000)
+#
+ifdef CONFIG_VADEM_CLIO_1000
+SUBDIRS       += arch/mips/vr41xx/common \
+		 arch/mips/vr4111/common \
+		 arch/mips/vr4111/clio-1000
+LIBS          += arch/mips/vr41xx/common/vr41xx.o \
+		 arch/mips/vr4111/common/vr4111.o \
+                 arch/mips/vr4111/clio-1000/clio-1000.o
+LOADADDR      += 0x80001000
 endif
 
 #

Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- config.in	2001/10/28 09:19:07	1.41
+++ config.in	2001/10/28 23:04:19	1.42
@@ -46,6 +46,7 @@
    fi
    bool 'Support for Sony PlayStation 2' CONFIG_PS2
    bool 'Support for Casio Cassiopeia BE-300 (EXPERIMENTAL)' CONFIG_CASIO_BE300	
+   bool 'Support for Vadem Clio 1000 (EXPERIMENTAL)' CONFIG_VADEM_CLIO_1000
 fi
 bool 'Support for Mips Magnum 4000' CONFIG_MIPS_MAGNUM_4000
 bool 'Support for Momentum Ocelot board' CONFIG_MOMENCO_OCELOT
@@ -248,6 +249,18 @@
    define_bool CONFIG_NEW_PCI y
    define_bool CONFIG_OLD_TIME_C y
 fi
+if [ "$CONFIG_VADEM_CLIO_1000" = "y" ]; then
+   define_bool CONFIG_CPU_VR41XX y
+   define_bool CONFIG_VR4111 y
+   define_bool CONFIG_SERIAL y
+   define_bool CONFIG_SERIAL_MANY_PORTS y
+   define_bool CONFIG_NEW_IRQ y
+   define_bool CONFIG_IRQ_CPU y
+   define_bool CONFIG_NEW_TIME_C y
+   define_bool CONFIG_ISA y
+   define_bool CONFIG_DUMMY_KEYB y
+fi
+
 if [ "$CONFIG_NINO" = "y" ]; then
    define_bool CONFIG_NEW_IRQ y
    define_bool CONFIG_PC_KEYB y
@@ -355,6 +368,7 @@
 if [ "$CONFIG_DECSTATION" = "y" -o \
      "$CONFIG_DDB5074" = "y" -o    \
      "$CONFIG_NINO" = "y" -o      \
+     "$CONFIG_VR4111" = "y"   -o  \
      "$CONFIG_NEC_KORVA" = "y" ]; then
    define_bool CONFIG_CPU_LITTLE_ENDIAN y
 else