patch-2.3.41 linux/arch/m68k/bvme6000/config.c

• Lines: 38
• Date: Wed Jan 26 12:44:20 2000
• Orig file: v2.3.40/linux/arch/m68k/bvme6000/config.c
• Orig date: Tue Aug 31 17:29:12 1999

diff -u --recursive --new-file v2.3.40/linux/arch/m68k/bvme6000/config.c linux/arch/m68k/bvme6000/config.c
@@ -24,6 +24,7 @@
 #include <linux/init.h>
 #include <linux/major.h>
 
+#include <asm/bootinfo.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/setup.h>
@@ -63,6 +64,15 @@
 
 static void (*tick_handler)(int, void *, struct pt_regs *);
 
+
+int bvme6000_parse_bootinfo(const struct bi_record *bi)
+{
+	if (bi->tag == BI_VME_TYPE)
+		return 0;
+	else
+		return 1;
+}
+
 int bvme6000_kbdrate (struct kbd_repeat *k)
 {
 	return 0;
@@ -107,6 +117,13 @@
 {
     volatile PitRegsPtr pit = (PitRegsPtr)BVME_PIT_BASE;
 
+    /* Board type is only set by newer versions of vmelilo/tftplilo */
+    if (!vme_brdtype) {
+	if (m68k_cputype == CPU_68060)
+	    vme_brdtype = VME_TYPE_BVME6000;
+	else
+	    vme_brdtype = VME_TYPE_BVME4000;
+    }
 #if 0
     /* Call bvme6000_set_vectors() so ABORT will work, along with BVMBug
      * debugger.  Note trap_init() will splat the abort vector, but