ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/FreeBSDAdmin/Kernel/i386/SOTIRED
(Generate patch)

Comparing FreeBSDAdmin/Kernel/i386/SOTIRED (file contents):
Revision 1131 by douglas, 2008-05-15T17:51:49-07:00 vs.
Revision 1132 by douglas, 2009-01-06T20:27:58-08:00

# Line 16 | Line 16
16   # If you are in doubt as to the purpose or necessity of a line, check first
17   # in NOTES.
18   #
19 < # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.2.2.1 2008/02/06 03:24:28 scottl Exp $
19 > # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.15.2.1 2008/11/25 02:59:29 kensmith Exp $
20  
21   #cpu            I486_CPU
22   cpu             I586_CPU
# Line 28 | Line 28 | ident          SOTIRED
28  
29   makeoptions     DEBUG=-g                # Build kernel with gdb(1) debug symbols
30  
31 < options         SCHED_4BSD              # 4BSD scheduler
31 > options         SCHED_ULE               # ULE scheduler
32   options         PREEMPTION              # Enable kernel thread preemption
33   options         INET                    # InterNETworking
34   options         INET6                   # IPv6 communications protocols
# Line 41 | Line 41 | options        UFS_GJOURNAL            # Enable gjournal
41   #options        MD_ROOT                 # MD is a potential root device
42   options         NFSCLIENT               # Network Filesystem Client
43   options         NFSSERVER               # Network Filesystem Server
44 + options         NFSLOCKD                # Network Lock Manager
45   #options        NFS_ROOT                # NFS usable as /, requires NFSCLIENT
46   #options        MSDOSFS                 # MSDOS Filesystem
47   #options        CD9660                  # ISO 9660 Filesystem
# Line 54 | Line 55 | options        COMPAT_FREEBSD5         # Compatible w
55   options         COMPAT_FREEBSD6         # Compatible with FreeBSD6
56   options         SCSI_DELAY=5000         # Delay (in ms) before probing SCSI
57   options         KTRACE                  # ktrace(1) support
58 + options         STACK                   # stack(9) support
59   options         SYSVSHM                 # SYSV-style shared memory
60   options         SYSVMSG                 # SYSV-style message queues
61   options         SYSVSEM                 # SYSV-style semaphores
# Line 62 | Line 64 | options        KBD_INSTALL_CDEV        # install a CD
64   options         ADAPTIVE_GIANT          # Giant mutex is adaptive.
65   options         STOP_NMI                # Stop CPUS using NMI instead of IPI
66   options         AUDIT                   # Security event auditing
67 + #options        KDTRACE_HOOKS           # Kernel DTrace hooks
68  
69   # To make an SMP kernel, the next two lines are needed
70   #options        SMP                     # Symmetric MultiProcessor Kernel
# Line 190 | Line 193 | device         uart            # Generic UART driver
193  
194   # PCI Ethernet NICs.
195   #device         de              # DEC/Intel DC21x4x (``Tulip'')
196 < #device         em              # Intel PRO/1000 adapter Gigabit Ethernet Card
196 > #device         em              # Intel PRO/1000 Gigabit Ethernet Family
197 > #device         igb             # Intel PRO/1000 PCIE Server Gigabit Family
198   #device         ixgb            # Intel PRO/10GbE Ethernet Card
199   #device         le              # AMD Am7900 LANCE and Am79C9xx PCnet
200   #device         txp             # 3Com 3cR990 (``Typhoon'')
# Line 199 | Line 203 | device         uart            # Generic UART driver
203   # PCI Ethernet NICs that use the common MII bus controller code.
204   # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
205   device          miibus          # MII bus support
206 + #device         age             # Attansic/Atheros L1 Gigabit Ethernet
207 + #device         ale             # Atheros AR8121/AR8113/AR8114 Ethernet
208   #device         bce             # Broadcom BCM5706/BCM5708 Gigabit Ethernet
209   #device         bfe             # Broadcom BCM440x 10/100 Ethernet
210   #device         bge             # Broadcom BCM570xx Gigabit Ethernet
211   #device         dc              # DEC/Intel 21143 and various workalikes
212 + #device         et              # Agere ET1310 10/100/Gigabit Ethernet
213   #device         fxp             # Intel EtherExpress PRO/100B (82557, 82558)
214 + #device         jme             # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
215   #device         lge             # Level 1 LXT1001 gigabit Ethernet
216   #device         msk             # Marvell/SysKonnect Yukon II Gigabit Ethernet
217   #device         nfe             # nVidia nForce MCP on-board Ethernet
# Line 282 | Line 290 | device         ugen            # Generic
290   #device         ukbd            # Keyboard
291   #device         ulpt            # Printer
292   device          umass           # Disks/Mass storage - Requires scbus and da
293 < #device         ums             # Mouse
293 > device          ums             # Mouse
294   #device         ural            # Ralink Technology RT2500USB wireless NICs
295   #device         rum             # Ralink Technology RT2501USB wireless NICs
296   #device         urio            # Diamond Rio 500 MP3 player
297   #device         uscanner        # Scanners
298 + # USB Serial devices
299 + #device         ucom            # Generic com ttys
300 + #device         uark            # Technologies ARK3116 based serial adapters
301 + #device         ubsa            # Belkin F5U103 and compatible serial adapters
302 + #device         ubser           # BWCT console serial adapters
303 + #device         uftdi           # For FTDI usb serial adapters
304 + #device         uipaq           # Some WinCE based devices
305 + #device         uplcom          # Prolific PL-2303 serial adapters
306 + #device         uslcom          # SI Labs CP2101/CP2102 serial adapters
307 + #device         uvisor          # Visor and Palm devices
308 + #device         uvscom          # USB serial support for DDI pocket's PHS
309   # USB Ethernet, requires miibus
310   #device         aue             # ADMtek USB Ethernet
311   #device         axe             # ASIX Electronics USB Ethernet

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines