diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2001-01-29 03:59:06 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2001-01-29 03:59:06 +0000 |
| commit | ce4bd0a82dae2c504f34ed1cd89a9877c98ccba1 (patch) | |
| tree | ea70dcab57b185cd9f33d580392515feb6db453e | |
| parent | f27d2d7c493aa0d7e48d4e8f700807846f4c7c13 (diff) | |
bring sparc into the 20th century, add support for 'boot -c' (BOOT_CONFIG)
| -rw-r--r-- | sys/arch/sparc/sparc/autoconf.c | 14 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/common/promdev.c | 9 |
2 files changed, 19 insertions, 4 deletions
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 038a3d4813b..a0075fef890 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.36 2000/07/25 18:03:03 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.37 2001/01/29 03:59:05 jason Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -457,6 +457,10 @@ bootpath_build() boothowto |= RB_DFLTROOT; break; + case 'c': + boothowto |= RB_CONFIG; + break; + case 'd': /* kgdb - always on zs XXX */ #ifdef KGDB boothowto |= RB_KDB; /* XXX unused */ @@ -794,6 +798,14 @@ configure() /* build the bootpath */ bootpath_build(); + if (boothowto & RB_CONFIG) { +#ifdef BOOT_CONFIG + user_config(); +#else + printf("kernel does not support -c; continuing..\n"); +#endif + } + #if defined(SUN4) if (CPU_ISSUN4) { extern struct cfdata cfdata[]; diff --git a/sys/arch/sparc/stand/common/promdev.c b/sys/arch/sparc/stand/common/promdev.c index b9a56663ba4..15f4c412b61 100644 --- a/sys/arch/sparc/stand/common/promdev.c +++ b/sys/arch/sparc/stand/common/promdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: promdev.c,v 1.2 1999/01/11 05:12:00 millert Exp $ */ +/* $OpenBSD: promdev.c,v 1.3 2001/01/29 03:59:05 jason Exp $ */ /* $NetBSD: promdev.c,v 1.16 1995/11/14 15:04:01 pk Exp $ */ /* @@ -136,13 +136,16 @@ prom_init() case 'a': prom_boothow |= RB_ASKNAME; break; - case 's': - prom_boothow |= RB_SINGLE; + case 'c': + prom_boothow |= RB_CONFIG; break; case 'd': prom_boothow |= RB_KDB; debug = 1; break; + case 's': + prom_boothow |= RB_SINGLE; + break; } } #endif |