summaryrefslogtreecommitdiffstats
path: root/sys/powerpc
diff options
context:
space:
mode:
authorgrehan <grehan@FreeBSD.org>2003-01-08 12:15:54 +0000
committergrehan <grehan@FreeBSD.org>2003-01-08 12:15:54 +0000
commitc1833e36de6b282f7fa0920e03e6d56c02c0a22b (patch)
tree427030a202f2ac58023cf7050ded1a775da88b33 /sys/powerpc
parent81e5fd7cd2d1bbaf727c7254f5de5c2916630935 (diff)
downloadFreeBSD-src-c1833e36de6b282f7fa0920e03e6d56c02c0a22b.zip
FreeBSD-src-c1833e36de6b282f7fa0920e03e6d56c02c0a22b.tar.gz
Remove obsolete NFS_ROOT conditional.
Approved by: benno
Diffstat (limited to 'sys/powerpc')
-rw-r--r--sys/powerpc/powerpc/autoconf.c26
1 files changed, 3 insertions, 23 deletions
diff --git a/sys/powerpc/powerpc/autoconf.c b/sys/powerpc/powerpc/autoconf.c
index 6bafc11..3ec54e3 100644
--- a/sys/powerpc/powerpc/autoconf.c
+++ b/sys/powerpc/powerpc/autoconf.c
@@ -29,35 +29,16 @@ static const char rcsid[] =
"$FreeBSD$";
#endif
-#include "opt_bootp.h"
-#include "opt_nfs.h"
-#include "opt_nfsroot.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/cons.h>
#include <sys/kernel.h>
+static device_t nexusdev;
+
static void configure(void *);
SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL)
-#ifdef NFS_ROOT
-SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL)
-
-#ifndef BOOTP_NFSROOT
-#error "NFS_ROOT support not implemented for the non-BOOTP_NFSROOT case"
-#endif
-
-extern void bootpc_init(void);
-
-void
-cpu_rootconf()
-{
-
- bootpc_init();
- rootdevnames[0] = "nfs:";
-}
-#endif
/*
* Determine i/o configuration for a machine.
@@ -65,8 +46,7 @@ cpu_rootconf()
static void
configure(void *dummy)
{
- device_add_child(root_bus, "nexus", 0);
-
+ nexusdev = device_add_child(root_bus, "nexus", 0);
root_bus_configure();
/*
OpenPOWER on IntegriCloud