Changeset 2654

Timestamp:

08/25/08 14:49:54 (3 months ago)

Author:

kris

Message:

Updated our amd64 kernel config for PC-BSD 7

Files:

• pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64 (modified) (16 diffs)

pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64

@@ -17 +17 @@
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.18.2.1 2007/12/15 06:32:33 scottl Exp $
-
-machine         amd64
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.11 2008/08/11 20:31:14 jfv Exp $
+
 cpu             HAMMER
 ident           PCBSD
@@ -26 +25 @@
 #hints          "GENERIC.hints"         # Default places to look for devices.
 
-makeoptions     DEBUG=-g                # Build kernel with gdb(1) debug symbols
-
-options         SCHED_4BSD              # 4BSD scheduler
+options         SCHED_ULE               # ULE scheduler
 options         PREEMPTION              # Enable kernel thread preemption
 options         INET                    # InterNETworking
 options         INET6                   # IPv6 communications protocols
+options         SCTP                    # Stream Control Transmission Protocol
 options         FFS                     # Berkeley Fast Filesystem
 options         SOFTUPDATES             # Enable FFS soft updates support
 options         UFS_ACL                 # Support for access control lists
 options         UFS_DIRHASH             # Improve performance on big directories
-options         UFS_GJOURNAL            # Support for journaling on UFS
-options         GEOM_JOURNAL            # Journaling via GEOM
+options         UFS_GJOURNAL            # Enable gjournal-based UFS journaling
+options         GEOM_JOURNAL            # Journaling via GEOM
 options         MD_ROOT                 # MD is a potential root device
 options         NFSCLIENT               # Network Filesystem Client
 options         NFSSERVER               # Network Filesystem Server
 options         NFS_ROOT                # NFS usable as /, requires NFSCLIENT
-options         NTFS                    # NT File System
+options         NTFS
 options         MSDOSFS                 # MSDOS Filesystem
 options         CD9660                  # ISO 9660 Filesystem
-options         UDF                     # UFD Filesystem Support
 options         PROCFS                  # Process filesystem (requires PSEUDOFS)
 options         PSEUDOFS                # Pseudo-filesystem framework
-options         GEOM_GPT                # GUID Partition Tables.
-options         GEOM_UZIP               # Compressed FS support
-options         COMPAT_43               # Needed by COMPAT_LINUX32
+options         LIBICONV
+options         LIBMCHAIN
+options         CD9660_ICONV
+options         MSDOSFS_ICONV
+options         NTFS_ICONV
+options         UDF
+options         UDF_ICONV
+options         GEOM_PART_GPT           # GUID Partition Tables.
+options         GEOM_LABEL              # Provides labelization
+options         COMPAT_43TTY            # BSD 4.3 TTY compat [KEEP THIS!]
 options         COMPAT_IA32             # Compatible with i386 binaries
+options         GEOM_UZIP               # Read-only compressed disks
 options         COMPAT_FREEBSD4         # Compatible with FreeBSD4
 options         COMPAT_FREEBSD5         # Compatible with FreeBSD5
-options         COMPAT_LINUX32          # Compatible with i386 linux binaries 
+options         COMPAT_FREEBSD6         # Compatible with FreeBSD6
 options         SCSI_DELAY=5000         # Delay (in ms) before probing SCSI
 options         KTRACE                  # ktrace(1) support
+options         STACK                   # stack(9) support
 options         SYSVSHM                 # SYSV-style shared memory
 options         SYSVMSG                 # SYSV-style message queues
@@ -63 +69 @@
 options         KBD_INSTALL_CDEV        # install a CDEV entry in /dev
 options         ADAPTIVE_GIANT          # Giant mutex is adaptive.
-options         SCTP                    # Stream Control Transmission Protocol
-
-# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
-device          atpic                   # 8259A compatability
-
-# Linux 32-bit ABI support
-options         LINPROCFS               # Cannot be a module yet.
+options         STOP_NMI                # Stop CPUS using NMI instead of IPI
+options         AUDIT                   # Security event auditing
+
+# Make an SMP-capable kernel by default
+options         SMP                     # Symmetric MultiProcessor Kernel
+
+# CPU frequency control
+device          cpufreq
 
 # Bus support.
@@ -85 +92 @@
 device          atapifd         # ATAPI floppy drives
 device          atapist         # ATAPI tape drives
-device          atapicam        # Cam control support
 #options        ATA_STATIC_ID   # Static device numbering
+device          atapicam        # Atapi CAM Support
 
 # SCSI Controllers
@@ -96 +103 @@
                                         # output.  Adds ~215k to driver.
 device          amd             # AMD 53C974 (Tekram DC-390(T))
+device          hptiop          # Highpoint RocketRaid 3xxx series
 device          isp             # Qlogic family
 #device         ispfw           # Firmware for QLogic HBAs- normally a module
@@ -107 +115 @@
 device          aic             # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
 device          bt              # Buslogic/Mylex MultiMaster SCSI adapters
-
 
 # SCSI peripherals
@@ -125 +132 @@
 device          hptmv           # Highpoint RocketRAID 182x
 device          hptrr           # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
-device          rr232x          # Highpoint RocketRAID 232x
 device          iir             # Intel Integrated RAID
 device          ips             # IBM (Adaptec) ServeRAID
@@ -137 +143 @@
 device          mfi             # LSI MegaRAID SAS
 device          mlx             # Mylex DAC960 family
-#XXX pointer/int warnings
-#device         pst             # Promise Supertrak SX6000
 device          twe             # 3ware ATA RAID
 
@@ -165 +169 @@
 # Serial (COM) ports
 device          sio             # 8250, 16[45]50 based serial ports
+device          uart            # Generic UART driver
 
 # Parallel port
@@ -176 +181 @@
 # If you've got a "dumb" serial or parallel PCI card that is
 # supported by the puc(4) glue driver, uncomment the following
-# line to enable it (connects to the sio and/or ppc drivers):
+# line to enable it (connects to sio, uart and/or ppc drivers):
 #device         puc
 
 # PCI Ethernet NICs.
 device          de              # DEC/Intel DC21x4x (``Tulip'')
-device          em              # Intel PRO/1000 adapter Gigabit Ethernet Card
+device          em              # Intel PRO/1000 Gigabit Ethernet Family
+device          igb             # Intel PRO/1000 PCIE Server Gigabit Family
 device          ixgb            # Intel PRO/10GbE Ethernet Card
 device          le              # AMD Am7900 LANCE and Am79C9xx PCnet
@@ -190 +196 @@
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device          miibus          # MII bus support
+device          age             # Attansic/Atheros L1 Gigabit Ethernet
 device          bce             # Broadcom BCM5706/BCM5708 Gigabit Ethernet
 device          bfe             # Broadcom BCM440x 10/100 Ethernet
 device          bge             # Broadcom BCM570xx Gigabit Ethernet
 device          dc              # DEC/Intel 21143 and various workalikes
+device          et              # Agere ET1310 10/100/Gigabit Ethernet
 device          fxp             # Intel EtherExpress PRO/100B (82557, 82558)
+device          jme             # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
 device          lge             # Level 1 LXT1001 gigabit Ethernet
 device          msk             # Marvell/SysKonnect Yukon II Gigabit Ethernet
+device          nfe             # nVidia nForce MCP on-board Ethernet
 device          nge             # NatSemi DP83820 gigabit Ethernet
-device          nfe             # nVidia nForce MCP on-board Ethernet Networking
+#device         nve             # nVidia nForce MCP on-board Ethernet Networking
 device          pcn             # AMD Am79C97x PCI 10/100 (precedence over 'le')
 device          re              # RealTek 8139C+/8169/8169S/8110S
@@ -229 +239 @@
 device          wlan_ccmp       # 802.11 CCMP support
 device          wlan_tkip       # 802.11 TKIP support
+device          wlan_amrr       # AMRR transmit rate control algorithm
+device          wlan_scan_ap    # 802.11 AP mode scanning
+device          wlan_scan_sta   # 802.11 STA mode scanning
 device          an              # Aironet 4500/4800 802.11 wireless NICs.
 device          ath             # Atheros pci/cardbus NIC's
@@ -236 +249 @@
 device          ral             # Ralink Technology RT2500 wireless NICs.
 device          wi              # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
+#device         wl              # Older non 802.11 Wavelan wireless NIC.
+device          iwi             # Intel Wireless Adapters
+device          ipw             # Intel Wireless Adapters
+device          wpi             # Intel WPI adapters
+device          firmware        # firmware assist module
+
 
 # Pseudo devices.
@@ -263 +282 @@
 device          uhid            # "Human Interface Devices"
 device          ukbd            # Keyboard
-device          ulpt            # Printer
+#device         ulpt            # Printer
 device          umass           # Disks/Mass storage - Requires scbus and da
 device          ums             # Mouse
@@ -269 +288 @@
 device          urio            # Diamond Rio 500 MP3 player
 device          uscanner        # Scanners
+# USB Serial devices
+device          ucom            # Generic com ttys
+device          uark            # Technologies ARK3116 based serial adapters
+device          ubsa            # Belkin F5U103 and compatible serial adapters
+device          ubser           # BWCT console serial adapters
+device          uftdi           # For FTDI usb serial adapters
+device          uipaq           # Some WinCE based devices
+device          uplcom          # Prolific PL-2303 serial adapters
+device          uslcom          # SI Labs CP2101/CP2102 serial adapters
+device          uvisor          # Visor and Palm devices
+device          uvscom          # USB serial support for DDI pocket's PHS
 # USB Ethernet, requires miibus
 device          aue             # ADMtek USB Ethernet
@@ -281 +311 @@
 device          sbp             # SCSI over FireWire (Requires scbus and da)
 device          fwe             # Ethernet over FireWire (non-standard!)
+device          fwip            # IP over FireWire (RFC 2734,3146)
+device          dcons           # Dumb console driver
+device          dcons_crom      # Configuration ROM for dcons
+
 
 # Enable IPFIREWALL / IPDIVERT for natd to work properly
-options         IPFIREWALL
-options         IPFIREWALL_DEFAULT_TO_ACCEPT
-options         IPDIVERT
-
-
-device          pf
-device          pflog
-device          pfsync
-
-options         ALTQ
-options         ALTQ_CBQ
-options         ALTQ_RED
-options         ALTQ_RIO
-options         ALTQ_HFSC
-options         ALTQ_CDNR
-options         ALTQ_PRIQ
-options         ALTQ_NOPCC
-
-options         SMP                     # Enable SMP support by default
+options         IPFIREWALL
+options         IPFIREWALL_DEFAULT_TO_ACCEPT
+options         IPDIVERT
+
+device          pf
+device          pflog
+device          pfsync
+
+options         ALTQ
+options         ALTQ_CBQ
+options         ALTQ_RED
+options         ALTQ_RIO
+options         ALTQ_HFSC
+options         ALTQ_CDNR
+options         ALTQ_PRIQ
+options         ALTQ_NOPCC
+