Module Name: src
Committed By: rin
Date: Tue May 19 09:26:44 UTC 2020
Modified Files:
src/sys/arch/evbarm/conf: NAPPI_MD ZAO425_MD
src/sys/arch/evbmips/conf: ADM5120 ADM5120-NB ADM5120-USB RB153
src/sys/arch/x68k/conf: INSTALL
Log Message:
Fix outdated or misleading comments for MEMORY_DISK_ROOT_SIZE.
No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/NAPPI_MD \
src/sys/arch/evbarm/conf/ZAO425_MD
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbmips/conf/ADM5120 \
src/sys/arch/evbmips/conf/ADM5120-USB
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbmips/conf/ADM5120-NB
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbmips/conf/RB153
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/x68k/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/NAPPI_MD
diff -u src/sys/arch/evbarm/conf/NAPPI_MD:1.3 src/sys/arch/evbarm/conf/NAPPI_MD:1.4
--- src/sys/arch/evbarm/conf/NAPPI_MD:1.3 Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/NAPPI_MD Tue May 19 09:26:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: NAPPI_MD,v 1.3 2010/11/23 11:13:56 hannken Exp $
+# $NetBSD: NAPPI_MD,v 1.4 2020/05/19 09:26:44 rin Exp $
#
# NAPPI -- Netwise APlication Platform Board Kernel
#
@@ -10,7 +10,7 @@ include "arch/evbarm/conf/NAPPI"
# 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_ROOT_SIZE=8192 # 2 Megabytes
+options MEMORY_DISK_ROOT_SIZE=8192 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
# disk/mass storage pseudo-devices
Index: src/sys/arch/evbarm/conf/ZAO425_MD
diff -u src/sys/arch/evbarm/conf/ZAO425_MD:1.3 src/sys/arch/evbarm/conf/ZAO425_MD:1.4
--- src/sys/arch/evbarm/conf/ZAO425_MD:1.3 Tue Nov 23 11:13:57 2010
+++ src/sys/arch/evbarm/conf/ZAO425_MD Tue May 19 09:26:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ZAO425_MD,v 1.3 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: ZAO425_MD,v 1.4 2020/05/19 09:26:44 rin Exp $
#
# ZAO425_MD config file
#
@@ -8,7 +8,7 @@ include "arch/evbarm/conf/ZAO425"
# 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_ROOT_SIZE=8192 # 2 Megabytes
+options MEMORY_DISK_ROOT_SIZE=8192 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
# disk/mass storage pseudo-devices
Index: src/sys/arch/evbmips/conf/ADM5120
diff -u src/sys/arch/evbmips/conf/ADM5120:1.29 src/sys/arch/evbmips/conf/ADM5120:1.30
--- src/sys/arch/evbmips/conf/ADM5120:1.29 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbmips/conf/ADM5120 Tue May 19 09:26:44 2020
@@ -1,11 +1,11 @@
-# $NetBSD: ADM5120,v 1.29 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: ADM5120,v 1.30 2020/05/19 09:26:44 rin Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.adm5120"
-#ident "GENERIC-$Revision: 1.29 $"
+#ident "GENERIC-$Revision: 1.30 $"
maxusers 32
@@ -36,7 +36,7 @@ makeoptions COPY_SYMTAB=1 # size for emb
#options MEMORY_DISK_HOOKS
#options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-#options MEMORY_DISK_ROOT_SIZE=16384 # 2 Megabytes
+#options MEMORY_DISK_ROOT_SIZE=16384 # size of memory disk, in blocks
# Compatibility options
include "conf/compat_netbsd50.config"
Index: src/sys/arch/evbmips/conf/ADM5120-USB
diff -u src/sys/arch/evbmips/conf/ADM5120-USB:1.29 src/sys/arch/evbmips/conf/ADM5120-USB:1.30
--- src/sys/arch/evbmips/conf/ADM5120-USB:1.29 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbmips/conf/ADM5120-USB Tue May 19 09:26:44 2020
@@ -1,11 +1,11 @@
-# $NetBSD: ADM5120-USB,v 1.29 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: ADM5120-USB,v 1.30 2020/05/19 09:26:44 rin Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.adm5120"
-#ident "GENERIC-$Revision: 1.29 $"
+#ident "GENERIC-$Revision: 1.30 $"
maxusers 32
@@ -33,9 +33,9 @@ makeoptions DEBUG="-g" # compile full s
makeoptions CPUFLAGS="-march=4kc" # compile full symbol table
makeoptions COPY_SYMTAB=1 # size for embedded symbol table
-#options MEMORY_DISK_HOOKS
-#options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-#options MEMORY_DISK_ROOT_SIZE=16384 # 2 Megabytes
+#options MEMORY_DISK_HOOKS
+#options MEMORY_DISK_IS_ROOT # Force root on ram-disk
+#options MEMORY_DISK_ROOT_SIZE=16384 # size of memory disk, in blocks
# Compatibility options
#include "conf/compat_netbsd10.config"
Index: src/sys/arch/evbmips/conf/ADM5120-NB
diff -u src/sys/arch/evbmips/conf/ADM5120-NB:1.27 src/sys/arch/evbmips/conf/ADM5120-NB:1.28
--- src/sys/arch/evbmips/conf/ADM5120-NB:1.27 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbmips/conf/ADM5120-NB Tue May 19 09:26:44 2020
@@ -1,11 +1,11 @@
-# $NetBSD: ADM5120-NB,v 1.27 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: ADM5120-NB,v 1.28 2020/05/19 09:26:44 rin Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.adm5120"
-#ident "GENERIC-$Revision: 1.27 $"
+#ident "GENERIC-$Revision: 1.28 $"
maxusers 32
@@ -36,7 +36,7 @@ makeoptions COPY_SYMTAB=1 # size for emb
#options MEMORY_DISK_HOOKS
#options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-#options MEMORY_DISK_ROOT_SIZE=16384 # 2 Megabytes
+#options MEMORY_DISK_ROOT_SIZE=16384 # size of memory disk, in blocks
# Compatibility options
include "conf/compat_netbsd50.config"
Index: src/sys/arch/evbmips/conf/RB153
diff -u src/sys/arch/evbmips/conf/RB153:1.24 src/sys/arch/evbmips/conf/RB153:1.25
--- src/sys/arch/evbmips/conf/RB153:1.24 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbmips/conf/RB153 Tue May 19 09:26:44 2020
@@ -1,10 +1,10 @@
-# $NetBSD: RB153,v 1.24 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: RB153,v 1.25 2020/05/19 09:26:44 rin Exp $
#
# Example kernel config for the RouterBOARD 153.
include "arch/evbmips/conf/std.adm5120"
-#ident "RB153-$Revision: 1.24 $"
+#ident "RB153-$Revision: 1.25 $"
maxusers 32
@@ -35,8 +35,8 @@ makeoptions CPUFLAGS="-march=4kc"
makeoptions COPY_SYMTAB=1 # size for embedded symbol table
#options MEMORY_DISK_HOOKS
-#options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-#options MEMORY_DISK_ROOT_SIZE=16384 # 2 Megabytes
+#options MEMORY_DISK_IS_ROOT # Force root on ram-disk
+#options MEMORY_DISK_ROOT_SIZE=16384 # size of memory disk, in blocks
# File systems
file-system FFS # Berkeley Fast Filesystem
Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.118 src/sys/arch/x68k/conf/INSTALL:1.119
--- src/sys/arch/x68k/conf/INSTALL:1.118 Thu Mar 14 16:59:10 2019
+++ src/sys/arch/x68k/conf/INSTALL Tue May 19 09:26:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.118 2019/03/14 16:59:10 thorpej Exp $
+# $NetBSD: INSTALL,v 1.119 2020/05/19 09:26:44 rin Exp $
#
# INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.118 $"
+#ident "INSTALL-$Revision: 1.119 $"
makeoptions COPTS="-Os" # Optimise for space. Implies -O2
@@ -18,7 +18,7 @@ maxusers 4
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on memory-disk
options MEMORY_DISK_SERVER=0 # No user space hooks
-options MEMORY_DISK_ROOT_SIZE=3600 # 1.8 Mbytes
+options MEMORY_DISK_ROOT_SIZE=3600 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
## System kernel configuration. See options(4) for more detail.
