Module Name:    src
Committed By:   bouyer
Date:           Wed May 21 20:44:23 UTC 2014

Modified Files:
        src/sys/arch/hp300/conf [netbsd-6]: INSTALL RAMDISK

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1057):
        sys/arch/hp300/conf/RAMDISK: revision 1.14
        sys/arch/hp300/conf/INSTALL: revision 1.57
Add "pseudo-device wsmux" in INSTALL (and RAMDISK) kernels.
On NetBSD/hp300, hilkbd(4) is probed in config_interrupts(9)
so it's always attached after wsdisplay(4).  In that case,
wskbd can't be used as a console input device without wsmux(4).
(i.e. keyboard didn't work on installer using screen console)
Should be pulled up to all netbsd-6* branches.
Disable options NVNODE, NBUF and BUFPAGES in the RAMDISK kernel.
These options were specified in the INSTALL kernel for 4MB machines,
but nowadays even the INSTALL kernel would not boot on such machines
and the RAMDISK kernel assumes the target machine has more memories.
Furthermore, these options makes extracting binary sets much slower
and also could cause "wapbl_register_deallocation: out of resources"
panic during extracting binaries into a 32GB SSD with 4KB fragments.
Should be pulled up to netbsd-6* branches.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.2.1 src/sys/arch/hp300/conf/INSTALL
cvs rdiff -u -r1.13 -r1.13.14.1 src/sys/arch/hp300/conf/RAMDISK

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/hp300/conf/INSTALL
diff -u src/sys/arch/hp300/conf/INSTALL:1.48 src/sys/arch/hp300/conf/INSTALL:1.48.2.1
--- src/sys/arch/hp300/conf/INSTALL:1.48	Sun Dec 18 05:49:27 2011
+++ src/sys/arch/hp300/conf/INSTALL	Wed May 21 20:44:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.48 2011/12/18 05:49:27 dholland Exp $
+# $NetBSD: INSTALL,v 1.48.2.1 2014/05/21 20:44:23 bouyer Exp $
 #
 # INSTALL machine description file
 #
@@ -245,3 +245,4 @@ pseudo-device	loop			# loopback network 
 #pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
+pseudo-device	wsmux			# mouse & keyboard multiplexor

Index: src/sys/arch/hp300/conf/RAMDISK
diff -u src/sys/arch/hp300/conf/RAMDISK:1.13 src/sys/arch/hp300/conf/RAMDISK:1.13.14.1
--- src/sys/arch/hp300/conf/RAMDISK:1.13	Tue Nov 23 11:13:58 2010
+++ src/sys/arch/hp300/conf/RAMDISK	Wed May 21 20:44:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.13 2010/11/23 11:13:58 hannken Exp $
+# $NetBSD: RAMDISK,v 1.13.14.1 2014/05/21 20:44:23 bouyer Exp $
 #
 # RAMDISK machine description file
 #
@@ -7,6 +7,11 @@
 
 include 	"arch/hp300/conf/INSTALL"
 
+# These options for small RAM machines makes extracting binaries much slower.
+no options	NVNODE
+no options	NBUF
+no options	BUFPAGES
+
 # Enable the hooks used for initializing the root memory-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT		# force root on memory disk

Reply via email to