[src/netbsd-1-4]: src/sys/arch/amiga/amiga Pull up revisions 1.67-1.68 (via p...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9ec7920d5712
branches:  netbsd-1-4
changeset: 470278:9ec7920d5712
user:      he <he%NetBSD.org@localhost>
date:      Fri Feb 04 23:18:48 2000 +0000

description:
Pull up revisions 1.67-1.68 (via patch, requested by is):
  Add reboot code for Phase5 68040+PPC boards.

diffstat:

 sys/arch/amiga/amiga/amiga_init.c |  23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diffs (58 lines):

diff -r 26ff19359b51 -r 9ec7920d5712 sys/arch/amiga/amiga/amiga_init.c
--- a/sys/arch/amiga/amiga/amiga_init.c Fri Feb 04 23:18:25 2000 +0000
+++ b/sys/arch/amiga/amiga/amiga_init.c Fri Feb 04 23:18:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amiga_init.c,v 1.65 1999/03/25 21:55:18 is Exp $       */
+/*     $NetBSD: amiga_init.c,v 1.65.2.1 2000/02/04 23:18:48 he Exp $   */
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -32,6 +32,7 @@
  */
 
 #include "opt_amigaccgrf.h"
+#include "opt_p5ppc68kboard.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,6 +75,9 @@
 #endif
 extern u_long boot_partition;
 vm_offset_t    amiga_uptbase;
+#ifdef P5PPC68KBOARD
+extern int     p5ppc;
+#endif
 
 extern char *esym;
 
@@ -203,6 +207,9 @@
        struct boot_memlist *ml;
        u_int loadbase = 0;     /* XXXXXXXXXXXXXXXXXXXXXXXXXXXX */
        u_int *shadow_pt = 0;   /* XXXXXXXXXXXXXXXXXXXXXXXXXXXX */
+#ifdef P5PPC68KBOARD
+        struct cfdev *cdp, *ecdp;
+#endif
 
 #ifdef DEBUG_KERNEL_START
        /* XXX this only is valid if Altais is in slot 0 */
@@ -991,6 +998,20 @@
                *a3000_magic_reset |= 0x80;
        }
 
+#ifdef P5PPC68KBOARD
+       /*
+        * Are we an P5 PPC/68K board? install different reset 
+        * routine.
+        */
+        
+        for (cdp = cfdev, ecdp = &cfdev[ncfdev]; cdp < ecdp; cdp++) {
+               if (cdp->rom.manid == 8512 &&
+                   (cdp->rom.prodid == 100 || cdp->rom.prodid == 110)) {
+                               p5ppc = 1;
+                               break;
+                       }
+        }
+#endif
 }
 
 void