Menu
▾
▴
[Linux-mips-commits]CVS: linux/arch/mips Makefile,1.39,1.40 config.in,1.85,1.86
|
From: Paul M. <le...@us...> - 2002-03-07 03:17:25
|
Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv28915/arch/mips
Modified Files:
Makefile config.in
Log Message:
Imported Yoichi-san's Vr41xx patch, with some minor modifications.
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile 19 Jan 2002 21:17:35 -0000 1.39
+++ Makefile 7 Mar 2002 03:16:52 -0000 1.40
@@ -245,12 +245,15 @@
endif
#
-# NEC Eagle (vr4122) board
+# NEC Eagle board (VR4122)
#
ifdef CONFIG_NEC_EAGLE
-SUBDIRS += arch/mips/vr4122/common arch/mips/vr4122/eagle
-LIBS += arch/mips/vr4122/common/vr4122.o \
- arch/mips/vr4122/eagle/eagle.o
+SUBDIRS += arch/mips/vr41xx/common \
+ arch/mips/vr41xx/vr4122/common \
+ arch/mips/vr41xx/vr4122/eagle
+LIBS += arch/mips/vr41xx/common/vr41xx.o \
+ arch/mips/vr41xx/vr4122/common/vr4122.o\
+ arch/mips/vr41xx/vr4122/eagle/eagle.o
LOADADDR += 0x80004000
endif
@@ -263,6 +266,46 @@
LOADADDR += 0x80002000
endif
+#
+# IBM WorkPad z50 (VR4121)
+#
+ifdef CONFIG_IBM_WORKPAD
+SUBDIRS += arch/mips/vr41xx/common \
+ arch/mips/vr41xx/vr4121/common \
+ arch/mips/vr41xx/vr4121/workpad
+LIBS += arch/mips/vr41xx/common/vr41xx.o \
+ arch/mips/vr41xx/vr4121/common/vr4121.o \
+ arch/mips/vr41xx/vr4121/workpad/workpad.o
+LOADADDR += 0x80004000
+endif
+
+#
+# CASIO CASSIPEIA E-55/65 (VR4111)
+#
+ifdef CONFIG_CASIO_E55
+SUBDIRS += arch/mips/vr41xx/common \
+ arch/mips/vr41xx/vr4111/common \
+ arch/mips/vr41xx/vr4111/casio-e55
+LIBS += arch/mips/vr41xx/common/vr41xx.o \
+ arch/mips/vr41xx/vr4111/common/vr4111.o \
+ arch/mips/vr41xx/vr4111/casio-e55/casio-e55.o
+LOADADDR += 0x80004000
+endif
+
+#
+# Victor MP-C303/304 (VR4122)
+#
+ifdef CONFIG_VICTOR_MPC303
+SUBDIRS += arch/mips/vr41xx/common \
+ arch/mips/vr41xx/vr4122/common \
+ arch/mips/vr41xx/vr4122/mp-c303
+LIBS += arch/mips/vr41xx/common/vr41xx.o \
+ arch/mips/vr41xx/vr4122/common/vr4122.o
+ arch/mips/vr41xx/vr4122/mp-c303/mp-c303.o
+LOADADDR += 0x80004000
+endif
+
+#
#
# Galileo EV64120 Board
#
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- config.in 5 Feb 2002 17:33:04 -0000 1.85
+++ config.in 7 Mar 2002 03:16:52 -0000 1.86
@@ -72,6 +72,12 @@
bool 'Support for NEC MobilePro 780 PDA (EXPERIMENTAL)' CONFIG_NEC_MOBILEPRO
bool 'Support for IDT 79S334 Evaluation board' CONFIG_IDT_79S334
bool 'Support for IDT 79EB355 Evaluation board' CONFIG_IDT_79EB355
+ bool 'Support for IBM WorkPad z50 (EXPERIMENTAL)' CONFIG_IBM_WORKPAD
+ if [ "$CONFIG_IBM_WORKPAD" = "y" ]; then
+ int ' Memory size' CONFIG_IBM_WORKPAD_MEM_SIZE 16
+ fi
+ bool 'Support for CASIO CASSIOPEIA E-55/65 (EXPERIMENTAL)' CONFIG_CASIO_E55
+ bool 'Support for Victor MP-C303/304 (EXPERIMENTAL)' CONFIG_VICTOR_MPC303
fi
bool 'Support for Mips Magnum 4000' CONFIG_MIPS_MAGNUM_4000
bool 'Support for Momentum Ocelot board' CONFIG_MOMENCO_OCELOT
@@ -258,12 +264,16 @@
define_bool CONFIG_CPU_VR41XX y
define_bool CONFIG_VR4122 y
define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_TIME_C y
- define_bool CONFIG_VR4122_TIME_C y
+ define_bool CONFIG_VR41XX_TIME_C y
define_bool CONFIG_NONCOHERENT_IO y
+ define_bool CONFIG_ISA n
define_bool CONFIG_PCI y
define_bool CONFIG_NEW_PCI y
define_bool CONFIG_PCI_AUTO y
+ define_bool CONFIG_DUMMY_KEYB y
+ define_bool CONFIG_SCSI n
fi
if [ "$CONFIG_NEC_KORVA" = "y" ]; then
define_bool CONFIG_CPU_VR41XX y
@@ -279,6 +289,49 @@
define_bool CONFIG_PCI_AUTO y
fi
fi
+if [ "$CONFIG_IBM_WORKPAD" = "y" ]; then
+ define_bool CONFIG_CPU_VR41XX y
+ define_bool CONFIG_VR4121 y
+ define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_IRQ_CPU y
+ define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_VR41XX_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
+ define_bool CONFIG_ISA y
+ define_bool CONFIG_SERIAL y
+ define_bool CONFIG_SERIAL_MANY_PORTS y
+ define_bool CONFIG_DUMMY_KEYB y
+ define_bool CONFIG_SCSI n
+fi
+if [ "$CONFIG_CASIO_E55" = "y" ]; then
+ define_bool CONFIG_CPU_VR41XX y
+ define_bool CONFIG_VR4111 y
+ define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_IRQ_CPU y
+ define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_VR41XX_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
+ define_bool CONFIG_ISA y
+ define_bool CONFIG_SERIAL y
+ define_bool CONFIG_SERIAL_MANY_PORTS y
+ define_bool CONFIG_DUMMY_KEYB y
+ define_bool CONFIG_SCSI n
+fi
+if [ "$CONFIG_VICTOR_MPC303" = "y" ]; then
+ define_bool CONFIG_CPU_VR41XX y
+ define_bool CONFIG_VR4122 y
+ define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_IRQ_CPU y
+ define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_VR41XX_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
+ define_bool CONFIG_ISA n
+ define_bool CONFIG_PCI y
+ define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_PCI_AUTO y
+ define_bool CONFIG_DUMMY_KEYB y
+ define_bool CONFIG_SCSI n
+fi
if [ "$CONFIG_MIPS_COBALT" = "y" ]; then
define_bool CONFIG_COBALT_LCD y
define_bool CONFIG_PCI y
@@ -561,6 +614,7 @@
dep_bool ' Enable R5900 specific context' CONFIG_CPU_R5900_CONTEXT $CONFIG_PS2
dep_bool ' Enable Vr4131 cache fixes for early rev processors' CONFIG_VR4131_CACHE_FIX $CONFIG_VR4131
+dep_bool ' Enable VR4122 CLKSPEEDREG bug fixes' CONFIG_VR4122_CLKSPEEDREG_FIX $CONFIG_VR4122
if [ "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
bool 'DS1742 BRAM/RTC support' CONFIG_RTC_DS1742
|
