Sat Aug 7 19:18:04 2010 UTC ()
Removed double WAPBL option. Fixed typo.


(phx)
diff -r1.49 -r1.50 src/sys/arch/sandpoint/conf/GENERIC
cvs diff -r1.49 -r1.50 src/sys/arch/sandpoint/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/sandpoint/conf/GENERIC 2010/06/30 17:49:32 1.49
+++ src/sys/arch/sandpoint/conf/GENERIC 2010/08/07 19:18:04 1.50
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.49 2010/06/30 17:49:32 phx Exp $ 1# $NetBSD: GENERIC,v 1.50 2010/08/07 19:18:04 phx Exp $
2# 2#
3# machine description file for GENERIC NAS 3# machine description file for GENERIC NAS
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/sandpoint/conf/std.sandpoint" 21include "arch/sandpoint/conf/std.sandpoint"
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.49 $" 25#ident "GENERIC-$Revision: 1.50 $"
26 26
27maxusers 32 27maxusers 32
28 28
29#options ALTIVEC # Include AltiVec support 29#options ALTIVEC # Include AltiVec support
30 30
31#options IPKDBUSERHACK # Allow access to mapped memory via kgdb 31#options IPKDBUSERHACK # Allow access to mapped memory via kgdb
32#options DEBUG_BY_TOOLS # Allow debugging from toolsnet 32#options DEBUG_BY_TOOLS # Allow debugging from toolsnet
33# HMAC key to be used for debugging sessions 33# HMAC key to be used for debugging sessions
34#options IPKDBKEY="\"HMAC pass phrase text\"" 34#options IPKDBKEY="\"HMAC pass phrase text\""
35#options IPKDBSECURE # Allow debugging even when securelevel > 0 35#options IPKDBSECURE # Allow debugging even when securelevel > 0
36#makeoptions DEBUG="-g" 36#makeoptions DEBUG="-g"
37 37
38#options DEBUG 38#options DEBUG
@@ -61,28 +61,26 @@ options COMPAT_16 # NetBSD 1.6 @@ -61,28 +61,26 @@ options COMPAT_16 # NetBSD 1.6
61options COMPAT_20 # NetBSD 2.0 61options COMPAT_20 # NetBSD 2.0
62options COMPAT_30 # NetBSD 3.0 62options COMPAT_30 # NetBSD 3.0
63options COMPAT_40 # NetBSD 4.0 63options COMPAT_40 # NetBSD 4.0
64options COMPAT_50 # NetBSD 5.0 compatibility. 64options COMPAT_50 # NetBSD 5.0 compatibility.
65options COMPAT_43 # 4.3BSD, 386BSD, and BSDI 65options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
66#options COMPAT_386BSD_MBRPART # recognize old partition ID 66#options COMPAT_386BSD_MBRPART # recognize old partition ID
67#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 67#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
68 68
69options COMPAT_LINUX # binary compatibility with Linux 69options COMPAT_LINUX # binary compatibility with Linux
70options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 70options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
71 71
72options MSGBUFSIZE=65536 72options MSGBUFSIZE=65536
73 73
74#options WAPBL 
75 
76file-system FFS # UFS 74file-system FFS # UFS
77file-system EXT2FS # second extended file system (linux) 75file-system EXT2FS # second extended file system (linux)
78#file-system LFS # log-structured file system 76#file-system LFS # log-structured file system
79file-system MFS # memory file system 77file-system MFS # memory file system
80file-system NFS # Network File System client 78file-system NFS # Network File System client
81#file-system NTFS # Windows/NT file system (experimental) 79#file-system NTFS # Windows/NT file system (experimental)
82#file-system CD9660 # ISO 9660 + Rock Ridge file system 80#file-system CD9660 # ISO 9660 + Rock Ridge file system
83file-system MSDOSFS # MS-DOS file system 81file-system MSDOSFS # MS-DOS file system
84file-system FDESC # /dev/fd 82file-system FDESC # /dev/fd
85file-system KERNFS # /kern 83file-system KERNFS # /kern
86file-system NULLFS # loopback file system 84file-system NULLFS # loopback file system
87#file-system OVERLAY # overlay file system 85#file-system OVERLAY # overlay file system
88file-system PROCFS # /proc 86file-system PROCFS # /proc
@@ -112,27 +110,27 @@ options INET6 # IPV6 @@ -112,27 +110,27 @@ options INET6 # IPV6
112#options ALTQ_FIFOQ # First-In First-Out Queue 110#options ALTQ_FIFOQ # First-In First-Out Queue
113#options ALTQ_FLOWVALVE # RED/flow-valve (red-penalty-box) 111#options ALTQ_FLOWVALVE # RED/flow-valve (red-penalty-box)
114#options ALTQ_HFSC # Hierarchical Fair Service Curve 112#options ALTQ_HFSC # Hierarchical Fair Service Curve
115#options ALTQ_LOCALQ # Local queueing discipline 113#options ALTQ_LOCALQ # Local queueing discipline
116#options ALTQ_PRIQ # Priority Queueing 114#options ALTQ_PRIQ # Priority Queueing
117#options ALTQ_RED # Random Early Detection 115#options ALTQ_RED # Random Early Detection
118#options ALTQ_RIO # RED with IN/OUT 116#options ALTQ_RIO # RED with IN/OUT
119#options ALTQ_WFQ # Weighted Fair Queueing 117#options ALTQ_WFQ # Weighted Fair Queueing
120 118
121options NFS_BOOT_BOOTPARAM,NFS_BOOT_BOOTP 119options NFS_BOOT_BOOTPARAM,NFS_BOOT_BOOTP
122 120
123config netbsd root on ? type ? 121config netbsd root on ? type ?
124 122
125# network psuedo-devices 123# network pseudo-devices
126pseudo-device bpfilter # packet filter 124pseudo-device bpfilter # packet filter
127pseudo-device vlan # IEEE 802.1q encapsulation 125pseudo-device vlan # IEEE 802.1q encapsulation
128#pseudo-device pppoe # PPP over Ethernet (RFC 2516) 126#pseudo-device pppoe # PPP over Ethernet (RFC 2516)
129#pseudo-device bridge # simple inter-network bridging 127#pseudo-device bridge # simple inter-network bridging
130#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too 128#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
131#pseudo-device ipfilter 129#pseudo-device ipfilter
132pseudo-device loop 130pseudo-device loop
133 131
134# miscellaneous pseudo-devices 132# miscellaneous pseudo-devices
135pseudo-device rnd # /dev/random and in-kernel generator 133pseudo-device rnd # /dev/random and in-kernel generator
136pseudo-device vnd  134pseudo-device vnd
137#options VND_COMPRESSION # compressed vnd(4) 135#options VND_COMPRESSION # compressed vnd(4)
138#pseudo-device cgd 4 # cryptographic disk devices 136#pseudo-device cgd 4 # cryptographic disk devices