Update of /cvsroot/linuxconsole/ruby/linux/arch/alpha
In directory usw-pr-cvs1:/tmp/cvs-serv1539/linux/arch/alpha
Modified Files:
config.in
Log Message:
Synced to 2.5.6
Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/alpha/config.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- config.in 15 Mar 2002 18:59:28 -0000 1.26
+++ config.in 18 Mar 2002 19:29:08 -0000 1.27
@@ -88,13 +88,24 @@
then
define_bool CONFIG_ALPHA_EB64P y
fi
-if [ "$CONFIG_ALPHA_EB164" = "y" -o "$CONFIG_ALPHA_PC164" = "y" \
- -o "$CONFIG_ALPHA_ALCOR" = "y" -o "$CONFIG_ALPHA_TAKARA" = "y" ]
+if [ "$CONFIG_ALPHA_ALCOR" = "y" ]
then
define_bool CONFIG_ALPHA_EV5 y
define_bool CONFIG_ALPHA_CIA y
+ bool 'EV56 CPU (speed >= 366MHz)?' CONFIG_ALPHA_EV56
fi
-if [ "$CONFIG_ALPHA_MIKASA" = "y" -o "$CONFIG_ALPHA_NORITAKE" = "y" ]
+if [ "$CONFIG_ALPHA_EB164" = "y" ]
+then
+ define_bool CONFIG_ALPHA_EV5 y
+ define_bool CONFIG_ALPHA_CIA y
+fi
+if [ "$CONFIG_ALPHA_PC164" = "y" -o "$CONFIG_ALPHA_TAKARA" = "y" ]
+then
+ define_bool CONFIG_ALPHA_EV5 y
+ define_bool CONFIG_ALPHA_EV56 y
+ define_bool CONFIG_ALPHA_CIA y
+fi
+if [ "$CONFIG_ALPHA_MIKASA" = "y" ]
then
bool 'EV5 CPU daughtercard (model 5/xxx)?' CONFIG_ALPHA_PRIMO
if [ "$CONFIG_ALPHA_PRIMO" = "y" ]
@@ -106,6 +117,19 @@
define_bool CONFIG_ALPHA_APECS y
fi
fi
+if [ "$CONFIG_ALPHA_NORITAKE" = "y" ]
+then
+ bool 'EV5 CPU daughtercard (model 5/xxx)?' CONFIG_ALPHA_PRIMO
+ if [ "$CONFIG_ALPHA_PRIMO" = "y" ]
+ then
+ define_bool CONFIG_ALPHA_EV5 y
+ define_bool CONFIG_ALPHA_CIA y
+ bool 'EV56 CPU (speed >= 333MHz)?' CONFIG_ALPHA_EV56
+ else
+ define_bool CONFIG_ALPHA_EV4 y
+ define_bool CONFIG_ALPHA_APECS y
+ fi
+fi
if [ "$CONFIG_ALPHA_SABLE" = "y" ]
then
bool 'EV5 CPU(s) (model 5/xxx)?' CONFIG_ALPHA_GAMMA
@@ -121,6 +145,7 @@
-o "$CONFIG_ALPHA_SX164" = "y" -o "$CONFIG_ALPHA_RUFFIAN" = "y" ]
then
define_bool CONFIG_ALPHA_EV5 y
+ define_bool CONFIG_ALPHA_EV56 y
define_bool CONFIG_ALPHA_CIA y
define_bool CONFIG_ALPHA_PYXIS y
fi
@@ -145,10 +170,12 @@
then
define_bool CONFIG_ALPHA_EV5 y
define_bool CONFIG_ALPHA_MCPCIA y
+ bool 'EV56 CPU (speed >= 400MHz)?' CONFIG_ALPHA_EV56
fi
if [ "$CONFIG_ALPHA_RX164" = "y" ]
then
define_bool CONFIG_ALPHA_EV5 y
+ define_bool CONFIG_ALPHA_EV56 y
define_bool CONFIG_ALPHA_POLARIS y
fi
if [ "$CONFIG_ALPHA_JENSEN" = "y" ]
|
