Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Rename MEMORY_DISK_SIZE (formerly MINIROOTSIZE) to MEMORY_DI...
details: https://anonhg.NetBSD.org/src/rev/60de65f7ebd4
branches: trunk
changeset: 524908:60de65f7ebd4
user: lukem <lukem%NetBSD.org@localhost>
date: Tue Apr 02 05:30:34 2002 +0000
description:
Rename MEMORY_DISK_SIZE (formerly MINIROOTSIZE) to MEMORY_DISK_ROOT_SIZE,
which was suggested by Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost> as
being more consistent with what it's controlling...
diffstat:
share/man/man4/options.4 | 4 ++--
sys/arch/acorn26/conf/FOURMEG | 4 ++--
sys/arch/acorn26/conf/GENERIC | 4 ++--
sys/arch/acorn32/conf/GENERIC | 6 +++---
sys/arch/acorn32/conf/INSTALL | 6 +++---
sys/arch/acorn32/conf/LOWMEM_WSCONS | 4 ++--
sys/arch/acorn32/conf/NC | 4 ++--
sys/arch/acorn32/conf/NC_WSCONS | 4 ++--
sys/arch/acorn32/conf/RPC_WSCONS | 6 +++---
sys/arch/acorn32/dev/md_hooks.c | 18 +++++++++---------
sys/arch/alpha/conf/INSTALL | 4 ++--
sys/arch/alpha/conf/RAMDISK | 4 ++--
sys/arch/amiga/conf/MDINSTALL | 4 ++--
sys/arch/amiga/conf/RAMDISK | 4 ++--
sys/arch/arc/conf/RAMDISK | 4 ++--
sys/arch/arm/arm32/arm32_machdep.c | 10 +++++-----
sys/arch/bebox/conf/INSTALL | 4 ++--
sys/arch/cats/conf/GENERIC | 4 ++--
sys/arch/cats/conf/INSTALL | 4 ++--
sys/arch/dreamcast/conf/GENERIC | 6 +++---
sys/arch/evbarm/conf/INTEGRATOR | 4 ++--
sys/arch/evbarm/conf/IQ80310 | 4 ++--
sys/arch/evbarm/conf/IQ80321 | 5 ++---
sys/arch/evbarm/conf/TEAMASA_NPWR | 4 ++--
sys/arch/evbmips/conf/MALTA | 8 ++++----
sys/arch/evbsh3/conf/COMPUTEX7750 | 4 ++--
sys/arch/evbsh3/conf/COMPUTEXEVB | 4 ++--
sys/arch/evbsh3/conf/CQREEKSH3 | 4 ++--
sys/arch/evbsh3/conf/KZSH401 | 4 ++--
sys/arch/hp300/conf/RAMDISK | 4 ++--
sys/arch/hpcarm/conf/IPAQ | 4 ++--
sys/arch/hpcarm/conf/JORNADA720 | 6 +++---
sys/arch/hpcmips/conf/INSTALL_TX3912 | 4 ++--
sys/arch/hpcmips/conf/RAMDISK | 4 ++--
sys/arch/hpcmips/conf/TX3912 | 6 +++---
sys/arch/i386/conf/INSTALL | 6 +++---
sys/arch/i386/conf/INSTALL_LAPTOP | 6 +++---
sys/arch/i386/conf/INSTALL_PS2 | 4 ++--
sys/arch/i386/conf/INSTALL_SMALL | 4 ++--
sys/arch/i386/conf/INSTALL_TINY | 4 ++--
sys/arch/mac68k/conf/INSTALL | 4 ++--
sys/arch/mac68k/conf/INSTALLSBC | 4 ++--
sys/arch/mac68k/conf/RAMDISK | 4 ++--
sys/arch/macppc/conf/GENERIC_MD | 4 ++--
sys/arch/macppc/conf/INSTALL | 4 ++--
sys/arch/mipsco/conf/RAMDISK | 4 ++--
sys/arch/mmeye/conf/GENERIC | 6 +++---
sys/arch/mmeye/conf/MMEYE | 4 ++--
sys/arch/mmeye/conf/MMTA | 4 ++--
sys/arch/mmeye/conf/MMTAICE | 4 ++--
sys/arch/mmeye/conf/MMTANEW | 4 ++--
sys/arch/mmeye/conf/MMTAROMNEW | 4 ++--
sys/arch/mvme68k/conf/RAMDISK | 4 ++--
sys/arch/netwinder/conf/GENERIC | 4 ++--
sys/arch/news68k/conf/INSTALL | 4 ++--
sys/arch/newsmips/conf/INSTALL | 4 ++--
sys/arch/next68k/conf/RAMDISK | 4 ++--
sys/arch/pc532/conf/INSTALL | 4 ++--
sys/arch/playstation2/conf/RAMDISK | 4 ++--
sys/arch/pmax/conf/RAMDISK | 6 +++---
sys/arch/prep/conf/INSTALL | 4 ++--
sys/arch/sandpoint/conf/INSTALL | 4 ++--
sys/arch/sandpoint/conf/RAMDISK | 4 ++--
sys/arch/sgimips/conf/INDY | 4 ++--
sys/arch/shark/conf/GENERIC | 6 +++---
sys/arch/shark/conf/INSTALL | 4 ++--
sys/arch/shark/conf/OFWGENCFG | 4 ++--
sys/arch/sparc/conf/INSTALL | 4 ++--
sys/arch/sparc64/conf/INSTALL | 6 +++---
sys/arch/sun2/conf/RAMDISK | 4 ++--
sys/arch/sun3/conf/RAMDISK | 4 ++--
sys/arch/sun3/conf/RAMDISK3X | 4 ++--
sys/arch/vax/conf/INSTALL | 4 ++--
sys/arch/walnut/conf/WALNUT | 5 ++---
sys/arch/x68k/conf/INSTALL | 10 +++++-----
sys/arch/x86_64/conf/SIMICS | 6 +++---
sys/arch/x86_64/x86_64/md_root.c | 8 ++++----
sys/conf/files | 4 ++--
sys/dev/md_root.c | 10 +++++-----
79 files changed, 191 insertions(+), 193 deletions(-)
diffs (truncated from 1598 to 300 lines):
diff -r b68cd8df9a65 -r 60de65f7ebd4 share/man/man4/options.4
--- a/share/man/man4/options.4 Tue Apr 02 05:24:59 2002 +0000
+++ b/share/man/man4/options.4 Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.166 2002/03/23 09:56:58 jdolecek Exp $
+.\" $NetBSD: options.4,v 1.167 2002/04/02 05:30:34 lukem Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@@ -811,7 +811,7 @@
disk to be the root device.
This can only be overridden when
the kernel is booted in the 'ask-for-root' mode.
-.It Cd options MEMORY_DISK_SIZE=integer
+.It Cd options MEMORY_DISK_ROOT_SIZE=integer
Allocates the given number of 512 byte blocks as memory for the
.Xr md 4
.Tn RAM
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/acorn26/conf/FOURMEG
--- a/sys/arch/acorn26/conf/FOURMEG Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/acorn26/conf/FOURMEG Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FOURMEG,v 1.3 2002/03/29 19:15:17 bjh21 Exp $
+# $NetBSD: FOURMEG,v 1.4 2002/04/02 05:30:36 lukem Exp $
# FOURMEG arm26 configuration -- something small
@@ -187,7 +187,7 @@
pseudo-device loop 1
pseudo-device md 1
#options MEMORY_DISK_HOOKS
-#options MEMORY_DISK_SIZE=
+#options MEMORY_DISK_ROOT_SIZE=
#pseudo-device ppp 4
pseudo-device pty
#pseudo-device sl 4
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/acorn26/conf/GENERIC
--- a/sys/arch/acorn26/conf/GENERIC Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/acorn26/conf/GENERIC Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1 2002/03/24 15:46:50 bjh21 Exp $
+# $NetBSD: GENERIC,v 1.2 2002/04/02 05:30:36 lukem Exp $
#
# GENERIC machine description file
#
@@ -208,7 +208,7 @@
pseudo-device loop 1
pseudo-device md 1
#options MEMORY_DISK_HOOKS
-#options MEMORY_DISK_SIZE=
+#options MEMORY_DISK_ROOT_SIZE=
pseudo-device ppp 4
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
pseudo-device pty # pseudo-terminals
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/acorn32/conf/GENERIC Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.12 2002/03/10 19:56:37 lukem Exp $
+# $NetBSD: GENERIC,v 1.13 2002/04/02 05:30:36 lukem Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -20,7 +20,7 @@
include "arch/acorn32/conf/std.acorn32"
-#ident "GENERIC-$Revision: 1.12 $"
+#ident "GENERIC-$Revision: 1.13 $"
# estimated number of users
maxusers 32
@@ -119,7 +119,7 @@
# Device options
options MEMORY_DISK_HOOKS # boottime setup of ramdisk
-#options MEMORY_DISK_SIZE=4100 # Size in blocks
+#options MEMORY_DISK_ROOT_SIZE=4100 # Size in blocks
#options MEMORY_DISK_IS_ROOT # use memory disk as root
# Miscellaneous kernel options
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/acorn32/conf/INSTALL
--- a/sys/arch/acorn32/conf/INSTALL Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/acorn32/conf/INSTALL Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.6 2002/03/12 12:52:11 reinoud Exp $
+# $NetBSD: INSTALL,v 1.7 2002/04/02 05:30:36 lukem Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@@ -20,7 +20,7 @@
include "arch/acorn32/conf/std.acorn32"
-#ident "INSTALL-$Revision: 1.6 $"
+#ident "INSTALL-$Revision: 1.7 $"
# estimated number of users
maxusers 32
@@ -119,7 +119,7 @@
# Device options
options MEMORY_DISK_HOOKS # boottime setup of ramdisk
-options MEMORY_DISK_SIZE=4100 # Size in blocks
+options MEMORY_DISK_ROOT_SIZE=4100 # Size in blocks
options MEMORY_DISK_IS_ROOT # use memory disk as root
# Miscellaneous kernel options
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/acorn32/conf/LOWMEM_WSCONS
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: LOWMEM_WSCONS,v 1.8 2002/03/10 19:56:38 lukem Exp $
+# $NetBSD: LOWMEM_WSCONS,v 1.9 2002/04/02 05:30:37 lukem Exp $
#
# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
#
@@ -99,7 +99,7 @@
# Device options
options MEMORY_DISK_HOOKS # boottime setup of ramdisk
-#options MEMORY_DISK_SIZE=3400 # Size in blocks
+#options MEMORY_DISK_ROOT_SIZE=3400 # Size in blocks
#options MEMORY_DISK_IS_ROOT # use memory disk as root
# Miscellaneous kernel options
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/acorn32/conf/NC
--- a/sys/arch/acorn32/conf/NC Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/acorn32/conf/NC Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NC,v 1.7 2002/03/10 19:56:38 lukem Exp $
+# $NetBSD: NC,v 1.8 2002/04/02 05:30:37 lukem Exp $
#
# NC - with vidcconsole
#
@@ -94,7 +94,7 @@
# Device options
options MEMORY_DISK_HOOKS # boottime setup of ramdisk
-#options MEMORY_DISK_SIZE=3400 # Size in blocks
+#options MEMORY_DISK_ROOT_SIZE=3400 # Size in blocks
#options MEMORY_DISK_IS_ROOT # use memory disk as root
# Miscellaneous kernel options
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/acorn32/conf/NC_WSCONS
--- a/sys/arch/acorn32/conf/NC_WSCONS Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/acorn32/conf/NC_WSCONS Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NC_WSCONS,v 1.9 2002/03/10 19:56:38 lukem Exp $
+# $NetBSD: NC_WSCONS,v 1.10 2002/04/02 05:30:37 lukem Exp $
#
# NC - with wscons
#
@@ -96,7 +96,7 @@
# Device options
options MEMORY_DISK_HOOKS # boottime setup of ramdisk
-#options MEMORY_DISK_SIZE=3400 # Size in blocks
+#options MEMORY_DISK_ROOT_SIZE=3400 # Size in blocks
#options MEMORY_DISK_IS_ROOT # use memory disk as root
# Miscellaneous kernel options
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/acorn32/conf/RPC_WSCONS
--- a/sys/arch/acorn32/conf/RPC_WSCONS Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/acorn32/conf/RPC_WSCONS Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: RPC_WSCONS,v 1.10 2002/03/10 19:56:38 lukem Exp $
+# $NetBSD: RPC_WSCONS,v 1.11 2002/04/02 05:30:37 lukem Exp $
#
# RPC_WSCONS -- Full RiscPC config with wscons
#
@@ -20,7 +20,7 @@
include "arch/acorn32/conf/std.acorn32"
-#ident "GENERIC-$Revision: 1.10 $"
+#ident "GENERIC-$Revision: 1.11 $"
# estimated number of users
maxusers 32
@@ -119,7 +119,7 @@
# Device options
options MEMORY_DISK_HOOKS # boottime setup of ramdisk
-#options MEMORY_DISK_SIZE=3800 # Size in blocks
+#options MEMORY_DISK_ROOT_SIZE=3800 # Size in blocks
#options MEMORY_DISK_IS_ROOT # use memory disk as root
# Miscellaneous kernel options
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/acorn32/dev/md_hooks.c
--- a/sys/arch/acorn32/dev/md_hooks.c Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/acorn32/dev/md_hooks.c Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md_hooks.c,v 1.2 2002/03/10 19:53:25 lukem Exp $ */
+/* $NetBSD: md_hooks.c,v 1.3 2002/04/02 05:30:37 lukem Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -38,8 +38,8 @@
#include <dev/md.h>
-#ifdef MEMORY_DISK_SIZE
-#define ROOTBYTES (MEMORY_DISK_SIZE << DEV_BSHIFT)
+#ifdef MEMORY_DISK_ROOT_SIZE
+#define ROOTBYTES (MEMORY_DISK_ROOT_SIZE << DEV_BSHIFT)
/*
* This array will be patched to contain a file-system image.
@@ -48,7 +48,7 @@
int md_root_size = ROOTBYTES;
char md_root_image[ROOTBYTES] = "|This is the root ramdisk!\n";
-#else /* MEMORY_DISK_SIZE */
+#else /* MEMORY_DISK_ROOT_SIZE */
u_int memory_disc_size = 0; /* set by machdep.c */
static struct md_conf *bootmd = NULL;
@@ -56,7 +56,7 @@
extern int load_memory_disc_from_floppy __P((struct md_conf *md, dev_t dev));
#include "fdc.h"
-#endif /* MEMORY_DISK_SIZE */
+#endif /* MEMORY_DISK_ROOT_SIZE */
void
md_attach_hook(unit, md)
@@ -64,12 +64,12 @@
struct md_conf *md;
{
if (unit == 0) {
-#ifdef MEMORY_DISK_SIZE
+#ifdef MEMORY_DISK_ROOT_SIZE
/* Setup root ramdisk */
md->md_addr = (caddr_t) md_root_image;
md->md_size = (size_t) md_root_size;
md->md_type = MD_KMEM_FIXED;
-#else /* MEMORY_DISK_SIZE */
+#else /* MEMORY_DISK_ROOT_SIZE */
#ifdef OLD_MEMORY_DISK_SIZE
if (memory_disc_size == 0 && OLD_MEMORY_DISK_SIZE)
memory_disc_size = (OLD_MEMORY_DISK_SIZE << DEV_BSHIFT);
@@ -80,7 +80,7 @@
md->md_type = MD_KMEM_FIXED;
bootmd = md;
}
-#endif /* MEMORY_DISK_SIZE */
+#endif /* MEMORY_DISK_ROOT_SIZE */
printf("md%d: allocated %ldK (%ld blocks)\n", unit, (long)md->md_size / 1024, (long)md->md_size / DEV_BSIZE);
}
}
@@ -98,7 +98,7 @@
if (unit == 0) {
/* The root memory disk only works single-user. */
boothowto |= RB_SINGLE;
-#if !defined(MEMORY_DISK_SIZE) && NFDC > 0
+#if !defined(MEMORY_DISK_ROOT_SIZE) && NFDC > 0
load_memory_disc_from_floppy(bootmd, makedev(17, 1)); /* XXX 1.44MB FD */
#endif
}
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/alpha/conf/INSTALL
--- a/sys/arch/alpha/conf/INSTALL Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/alpha/conf/INSTALL Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.60 2002/03/10 19:56:38 lukem Exp $
+# $NetBSD: INSTALL,v 1.61 2002/04/02 05:30:37 lukem Exp $
#
# Alpha INSTALL kernel.
@@ -14,7 +14,7 @@
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-options MEMORY_DISK_SIZE=9300 # 4 Megabytes
+options MEMORY_DISK_ROOT_SIZE=9300 # 4 Megabytes
# CPU Support
options DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150)
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/alpha/conf/RAMDISK
--- a/sys/arch/alpha/conf/RAMDISK Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/alpha/conf/RAMDISK Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.15 2002/03/10 19:56:38 lukem Exp $
+# $NetBSD: RAMDISK,v 1.16 2002/04/02 05:30:38 lukem Exp $
#
# Generic Alpha kernel with built-in RAM disk image.
@@ -7,4 +7,4 @@
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-options MEMORY_DISK_SIZE=8192 # 4 Megabytes!
+options MEMORY_DISK_ROOT_SIZE=8192 # 4 Megabytes!
diff -r b68cd8df9a65 -r 60de65f7ebd4 sys/arch/amiga/conf/MDINSTALL
--- a/sys/arch/amiga/conf/MDINSTALL Tue Apr 02 05:24:59 2002 +0000
+++ b/sys/arch/amiga/conf/MDINSTALL Tue Apr 02 05:30:34 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MDINSTALL,v 1.8 2002/03/10 19:56:38 lukem Exp $
+# $NetBSD: MDINSTALL,v 1.9 2002/04/02 05:30:38 lukem Exp $
Home |
Main Index |
Thread Index |
Old Index