patch-2.3.99-pre7 linux/arch/ppc/config.in

• Lines: 72
• Date: Tue May 2 13:05:39 2000
• Orig file: v2.3.99-pre6/linux/arch/ppc/config.in
• Orig date: Tue Apr 11 15:09:13 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/arch/ppc/config.in linux/arch/ppc/config.in
@@ -18,9 +18,14 @@
 	"6xx/7xx/7400		CONFIG_6xx	\
 	 4xx			CONFIG_4xx	\
 	 630/Power3(64-Bit)	CONFIG_PPC64	\
-	 82xx			CONFIG_82xx	\
+	 8260			CONFIG_8260	\
 	 8xx			CONFIG_8xx"	6xx
 
+if [ "$CONFIG_8260" = "y" ]; then
+  define_bool CONFIG_6xx y
+  define_bool CONFIG_SERIAL_CONSOLE y
+fi
+
 if [ "$CONFIG_4xx" = "y" ]; then
     choice 'Machine Type'			\
 	"Oak			CONFIG_OAK 	\
@@ -49,6 +54,7 @@
   choice 'Machine Type'		\
 	"PowerMac/PReP/MTX/CHRP	CONFIG_ALL_PPC	\
 	 Gemini		CONFIG_GEMINI		\
+	 EST8260	CONFIG_EST8260		\
 	 APUS		CONFIG_APUS"		PowerMac/PReP/MTX/CHRP
 fi
 
@@ -56,6 +62,10 @@
   define_bool CONFIG_ALL_PPC y
 fi
 
+if [ "$CONFIG_8xx" = "y" -o "$CONFIG_8260" = "y" ]; then
+  define_bool CONFIG_ALL_PPC n
+fi
+
 bool 'Symmetric multi-processing support' CONFIG_SMP
 if [ "$CONFIG_6xx" = "y" ];then
   bool 'AltiVec Support' CONFIG_ALTIVEC
@@ -86,7 +96,7 @@
 define_bool CONFIG_SBUS n
 
 if [ "$CONFIG_APUS" = "y" -o "$CONFIG_4xx" = "y" -o \
-     "$CONFIG_82xx" = "y" ]; then
+     "$CONFIG_8260" = "y" ]; then
    define_bool CONFIG_PCI n
 else
    if [ "$CONFIG_6xx" = "y" -o "$CONFIG_PPC64" = "y" ]; then
@@ -144,7 +154,6 @@
      bool 'Support for ADB mouse' CONFIG_ADBMOUSE
   fi
   bool 'Support for Open Firmware device tree in /proc' CONFIG_PROC_DEVICETREE
-  bool 'Support for TotalImpact TotalMP' CONFIG_TOTALMP
   bool 'Support for early boot text console (BootX only)' CONFIG_BOOTX_TEXT
   bool 'Support for Motorola Hot Swap' CONFIG_MOTOROLA_HOTSWAP
 fi
@@ -226,6 +235,8 @@
 
 source net/ax25/Config.in
 
+source net/irda/Config.in
+
 mainmenu_option next_comment
 comment 'ISDN subsystem'
 
@@ -264,6 +275,10 @@
 
 if [ "$CONFIG_8xx" = "y" ]; then
 source arch/ppc/8xx_io/Config.in
+fi
+
+if [ "$CONFIG_8260" = "y" ]; then
+source arch/ppc/8260_io/Config.in
 fi
 
 source drivers/usb/Config.in