[src/netbsd-1-4]: src/sys/arch/x68k/conf Pull up to HEAD 1.6 per MINOURA Mako...

[cjs <cjs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/316e2932e10c
branches:  netbsd-1-4
changeset: 468354:316e2932e10c
user:      cjs <cjs%NetBSD.org@localhost>
date:      Mon Apr 19 05:02:48 1999 +0000

description:
Pull up to HEAD 1.6 per MINOURA Makoto <minoura%netbsd.org@localhost>.

diffstat:

 sys/arch/x68k/conf/TOKOCHAN |  10 ++++++----
 sys/arch/x68k/conf/ZSCONS   |   4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r b2f592f04dbd -r 316e2932e10c sys/arch/x68k/conf/TOKOCHAN
--- a/sys/arch/x68k/conf/TOKOCHAN       Mon Apr 19 04:59:49 1999 +0000
+++ b/sys/arch/x68k/conf/TOKOCHAN       Mon Apr 19 05:02:48 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: TOKOCHAN,v 1.5 1999/03/31 15:38:33 minoura Exp $
+#      $NetBSD: TOKOCHAN,v 1.5.2.1 1999/04/19 05:02:48 cjs Exp $
 
 #
 #      TOKOCHAN -- Believe in the BSD power; Toko to issyo-ni make all!
@@ -138,11 +138,11 @@
 file-system    MFS             # memory-based filesystem
 #file-system   FDESC           # user file descriptor filesystem
 #file-system   UMAPFS          # uid/gid remapping filesystem
-#file-system   LFS             # Log-based filesystem (still experimental)
+file-system    LFS             # Log-based filesystem (still experimental)
 #file-system   PORTAL          # portal filesystem (still experimental)
 file-system    PROCFS          # /proc
 file-system    CD9660          # ISO 9660 + Rock Ridge file system
-file-system    UNION           # union file system
+#file-system   UNION           # union file system
 file-system    MSDOSFS         # MS-DOS FAT filesystem(s).
 #file-system   ADOSFS          # AmigaDOS filesystem
 
@@ -174,7 +174,7 @@
 options        BUFCACHE=20     # 20% of real memory as buffer cache
 options        NVNODE=1024     # 'make build' requires huge vnode table
 options        MSGBUFSIZE=32768 # increase msgbuf to preserve debug messages
-#options       NKMEMCLUSTERS=1536 # 6MB kernel vm
+#options       NKMEMCLUSTERS=2048 # 8MB kernel vm
 #options       EXPORTMFS       # NFS export /tmp
 
 
@@ -232,6 +232,8 @@
 #xcom0 at mainbus0                     # NS16550 fast serial
 #xcom1 at mainbus0
 
+#par0  at mainbus0                     # Builtin printer port
+
 ## Audio device; broken
 #okiadpcm0 at intio0 addr 0xe92000 intr 106 errintr 107 dma 3
 #audio*        at okiadpcm*
diff -r b2f592f04dbd -r 316e2932e10c sys/arch/x68k/conf/ZSCONS
--- a/sys/arch/x68k/conf/ZSCONS Mon Apr 19 04:59:49 1999 +0000
+++ b/sys/arch/x68k/conf/ZSCONS Mon Apr 19 05:02:48 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: ZSCONS,v 1.5 1999/03/31 15:38:33 minoura Exp $
+#      $NetBSD: ZSCONS,v 1.5.2.1 1999/04/19 05:02:48 cjs Exp $
 
 #
 #      ZSCONS -- like GENERIC, but use zs console.
@@ -228,6 +228,8 @@
 xcom0  at mainbus0                     # NS16550 fast serial
 xcom1  at mainbus0
 
+par0   at mainbus0                     # Builtin printer port
+
 ## Audio device
 #okiadpcm0 at intio0 addr 0xe92000 intr 106 errintr 107 dma 3
 #audio*        at okiadpcm*