Menu
▾
▴
[Linux-mips-commits]CVS: linux/arch/mips Makefile,1.51,1.52 config.in,1.102,1.103
|
From: Paul M. <le...@us...> - 2002-07-12 20:14:59
|
Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips
Modified Files:
Makefile config.in
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Makefile 14 Jun 2002 14:03:08 -0000 1.51
+++ Makefile 12 Jul 2002 20:14:26 -0000 1.52
@@ -251,7 +251,7 @@
endif
#
-# NEC Eagle board (VR4122)
+# NEC Eagle/Hawk board (VR4122/VR4131)
#
ifdef CONFIG_NEC_EAGLE
SUBDIRS += arch/mips/vr41xx/common \
@@ -277,10 +277,8 @@
#
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
@@ -290,10 +288,8 @@
#
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
@@ -306,8 +302,21 @@
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
+ arch/mips/vr41xx/vr4122/common/vr4122.o \
+ arch/mips/vr41xx/vr4122/mp-c303/mp-c303.o
+LOADADDR += 0x80004000
+endif
+
+#
+# ZAO Networks Capcella(VR4131)
+#
+ifdef CONFIG_ZAO_CAPCELLA
+SUBDIRS += arch/mips/vr41xx/common \
+ arch/mips/vr41xx/vr4122/common \
+ arch/mips/vr41xx/vr4122/capcella
+LIBS += arch/mips/vr41xx/common/vr41xx.o \
+ arch/mips/vr41xx/vr4122/common/vr4122.o \
+ arch/mips/vr41xx/vr4122/capcella/capcella.o
LOADADDR += 0x80004000
endif
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- config.in 13 Jun 2002 12:57:33 -0000 1.102
+++ config.in 12 Jul 2002 20:14:26 -0000 1.103
@@ -57,9 +57,9 @@
bool 'Support for NEC DDB Vrc-5476' CONFIG_DDB5476
bool 'Support for NEC DDB Vrc-5477' CONFIG_DDB5477
bool 'Support for NEC Osprey board' CONFIG_NEC_OSPREY
-bool 'Support for NEC Eagle board (EXPERIMENTAL)' CONFIG_NEC_EAGLE
+bool 'Support for NEC Eagle/Hawk board' CONFIG_NEC_EAGLE
if [ "$CONFIG_NEC_EAGLE" = "y" ]; then
- int ' Memory size' CONFIG_NEC_EAGLE_MEM_SIZE 64
+ int ' Memory size' CONFIG_NEC_EAGLE_MEM_SIZE 32
fi
bool 'Support for NEC Korva/Markham board (EXPERIMENTAL)' CONFIG_NEC_KORVA
if [ "$CONFIG_NEC_KORVA" = "y" ]; then
@@ -80,18 +80,19 @@
Model-500/510 CONFIG_NINO_16MB" Model-200
fi
bool 'Support for Sony PlayStation 2' CONFIG_PS2
-bool 'Support for Casio Cassiopeia BE-300 (EXPERIMENTAL)' CONFIG_CASIO_BE300
-bool 'Support for Casio Cassiopeia E15 (EXPERIMENTAL)' CONFIG_CASIO_E15
-bool 'Support for Vadem Clio 1000 (EXPERIMENTAL)' CONFIG_VADEM_CLIO_1000
-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 CASIO CASSIOPEIA E15 (EXPERIMENTAL)' CONFIG_CASIO_E15
+bool 'Support for CASIO CASSIOPEIA E-55/65 (EXPERIMENTAL)' CONFIG_CASIO_E55
+bool 'Support for CASIO CASSIOPEIA BE-300 (EXPERIMENTAL)' CONFIG_CASIO_BE300
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 NEC MobilePro 780 PDA (EXPERIMENTAL)' CONFIG_NEC_MOBILEPRO
+bool 'Support for Vadem Clio 1000 (EXPERIMENTAL)' CONFIG_VADEM_CLIO_1000
bool 'Support for Victor MP-C303/304 (EXPERIMENTAL)' CONFIG_VICTOR_MPC303
+bool 'Support for ZAO Networks Capcella (EXPERIMENTAL)' CONFIG_ZAO_CAPCELLA
bool 'Support for SGI IP22 (Indy/Indigo2)' CONFIG_SGI_IP22
dep_bool 'Support for SiByte SB1250 SOC (EXPERIMENTAL)' CONFIG_SIBYTE_SB1250 $CONFIG_EXPERIMENTAL
@@ -351,7 +352,36 @@
fi
if [ "$CONFIG_NEC_EAGLE" = "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_VICTOR_MPC303" = "y" ]; then
+ define_bool CONFIG_CPU_VR41XX y
+ define_bool CONFIG_CPU_LITTLE_ENDIAN 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_ZAO_CAPCELLA" = "y" ]; then
+ define_bool CONFIG_CPU_VR41XX y
+ define_bool CONFIG_CPU_LITTLE_ENDIAN y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_TIME_C y
@@ -392,7 +422,7 @@
fi
if [ "$CONFIG_IBM_WORKPAD" = "y" ]; then
define_bool CONFIG_CPU_VR41XX y
- define_bool CONFIG_VR4121 y
+ define_bool CONFIG_CPU_LITTLE_ENDIAN y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_TIME_C y
@@ -422,7 +452,7 @@
fi
if [ "$CONFIG_CASIO_E55" = "y" ]; then
define_bool CONFIG_CPU_VR41XX y
- define_bool CONFIG_VR4111 y
+ define_bool CONFIG_CPU_LITTLE_ENDIAN y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_TIME_C y
@@ -457,24 +487,10 @@
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_NONCOHERENT_IO y
- define_bool CONFIG_DUMMY_KEYB y
-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_ISA 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_NINO" = "y" ]; then
define_bool CONFIG_NEW_IRQ y
@@ -629,8 +645,6 @@
"$CONFIG_NINO" = "y" -o \
"$CONFIG_MIPS_COBALT" = "y" -o \
"$CONFIG_VR4111" = "y" -o \
- "$CONFIG_VR4121" = "y" -o \
- "$CONFIG_VR4122" = "y" -o \
"$CONFIG_NEC_KORVA" = "y" ]; then
define_bool CONFIG_CPU_LITTLE_ENDIAN y
else
@@ -639,7 +653,6 @@
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
|
