Sun Jan 12 12:08:36 2014 UTC ()
Pull up following revision(s) (requested by tsutsui in ticket #1000):
	sys/arch/luna68k/conf/GENERIC: revision 1.106
	sys/arch/luna68k/conf/GENERIC: revision 1.109
	sys/arch/luna68k/conf/GENERIC: revision 1.110
Enable cd at scsibus, just works on LUNA-II.
Add and enable wsmux(4) in GENERIC (for mlterm-fb demonstration).
Enable file-system CD9660 to make cd(4) actually usable.


(bouyer)
diff -r1.97.2.1 -r1.97.2.2 src/sys/arch/luna68k/conf/GENERIC
cvs diff -r1.97.2.1 -r1.97.2.2 src/sys/arch/luna68k/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/luna68k/conf/GENERIC 2012/07/25 21:30:34 1.97.2.1
+++ src/sys/arch/luna68k/conf/GENERIC 2014/01/12 12:08:36 1.97.2.2
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.97.2.1 2012/07/25 21:30:34 martin Exp $ 1# $NetBSD: GENERIC,v 1.97.2.2 2014/01/12 12:08:36 bouyer Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4#  4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/luna68k/conf/std.luna68k" 21include "arch/luna68k/conf/std.luna68k"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.97.2.1 $" 25#ident "GENERIC-$Revision: 1.97.2.2 $"
26 26
27maxusers 8 27maxusers 8
28 28
29options M68030 29options M68030
30options M68040 30options M68040
31options FPSP # on m68040 to emulate some missing FP instructions 31options FPSP # on m68040 to emulate some missing FP instructions
32 32
33# Needs to be set per system. i.e change these as you see fit 33# Needs to be set per system. i.e change these as you see fit
34 34
35# Standard system options 35# Standard system options
36options NTP # NTP phase/frequency locked loop 36options NTP # NTP phase/frequency locked loop
37options KTRACE 37options KTRACE
38options SYSVMSG # System V message queues 38options SYSVMSG # System V message queues
@@ -69,27 +69,27 @@ options COMPAT_20 # NetBSD 2.0 binary c @@ -69,27 +69,27 @@ options COMPAT_20 # NetBSD 2.0 binary c
69options COMPAT_30 # NetBSD 3.0 compatibility. 69options COMPAT_30 # NetBSD 3.0 compatibility.
70options COMPAT_40 # NetBSD 4.0 compatibility. 70options COMPAT_40 # NetBSD 4.0 compatibility.
71options COMPAT_50 # NetBSD 5.0 compatibility. 71options COMPAT_50 # NetBSD 5.0 compatibility.
72#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 72#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
73options COMPAT_AOUT_M68K # support for NetBSD a.out executables 73options COMPAT_AOUT_M68K # support for NetBSD a.out executables
74options EXEC_AOUT # support for a.out executables 74options EXEC_AOUT # support for a.out executables
75options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 75options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
76 76
77# Filesystem options 77# Filesystem options
78file-system FFS # ufs file system 78file-system FFS # ufs file system
79#file-system LFS # log-structured file system 79#file-system LFS # log-structured file system
80file-system NFS # nfs client support 80file-system NFS # nfs client support
81file-system MFS 81file-system MFS
82#file-system CD9660 # ISO 9660 + Rock Ridge file system 82file-system CD9660 # ISO 9660 + Rock Ridge file system
83#file-system MSDOSFS # MS-DOS FAT file system 83#file-system MSDOSFS # MS-DOS FAT file system
84file-system KERNFS # /kern 84file-system KERNFS # /kern
85file-system PROCFS # /proc 85file-system PROCFS # /proc
86#file-system FDESC # /dev/fd/* 86#file-system FDESC # /dev/fd/*
87file-system NULLFS # loopback file system 87file-system NULLFS # loopback file system
88#file-system UMAPFS # NULLFS + uid and gid remapping 88#file-system UMAPFS # NULLFS + uid and gid remapping
89#file-system UNION # union file system 89#file-system UNION # union file system
90#file-system CODA # Coda File System; also needs vcode (below) 90#file-system CODA # Coda File System; also needs vcode (below)
91file-system PTYFS # /dev/pts/N support 91file-system PTYFS # /dev/pts/N support
92file-system TMPFS # Efficient memory file-system 92file-system TMPFS # Efficient memory file-system
93#file-system UDF # experimental - OSTA UDF CD/DVD file-system 93#file-system UDF # experimental - OSTA UDF CD/DVD file-system
94 94
95#options NFSSERVER # nfs server support 95#options NFSSERVER # nfs server support
@@ -150,36 +150,36 @@ clock0 at mainbus0 @@ -150,36 +150,36 @@ clock0 at mainbus0
150sio0 at mainbus0 150sio0 at mainbus0
151siotty0 at sio0 # ttya 151siotty0 at sio0 # ttya
152ws0 at sio0 # port for keyboard and mouse 152ws0 at sio0 # port for keyboard and mouse
153# AM7990 LANCE 153# AM7990 LANCE
154le0 at mainbus0 154le0 at mainbus0
155# MB89532 SPC 155# MB89532 SPC
156spc0 at mainbus0 156spc0 at mainbus0
157spc1 at mainbus0 # 2nd SCSI on LUNA-II 157spc1 at mainbus0 # 2nd SCSI on LUNA-II
158# framebuffer 158# framebuffer
159fb0 at mainbus0 # 16 or 256 pseudo color 159fb0 at mainbus0 # 16 or 256 pseudo color
160 160
161# Workstation Console attachments 161# Workstation Console attachments
162wsdisplay* at fb? 162wsdisplay* at fb?
163wskbd* at ws? console ? 163wskbd* at ws? console ? mux 1
164wsmouse* at ws? 164wsmouse* at ws? mux 0
165 165
166# SCSI bus support 166# SCSI bus support
167scsibus* at spc? 167scsibus* at spc?
168 168
169# SCSI devices 169# SCSI devices
170sd* at scsibus? target ? lun ? # SCSI disks 170sd* at scsibus? target ? lun ? # SCSI disks
171st* at scsibus? target ? lun ? # SCSI tapes 171st* at scsibus? target ? lun ? # SCSI tapes
172#cd* at scsibus? target ? lun ? # SCSI CD-ROMs 172cd* at scsibus? target ? lun ? # SCSI CD-ROMs
173#ch* at scsibus? target ? lun ? # SCSI changer devices 173#ch* at scsibus? target ? lun ? # SCSI changer devices
174#ss* at scsibus? target ? lun ? # SCSI scanners 174#ss* at scsibus? target ? lun ? # SCSI scanners
175#uk* at scsibus? target ? lun ? # unknown SCSI devices 175#uk* at scsibus? target ? lun ? # unknown SCSI devices
176 176
177# 177#
178# accept filters 178# accept filters
179pseudo-device accf_data # "dataready" accept filter 179pseudo-device accf_data # "dataready" accept filter
180pseudo-device accf_http # "httpready" accept filter 180pseudo-device accf_http # "httpready" accept filter
181 181
182pseudo-device bpfilter # Berkeley Packet Filter 182pseudo-device bpfilter # Berkeley Packet Filter
183#pseudo-device carp # Common Address Redundancy Protocol 183#pseudo-device carp # Common Address Redundancy Protocol
184#pseudo-device ccd 2 # concatenated and striped disks 184#pseudo-device ccd 2 # concatenated and striped disks
185#pseudo-device cgd 2 # cryptographic disks 185#pseudo-device cgd 2 # cryptographic disks
@@ -196,26 +196,28 @@ pseudo-device fss # file system snapsh @@ -196,26 +196,28 @@ pseudo-device fss # file system snapsh
196#pseudo-device tun # Network "tunnel" device 196#pseudo-device tun # Network "tunnel" device
197#pseudo-device tap # virtual Ethernet 197#pseudo-device tap # virtual Ethernet
198pseudo-device vlan # IEEE 802.1q encapsulation 198pseudo-device vlan # IEEE 802.1q encapsulation
199pseudo-device bridge # simple inter-network bridging 199pseudo-device bridge # simple inter-network bridging
200#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too 200#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
201pseudo-device agr # IEEE 802.3ad link aggregation 201pseudo-device agr # IEEE 802.3ad link aggregation
202#pseudo-device vnd # disk-like interface to files 202#pseudo-device vnd # disk-like interface to files
203#options VND_COMPRESSION # compressed vnd(4) 203#options VND_COMPRESSION # compressed vnd(4)
204pseudo-device clockctl # user control of clock subsystem 204pseudo-device clockctl # user control of clock subsystem
205pseudo-device ksyms # /dev/ksyms 205pseudo-device ksyms # /dev/ksyms
206#pseudo-device pf # PF packet filter 206#pseudo-device pf # PF packet filter
207#pseudo-device pflog # PF log if 207#pseudo-device pflog # PF log if
208 208
 209pseudo-device wsmux # mouse & keyboard multiplexsor
 210
209# Veriexec 211# Veriexec
210# 212#
211# a pseudo device needed for veriexec 213# a pseudo device needed for veriexec
212#pseudo-device veriexec 1 214#pseudo-device veriexec 1
213# 215#
214# Uncomment the fingerprint methods below that are desired. Note that 216# Uncomment the fingerprint methods below that are desired. Note that
215# removing fingerprint methods will have almost no impact on the kernel 217# removing fingerprint methods will have almost no impact on the kernel
216# code size. 218# code size.
217# 219#
218#options VERIFIED_EXEC_FP_RMD160 220#options VERIFIED_EXEC_FP_RMD160
219#options VERIFIED_EXEC_FP_SHA256 221#options VERIFIED_EXEC_FP_SHA256
220#options VERIFIED_EXEC_FP_SHA384 222#options VERIFIED_EXEC_FP_SHA384
221#options VERIFIED_EXEC_FP_SHA512 223#options VERIFIED_EXEC_FP_SHA512