Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix generic boot code

This commit is contained in:
chuck 1996-05-29 05:04:41 +00:00
parent 9f36687189
commit 24ac64b87b
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/arch/mvme68k/mvme68k/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.7 1996/05/26 20:47:39 chuck Exp $ */
/* $NetBSD: autoconf.c,v 1.8 1996/05/29 05:04:41 chuck Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -61,6 +61,8 @@
#include <sys/device.h>
#include <machine/vmparam.h>
#include <machine/autoconf.h>
#include <machine/disklabel.h>
#include <machine/cpu.h>
#include <machine/pte.h>
@ -179,6 +181,9 @@ mainbus_print(aux, cp)
*/
configure()
{
bootdv = NULL; /* set by device drivers (if found) */
init_sir();
isrinit();
@ -214,11 +219,6 @@ swapconf()
* sparc port to nuke the "options GENERIC" stuff.
*/
dev_t bootdev;
#define PARTITIONMASK 0x7
#define PARTITIONSHIFT 3
struct nam2blk {
char *name;
int maj;
@ -326,7 +326,6 @@ setroot()
char buf[128];
extern int (*mountroot) __P((void *));
dev_t temp;
struct device *bootdv;
#if defined(NFSCLIENT)
extern char *nfsbootdevname;
extern int nfs_mountroot __P((void *));
@ -335,7 +334,8 @@ setroot()
extern int ffs_mountroot __P((void *));
#endif
bootdv = NULL;
printf("boot device: %s\n",
(bootdv) ? bootdv->dv_xname : "<unknown>");
if (boothowto & RB_ASKNAME) {
for (;;) {
@ -420,7 +420,6 @@ gotswap:
if (bootdv == NULL)
panic("boot device not known");
#if 0 /* XXXCDC: fix me */
majdev = findblkmajor(bootdv);
if (majdev >= 0) {
/*
@ -428,7 +427,7 @@ gotswap:
* val[2] of the boot device is the partition number.
* Assume swap is on partition b.
*/
int part = bp->val[2];
int part = bootpart;
mindev = (bootdv->dv_unit << PARTITIONSHIFT) + part;
rootdev = makedev(majdev, mindev);
nswapdev = dumpdev = makedev(major(rootdev),
@ -441,7 +440,6 @@ gotswap:
}
swdevt[0].sw_dev = nswapdev;
swdevt[1].sw_dev = NODEV;
#endif
} else {