Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/sys pullup from trunk (approved by thorpej):
details: https://anonhg.NetBSD.org/src/rev/5ca3f11986da
branches: netbsd-1-5
changeset: 489092:5ca3f11986da
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Sun Aug 13 09:09:26 2000 +0000
description:
pullup from trunk (approved by thorpej):
retire RB_DFLTROOT, it's no longer used
revisions pulled up:
arch/i386/stand/lib/netbsd_opts.c 1.3
arch/i386/stand/biosboot/main.c 1.23
arch/i386/stand/dosboot/main.c 1.15
arch/i386/stand/netboot/main.c 1.6
arch/arc/arc/machdep.c 1.42
arch/bebox/stand/boot/boot.c 1.11
arch/hpcmips/hpcmips/machdep.c 1.32
arch/newsmips/newsmips/machdep.c 1.45
arch/pc532/stand/boot/boot.c 1.2
arch/pmax/pmax/machdep.c 1.178
arch/prep/stand/boot/boot.c 1.2
arch/sparc/sparc/autoconf.c 1.141
arch/sparc64/sparc64/autoconf.c 1.38
arch/x68k/stand/loadbsd/loadbsd.c 1.5
arch/mvme68k/stand/libsa/parse_args.c 1.6
compat/osf1/osf1_cvt.c 1.9
sys/reboot.h 1.17
diffstat:
sys/arch/arc/arc/machdep.c | 12 +++---------
sys/arch/bebox/stand/boot/boot.c | 4 +---
sys/arch/hpcmips/hpcmips/machdep.c | 8 +++-----
sys/arch/i386/stand/biosboot/main.c | 4 ++--
sys/arch/i386/stand/dosboot/main.c | 4 ++--
sys/arch/i386/stand/lib/netbsd_opts.c | 3 +--
sys/arch/i386/stand/netboot/main.c | 4 ++--
sys/arch/mvme68k/stand/libsa/parse_args.c | 3 +--
sys/arch/newsmips/newsmips/machdep.c | 8 +++-----
sys/arch/pc532/stand/boot/boot.c | 7 ++-----
sys/arch/pmax/pmax/machdep.c | 8 +++-----
sys/arch/prep/stand/boot/boot.c | 4 +---
sys/arch/sparc/sparc/autoconf.c | 6 +-----
sys/arch/sparc64/sparc64/autoconf.c | 6 +-----
sys/arch/x68k/stand/loadbsd/loadbsd.c | 11 +++--------
sys/compat/osf1/osf1_cvt.c | 4 ++--
sys/sys/reboot.h | 4 ++--
17 files changed, 33 insertions(+), 67 deletions(-)
diffs (truncated from 401 to 300 lines):
diff -r a874a32c878c -r 5ca3f11986da sys/arch/arc/arc/machdep.c
--- a/sys/arch/arc/arc/machdep.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/arc/arc/machdep.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.39.2.1 2000/08/10 22:07:47 soda Exp $ */
+/* $NetBSD: machdep.c,v 1.39.2.2 2000/08/13 09:09:27 jdolecek Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -521,7 +521,7 @@
* SINGLE and DFLTROOT if this is a ramdisk kernel.
*/
#ifdef MEMORY_DISK_HOOKS
- boothowto = RB_SINGLE | RB_DFLTROOT;
+ boothowto = RB_SINGLE;
#else
boothowto = RB_SINGLE | RB_ASKNAME;
#endif /* MEMORY_DISK_HOOKS */
@@ -537,10 +537,6 @@
boothowto &= ~RB_SINGLE;
break;
- case 'd': /* use compiled in default root */
- boothowto |= RB_DFLTROOT;
- break;
-
case 'm': /* mini root present in memory */
boothowto |= RB_MINIROOT;
break;
@@ -630,10 +626,8 @@
* Check to see if a mini-root was loaded into memory. It resides
* at the start of the next page just after the end of BSS.
*/
- if (boothowto & RB_MINIROOT) {
- boothowto |= RB_DFLTROOT;
+ if (boothowto & RB_MINIROOT)
kernend += round_page(mfs_initminiroot(kernend));
- }
#endif
#ifdef DDB
diff -r a874a32c878c -r 5ca3f11986da sys/arch/bebox/stand/boot/boot.c
--- a/sys/arch/bebox/stand/boot/boot.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/bebox/stand/boot/boot.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.10 1999/06/28 01:35:11 sakamoto Exp $ */
+/* $NetBSD: boot.c,v 1.10.12.1 2000/08/13 09:09:28 jdolecek Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -177,8 +177,6 @@
howto |= RB_HALT;
else if (c == 'd')
howto |= RB_KDB;
- else if (c == 'r')
- howto |= RB_DFLTROOT;
else if (c == 's')
howto |= RB_SINGLE;
}
diff -r a874a32c878c -r 5ca3f11986da sys/arch/hpcmips/hpcmips/machdep.c
--- a/sys/arch/hpcmips/hpcmips/machdep.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/hpcmips/hpcmips/machdep.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.26.4.1 2000/07/19 00:25:26 jeffs Exp $ */
+/* $NetBSD: machdep.c,v 1.26.4.2 2000/08/13 09:09:28 jdolecek Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.26.4.1 2000/07/19 00:25:26 jeffs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.26.4.2 2000/08/13 09:09:28 jdolecek Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
#include "opt_vr41x1.h"
@@ -362,10 +362,8 @@
* Check to see if a mini-root was loaded into memory. It resides
* at the start of the next page just after the end of BSS.
*/
- if (boothowto & RB_MINIROOT) {
- boothowto |= RB_DFLTROOT;
+ if (boothowto & RB_MINIROOT)
kernend += round_page(mfs_initminiroot(kernend));
- }
#endif
#ifdef DDB
diff -r a874a32c878c -r 5ca3f11986da sys/arch/i386/stand/biosboot/main.c
--- a/sys/arch/i386/stand/biosboot/main.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/i386/stand/biosboot/main.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.22 2000/05/21 16:33:12 jhawk Exp $ */
+/* $NetBSD: main.c,v 1.22.4.1 2000/08/13 09:09:26 jdolecek Exp $ */
/*
* Copyright (c) 1996, 1997, 1999
@@ -292,7 +292,7 @@
{
printf("commands are:\n"
- "boot [xdNx:][filename] [-adrs]\n"
+ "boot [xdNx:][filename] [-ads]\n"
" (ex. \"sd0a:netbsd.old -s\"\n"
"ls [path]\n"
"dev xd[N[x]]:\n"
diff -r a874a32c878c -r 5ca3f11986da sys/arch/i386/stand/dosboot/main.c
--- a/sys/arch/i386/stand/dosboot/main.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/i386/stand/dosboot/main.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.14 2000/03/13 10:51:22 martin Exp $ */
+/* $NetBSD: main.c,v 1.14.6.1 2000/08/13 09:09:27 jdolecek Exp $ */
/*
* Copyright (c) 1996, 1997
@@ -314,7 +314,7 @@
char *arg;
{
printf("commands are:\n"
- "boot [xdNx:][filename] [-adrs]\n"
+ "boot [xdNx:][filename] [-ads]\n"
" (ex. \"sd0a:netbsd.old -s\"\n"
"ls [path]\n"
"mode ufs|dos\n"
diff -r a874a32c878c -r 5ca3f11986da sys/arch/i386/stand/lib/netbsd_opts.c
--- a/sys/arch/i386/stand/lib/netbsd_opts.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/i386/stand/lib/netbsd_opts.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd_opts.c,v 1.2 1997/03/14 06:55:07 thorpej Exp $ */
+/* $NetBSD: netbsd_opts.c,v 1.2.34.1 2000/08/13 09:09:26 jdolecek Exp $ */
/*
* Copyright (c) 1996
@@ -49,7 +49,6 @@
} opttab[] = {
{'a', RB_ASKNAME},
{'s', RB_SINGLE},
- {'r', RB_DFLTROOT},
{'d', RB_KDB},
};
diff -r a874a32c878c -r 5ca3f11986da sys/arch/i386/stand/netboot/main.c
--- a/sys/arch/i386/stand/netboot/main.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/i386/stand/netboot/main.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.5 1997/09/17 18:52:41 drochner Exp $ */
+/* $NetBSD: main.c,v 1.5.28.1 2000/08/13 09:09:27 jdolecek Exp $ */
/*
* Copyright (c) 1996
@@ -137,7 +137,7 @@
char *arg;
{
printf("commands are:\n"
- "boot [filename] [-adrs]\n"
+ "boot [filename] [-ads]\n"
" (ex. \"netbsd.old -s\"\n"
"help|?\n"
"quit\n");
diff -r a874a32c878c -r 5ca3f11986da sys/arch/mvme68k/stand/libsa/parse_args.c
--- a/sys/arch/mvme68k/stand/libsa/parse_args.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/mvme68k/stand/libsa/parse_args.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: parse_args.c,v 1.2 1997/12/17 21:33:10 scw Exp $ */
+/* $NetBSD: parse_args.c,v 1.2.28.1 2000/08/13 09:09:30 jdolecek Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
@@ -51,7 +51,6 @@
{ 'y', RB_NOSYM },
{ 'd', RB_KDB },
{ 'm', RB_MINIROOT },
- { 'r', RB_DFLTROOT },
{ 's', RB_SINGLE },
};
diff -r a874a32c878c -r 5ca3f11986da sys/arch/newsmips/newsmips/machdep.c
--- a/sys/arch/newsmips/newsmips/machdep.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/newsmips/newsmips/machdep.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.41.4.1 2000/07/19 00:25:26 jeffs Exp $ */
+/* $NetBSD: machdep.c,v 1.41.4.2 2000/08/13 09:09:28 jdolecek Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.41.4.1 2000/07/19 00:25:26 jeffs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.41.4.2 2000/08/13 09:09:28 jdolecek Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -289,10 +289,8 @@
* Check to see if a mini-root was loaded into memory. It resides
* at the start of the next page just after the end of BSS.
*/
- if (boothowto & RB_MINIROOT) {
- boothowto |= RB_DFLTROOT;
+ if (boothowto & RB_MINIROOT)
kernend += round_page(mfs_initminiroot(kernend));
- }
#endif
/*
diff -r a874a32c878c -r 5ca3f11986da sys/arch/pc532/stand/boot/boot.c
--- a/sys/arch/pc532/stand/boot/boot.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/pc532/stand/boot/boot.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.1 1997/05/17 13:56:01 matthias Exp $ */
+/* $NetBSD: boot.c,v 1.1.32.1 2000/08/13 09:09:28 jdolecek Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993
@@ -107,7 +107,7 @@
{
char c, *ptr = line;
- printf("Boot: [[[%s%d%c:]%s][-abdrs]] :- ",
+ printf("Boot: [[[%s%d%c:]%s][-abds]] :- ",
devsw[bdev].dv_name, bctlr + (8 * badapt), 'a' + bpart, name);
if (tgets(line)) {
@@ -128,9 +128,6 @@
case 'd':
*howto |= RB_KDB;
continue;
- case 'r':
- *howto |= RB_DFLTROOT;
- continue;
case 's':
*howto |= RB_SINGLE;
continue;
diff -r a874a32c878c -r 5ca3f11986da sys/arch/pmax/pmax/machdep.c
--- a/sys/arch/pmax/pmax/machdep.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/pmax/pmax/machdep.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.173.2.2 2000/07/19 00:25:26 jeffs Exp $ */
+/* $NetBSD: machdep.c,v 1.173.2.3 2000/08/13 09:09:28 jdolecek Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.173.2.2 2000/07/19 00:25:26 jeffs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.173.2.3 2000/08/13 09:09:28 jdolecek Exp $");
#include "fs_mfs.h"
#include "opt_ddb.h"
@@ -290,10 +290,8 @@
* Check to see if a mini-root was loaded into memory. It resides
* at the start of the next page just after the end of BSS.
*/
- if (boothowto & RB_MINIROOT) {
- boothowto |= RB_DFLTROOT;
+ if (boothowto & RB_MINIROOT)
kernend += round_page(mfs_initminiroot(kernend));
- }
#endif
#ifdef DDB
diff -r a874a32c878c -r 5ca3f11986da sys/arch/prep/stand/boot/boot.c
--- a/sys/arch/prep/stand/boot/boot.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/prep/stand/boot/boot.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.1 2000/02/29 15:21:48 nonaka Exp $ */
+/* $NetBSD: boot.c,v 1.1.4.1 2000/08/13 09:09:29 jdolecek Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -185,8 +185,6 @@
howto |= RB_HALT;
else if (c == 'd')
howto |= RB_KDB;
- else if (c == 'r')
- howto |= RB_DFLTROOT;
else if (c == 's')
howto |= RB_SINGLE;
}
diff -r a874a32c878c -r 5ca3f11986da sys/arch/sparc/sparc/autoconf.c
--- a/sys/arch/sparc/sparc/autoconf.c Sun Aug 13 08:46:32 2000 +0000
+++ b/sys/arch/sparc/sparc/autoconf.c Sun Aug 13 09:09:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.139 2000/06/09 10:47:25 pk Exp $ */
+/* $NetBSD: autoconf.c,v 1.139.2.1 2000/08/13 09:09:29 jdolecek Exp $ */
/*
* Copyright (c) 1996
@@ -415,10 +415,6 @@
boothowto |= RB_ASKNAME;
break;
- case 'b':
- boothowto |= RB_DFLTROOT;
- break;
-
Home |
Main Index |
Thread Index |
Old Index