[src/netbsd-1-5]: src/sys/arch/macppc/macppc Pullup 1.82 [tsubai, mycroft]:

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

details:   https://anonhg.NetBSD.org/src/rev/d1889e4bec32
branches:  netbsd-1-5
changeset: 490075:d1889e4bec32
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Nov 01 16:13:48 2000 +0000

description:
Pullup 1.82 [tsubai, mycroft]:
Enable console in initppc().

diffstat:

 sys/arch/macppc/macppc/machdep.c |  18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diffs (39 lines):

diff -r 39a976b7957d -r d1889e4bec32 sys/arch/macppc/macppc/machdep.c
--- a/sys/arch/macppc/macppc/machdep.c  Wed Nov 01 16:01:50 2000 +0000
+++ b/sys/arch/macppc/macppc/machdep.c  Wed Nov 01 16:13:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.74 2000/06/09 10:54:48 tsubai Exp $      */
+/*     $NetBSD: machdep.c,v 1.74.2.1 2000/11/01 16:13:48 tv Exp $      */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -231,15 +231,6 @@
 
        curpm = curpcb->pcb_pmreal = curpcb->pcb_pm = pmap_kernel();
 
-#if 0
-       /*
-        * i386 port says, that this shouldn't be here,
-        * but I really think the console should be initialized
-        * as early as possible.
-        */
-       consinit();
-#endif
-
 #ifdef __notyet__              /* Needs some rethinking regarding real/virtual OFW */
        OF_set_callback(callback);
 #endif
@@ -307,6 +298,13 @@
        ofmsr &= ~PSL_IP;
 
        /*
+        * i386 port says, that this shouldn't be here,
+        * but I really think the console should be initialized
+        * as early as possible.
+        */
+       consinit();
+
+       /*
         * Parse arg string.
         */
 #ifdef DDB