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 984 by douglas, 2008-01-18T13:13:27-08:00 vs.
Revision 1001 by douglas, 2008-04-28T13:07:33-07: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.429.2.13 2006/10/09 18:41:36 simon Exp $
19 > # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.2.2.1 2008/02/06 03:24:28 scottl Exp $
20  
21 machine         i386
21   #cpu            I486_CPU
22   cpu             I586_CPU
23   #cpu            I686_CPU
# Line 33 | Line 32 | options        SCHED_4BSD              # 4BSD scheduler
32   options         PREEMPTION              # Enable kernel thread preemption
33   options         INET                    # InterNETworking
34   options         INET6                   # IPv6 communications protocols
35 + options         SCTP                    # Stream Control Transmission Protocol
36   options         FFS                     # Berkeley Fast Filesystem
37   options         SOFTUPDATES             # Enable FFS soft updates support
38   options         UFS_ACL                 # Support for access control lists
39   options         UFS_DIRHASH             # Improve performance on big directories
40 < options         MD_ROOT                 # MD is a potential root device
40 > options         UFS_GJOURNAL            # Enable gjournal-based UFS journaling
41 > #options        MD_ROOT                 # MD is a potential root device
42   options         NFSCLIENT               # Network Filesystem Client
43   options         NFSSERVER               # Network Filesystem Server
44   #options        NFS_ROOT                # NFS usable as /, requires NFSCLIENT
# Line 45 | Line 46 | options        NFSSERVER               # Network Filesystem
46   #options        CD9660                  # ISO 9660 Filesystem
47   options         PROCFS                  # Process filesystem (requires PSEUDOFS)
48   options         PSEUDOFS                # Pseudo-filesystem framework
49 < options         GEOM_GPT                # GUID Partition Tables.
50 < options         COMPAT_43               # Compatible with BSD 4.3 [KEEP THIS!]
49 > options         GEOM_PART_GPT           # GUID Partition Tables.
50 > options         GEOM_LABEL              # Provides labelization
51 > options         COMPAT_43TTY            # BSD 4.3 TTY compat [KEEP THIS!]
52   options         COMPAT_FREEBSD4         # Compatible with FreeBSD4
53   options         COMPAT_FREEBSD5         # Compatible with FreeBSD5
54 + options         COMPAT_FREEBSD6         # Compatible with FreeBSD6
55   options         SCSI_DELAY=5000         # Delay (in ms) before probing SCSI
56   options         KTRACE                  # ktrace(1) support
57   options         SYSVSHM                 # SYSV-style shared memory
# Line 57 | Line 60 | options        SYSVSEM                 # SYSV-style semaphor
60   options         _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
61   options         KBD_INSTALL_CDEV        # install a CDEV entry in /dev
62   options         ADAPTIVE_GIANT          # Giant mutex is adaptive.
63 + options         STOP_NMI                # Stop CPUS using NMI instead of IPI
64 + options         AUDIT                   # Security event auditing
65  
66 + # To make an SMP kernel, the next two lines are needed
67 + #options        SMP                     # Symmetric MultiProcessor Kernel
68   #device         apic                    # I/O APIC
69  
70 + # CPU frequency control
71 + device          cpufreq
72 +
73   # Bus support.
74 < device          eisa
74 > #device         eisa
75   device          pci
76  
77   # Floppy drives
# Line 85 | Line 95 | options        ATA_STATIC_ID   # Static device n
95   #options        AHD_REG_PRETTY_PRINT    # Print register bitfields in debug
96                                          # output.  Adds ~215k to driver.
97   #device         amd             # AMD 53C974 (Tekram DC-390(T))
98 + #device         hptiop          # Highpoint RocketRaid 3xxx series
99   #device         isp             # Qlogic family
100   #device         ispfw           # Firmware for QLogic HBAs- normally a module
101   #device         mpt             # LSI-Logic MPT-Fusion
# Line 118 | Line 129 | device         ses             # SCSI Environmental Servic
129   #device         ciss            # Compaq Smart RAID 5*
130   #device         dpt             # DPT Smartcache III, IV - See NOTES for options
131   #device         hptmv           # Highpoint RocketRAID 182x
132 < #device         rr232x          # Highpoint RocketRAID 232x
132 > #device         hptrr           # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
133   #device         iir             # Intel Integrated RAID
134   #device         ips             # IBM (Adaptec) ServeRAID
135   #device         mly             # Mylex AcceleRAID/eXtremeRAID
# Line 147 | Line 158 | device         ses             # SCSI Environmental Servic
158   # syscons is the default console driver, resembling an SCO console
159   #device         sc
160  
161 < # Enable this for the pcvt (VT220 compatible) console driver
151 < #device         vt
152 < #options        XSERVER         # support for X server on a vt console
153 < #options        FAT_CURSOR      # start with block cursor
154 <
155 < #device         agp             # support several AGP chipsets
161 > device          agp             # support several AGP chipsets
162  
163   # Power management support (see NOTES for more options)
164   #device         apm
# Line 167 | Line 173 | device         pmtimer
173  
174   # Serial (COM) ports
175   device          sio             # 8250, 16[45]50 based serial ports
176 + device          uart            # Generic UART driver
177  
178   # Parallel port
179   #device         ppc
# Line 178 | Line 185 | device         sio             # 8250, 16[45]50 based seri
185  
186   # If you've got a "dumb" serial or parallel PCI card that is
187   # supported by the puc(4) glue driver, uncomment the following
188 < # line to enable it (connects to the sio and/or ppc drivers):
188 > # line to enable it (connects to sio, uart and/or ppc drivers):
189   #device         puc
190  
191   # PCI Ethernet NICs.
192   #device         de              # DEC/Intel DC21x4x (``Tulip'')
193   #device         em              # Intel PRO/1000 adapter Gigabit Ethernet Card
194   #device         ixgb            # Intel PRO/10GbE Ethernet Card
195 + #device         le              # AMD Am7900 LANCE and Am79C9xx PCnet
196   #device         txp             # 3Com 3cR990 (``Typhoon'')
197   #device         vx              # 3Com 3c590, 3c595 (``Vortex'')
198  
# Line 197 | Line 205 | device         miibus          # MII bus support
205   #device         dc              # DEC/Intel 21143 and various workalikes
206   #device         fxp             # Intel EtherExpress PRO/100B (82557, 82558)
207   #device         lge             # Level 1 LXT1001 gigabit Ethernet
208 + #device         msk             # Marvell/SysKonnect Yukon II Gigabit Ethernet
209 + #device         nfe             # nVidia nForce MCP on-board Ethernet
210   #device         nge             # NatSemi DP83820 gigabit Ethernet
211   #device         nve             # nVidia nForce MCP on-board Ethernet Networking
212 < #device         pcn             # AMD Am79C97x PCI 10/100(precedence over 'lnc')
212 > #device         pcn             # AMD Am79C97x PCI 10/100 (precedence over 'le')
213   #device         re              # RealTek 8139C+/8169/8169S/8110S
214   #device         rl              # RealTek 8129/8139
215   #device         sf              # Adaptec AIC-6915 (``Starfire'')
# Line 223 | Line 233 | device         vr              # VIA Rhine, Rhine II
233   #device         ep              # Etherlink III based cards
234   #device         fe              # Fujitsu MB8696x based cards
235   #device         ie              # EtherExpress 8/16, 3C507, StarLAN 10 etc.
226 #device         lnc             # NE2100, NE32-VL Lance Ethernet cards
236   #device         sn              # SMC's 9000 series of Ethernet chips
237   #device         xe              # Xircom pccard Ethernet
238  
# Line 232 | Line 241 | device         vr              # VIA Rhine, Rhine II
241   #device         wlan_wep        # 802.11 WEP support
242   #device         wlan_ccmp       # 802.11 CCMP support
243   #device         wlan_tkip       # 802.11 TKIP support
244 + #device         wlan_amrr       # AMRR transmit rate control algorithm
245 + #device         wlan_scan_ap    # 802.11 AP mode scanning
246 + #device         wlan_scan_sta   # 802.11 STA mode scanning
247   #device         an              # Aironet 4500/4800 802.11 wireless NICs.
248   #device         ath             # Atheros pci/cardbus NIC's
249   #device         ath_hal         # Atheros HAL (Hardware Access Layer)
# Line 252 | Line 264 | device         pty             # Pseudo-ttys (telnet etc)
264   device          md              # Memory "disks"
265   device          gif             # IPv6 and IPv4 tunneling
266   device          faith           # IPv6-to-IPv4 relaying (translation)
267 + device          firmware        # firmware assist module
268  
269   # The `bpf' device enables the Berkeley Packet Filter.
270   # Be aware of the administrative consequences of enabling this!
# Line 271 | Line 284 | device         ugen            # Generic
284   device          umass           # Disks/Mass storage - Requires scbus and da
285   #device         ums             # Mouse
286   #device         ural            # Ralink Technology RT2500USB wireless NICs
287 + #device         rum             # Ralink Technology RT2501USB wireless NICs
288   #device         urio            # Diamond Rio 500 MP3 player
289   #device         uscanner        # Scanners
290   # USB Ethernet, requires miibus
# Line 285 | Line 299 | device         umass           # Disks/Mass storage - Re
299   #device         firewire        # FireWire bus code
300   #device         sbp             # SCSI over FireWire (Requires scbus and da)
301   #device         fwe             # Ethernet over FireWire (non-standard!)
302 + #device         fwip            # IP over FireWire (RFC 2734,3146)
303 + device          dcons           # Dumb console driver
304 + device          dcons_crom      # Configuration ROM for dcons
305  
306   # IPSec - 2006-05-29 Douglas Thrift
307   options         IPSEC                   #IP security
291 options         IPSEC_ESP               #IP security (crypto; define w/ IPSEC)
308  
309   # Soekris - 2008-01-06 Douglas Thrift
310   options         CPU_GEODE

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines