patch-2.3.17 linux/include/asm-m68k/setup.h

• Lines: 79
• Date: Sat Sep 4 13:06:41 1999
• Orig file: v2.3.16/linux/include/asm-m68k/setup.h
• Orig date: Sun Aug 15 11:47:29 1999

diff -u --recursive --new-file v2.3.16/linux/include/asm-m68k/setup.h linux/include/asm-m68k/setup.h
@@ -88,7 +88,9 @@
 #endif
 
 #if defined(CONFIG_SUN3)
-#  error Currently no Sun-3 support!
+#define MACH_IS_SUN3 (1)
+#define MACH_SUN3_ONLY (1)
+#define MACH_TYPE (MACH_SUN3)
 #else
 #define MACH_IS_SUN3 (0)
 #endif
@@ -243,7 +245,7 @@
 #ifndef __ASSEMBLY__
 extern unsigned long m68k_cputype;
 extern unsigned long m68k_fputype;
-extern unsigned long m68k_mmutype;			/* Not really used yet */
+extern unsigned long m68k_mmutype;		/* Not really used yet */
 
     /*
      *  m68k_is040or060 is != 0 for a '040 or higher;
@@ -255,38 +257,58 @@
 
 #if !defined(CONFIG_M68020)
 #  define CPU_IS_020 (0)
+#  define MMU_IS_851 (0)
+#  define MMU_IS_SUN3 (0)
 #elif defined(CONFIG_M68030) || defined(CONFIG_M68040) || defined(CONFIG_M68060)
 #  define CPU_IS_020 (m68k_cputype & CPU_68020)
+#  define MMU_IS_851 (m68k_cputype & MMU_68851)
+#  define MMU_IS_SUN3 (0)	/* Sun3 not supported with other CPU enabled */
 #else
 #  define CPU_M68020_ONLY
 #  define CPU_IS_020 (1)
+#ifdef MACH_SUN3_ONLY
+#  define MMU_IS_SUN3 (1)
+#  define MMU_IS_851 (0)
+#else
+#  define MMU_IS_SUN3 (0)
+#  define MMU_IS_851 (1)
+#endif
 #endif
 
 #if !defined(CONFIG_M68030)
 #  define CPU_IS_030 (0)
+#  define MMU_IS_030 (0)
 #elif defined(CONFIG_M68020) || defined(CONFIG_M68040) || defined(CONFIG_M68060)
 #  define CPU_IS_030 (m68k_cputype & CPU_68030)
+#  define MMU_IS_030 (m68k_mmutype & MMU_68030)
 #else
 #  define CPU_M68030_ONLY
 #  define CPU_IS_030 (1)
+#  define MMU_IS_030 (1)
 #endif
 
 #if !defined(CONFIG_M68040)
 #  define CPU_IS_040 (0)
+#  define MMU_IS_040 (0)
 #elif defined(CONFIG_M68020) || defined(CONFIG_M68030) || defined(CONFIG_M68060)
 #  define CPU_IS_040 (m68k_cputype & CPU_68040)
+#  define MMU_IS_040 (m68k_mmutype & MMU_68040)
 #else
 #  define CPU_M68040_ONLY
 #  define CPU_IS_040 (1)
+#  define MMU_IS_040 (1)
 #endif
 
 #if !defined(CONFIG_M68060)
 #  define CPU_IS_060 (0)
+#  define MMU_IS_060 (0)
 #elif defined(CONFIG_M68020) || defined(CONFIG_M68030) || defined(CONFIG_M68040)
 #  define CPU_IS_060 (m68k_cputype & CPU_68060)
+#  define MMU_IS_060 (m68k_mmutype & MMU_68060)
 #else
 #  define CPU_M68060_ONLY
 #  define CPU_IS_060 (1)
+#  define MMU_IS_060 (1)
 #endif
 
 #if !defined(CONFIG_M68020) && !defined(CONFIG_M68030)