[src/trunk]: src/sys/arch/hp300 Recognise md as a valid root device. And sin...

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

details:   https://anonhg.NetBSD.org/src/rev/41584e5799d0
branches:  trunk
changeset: 522663:41584e5799d0
user:      gmcgarry <gmcgarry%NetBSD.org@localhost>
date:      Sat Feb 23 21:52:25 2002 +0000

description:
Recognise md as a valid root device.  And since md disks don't get
device_register()'d, don't go looking on our device list for them.
Ramdisk kernel now boot.

diffstat:

 sys/arch/hp300/conf/files.hp300 |  7 +++++--
 sys/arch/hp300/hp300/autoconf.c |  8 +++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (62 lines):

diff -r 913a67051650 -r 41584e5799d0 sys/arch/hp300/conf/files.hp300
--- a/sys/arch/hp300/conf/files.hp300   Sat Feb 23 21:48:08 2002 +0000
+++ b/sys/arch/hp300/conf/files.hp300   Sat Feb 23 21:52:25 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.hp300,v 1.54 2002/01/21 21:57:03 jdolecek Exp $
+#      $NetBSD: files.hp300,v 1.55 2002/02/23 21:52:25 gmcgarry Exp $
 #
 # hp300-specific configuration info
 
@@ -185,6 +185,10 @@
 # RAIDframe
 major  {raid = 15}
 
+# Memory Disk for ramdisk
+file   dev/md_root.c                   memory_disk_hooks
+major  {md = 14}
+
 #
 # Non-device files
 #
@@ -209,7 +213,6 @@
 file   arch/hp300/hp300/vm_machdep.c
 file   arch/hp300/hp300/disksubr.c
 file   arch/hp300/dev/dma.c
-file   dev/md_root.c                   memory_disk_hooks
 
 file   dev/clock_subr.c
 file   dev/cons.c
diff -r 913a67051650 -r 41584e5799d0 sys/arch/hp300/hp300/autoconf.c
--- a/sys/arch/hp300/hp300/autoconf.c   Sat Feb 23 21:48:08 2002 +0000
+++ b/sys/arch/hp300/hp300/autoconf.c   Sat Feb 23 21:52:25 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.53 2001/12/14 08:29:24 gmcgarry Exp $   */
+/*     $NetBSD: autoconf.c,v 1.54 2002/02/23 21:52:26 gmcgarry Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -647,8 +647,6 @@
         */
        bootdev = 0;
 
-       dd = dev_data_lookup(root_device);
-
        /*
         * If the root device is network, we're done
         * early.
@@ -665,11 +663,15 @@
                type = 2;
        else if (memcmp(root_device->dv_xname, "sd", 2) == 0)
                type = 4;
+       else if (memcmp(root_device->dv_xname, "md", 2) == 0)
+               goto out;
        else {
                printf("WARNING: strange root device!\n");
                goto out;
        }
 
+       dd = dev_data_lookup(root_device);
+
        /*
         * Get parent's info.
         */