MFC: r272258
- Cosmetic changes. - Reduce diffs against i386. MFC: 272259 MFi386: Enable QUOTA, PRINTF_BUFR_SIZE and puc.
This commit is contained in:
nyan
parent
027712baa4
commit
562d29cc36
@ -35,6 +35,7 @@ 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 # Enable gjournal-based UFS journaling
|
||||
options QUOTA # Enable disk quotas for UFS
|
||||
options MD_ROOT # MD is a potential root device
|
||||
options NFSCL # New Network Filesystem Client
|
||||
options NFSD # New Network Filesystem Server
|
||||
@ -60,6 +61,7 @@ options SYSVSHM # SYSV-style shared memory
|
||||
options SYSVMSG # SYSV-style message queues
|
||||
options SYSVSEM # SYSV-style semaphores
|
||||
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
|
||||
options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
|
||||
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
|
||||
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
|
||||
options AUDIT # Security event auditing
|
||||
@ -67,9 +69,11 @@ options CAPABILITY_MODE # Capsicum capability mode
|
||||
options CAPABILITIES # Capsicum capabilities
|
||||
options PROCDESC # Support for process descriptors
|
||||
options MAC # TrustedBSD MAC Framework
|
||||
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
||||
options KDB # Kernel debugger related code
|
||||
options KDB_TRACE # Print a stack trace for a panic
|
||||
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
||||
|
||||
# Debugging support. Always need this:
|
||||
options KDB # Enable kernel debugger support.
|
||||
options KDB_TRACE # Print a stack trace for a panic.
|
||||
|
||||
# To make an SMP kernel, the next two lines are needed
|
||||
#options SMP # Symmetric MultiProcessor Kernel
|
||||
@ -82,47 +86,48 @@ device pci
|
||||
device fdc
|
||||
|
||||
# ATA controllers
|
||||
device ahci # AHCI-compatible SATA controllers
|
||||
device ata # Legacy ATA/SATA controllers
|
||||
options ATA_STATIC_ID # Static device numbering
|
||||
device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
|
||||
device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
|
||||
device ahci # AHCI-compatible SATA controllers
|
||||
device ata # Legacy ATA/SATA controllers
|
||||
options ATA_STATIC_ID # Static device numbering
|
||||
device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
|
||||
device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
|
||||
|
||||
# SCSI Controllers
|
||||
device adv # Advansys SCSI adapters
|
||||
device ahc # AHA2940 and onboard AIC7xxx devices
|
||||
device esp # AMD Am53C974 (Tekram DC-390(T))
|
||||
device isp # Qlogic family
|
||||
#device ncr # NCR/Symbios Logic
|
||||
device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
|
||||
device ahc # AHA2940 and onboard AIC7xxx devices
|
||||
device esp # AMD Am53C974 (Tekram DC-390(T))
|
||||
device isp # Qlogic family
|
||||
#device ncr # NCR/Symbios Logic
|
||||
device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
|
||||
|
||||
device aic # PC-9801-100
|
||||
device ct # host adapter using WD33C93[ABC] chip (C bus)
|
||||
device adv # Advansys SCSI adapters
|
||||
device aic # PC-9801-100
|
||||
device ct # host adapter using WD33C93[ABC] chip
|
||||
|
||||
device ncv # NCR 53C500
|
||||
device nsp # Workbit Ninja SCSI-3
|
||||
device stg # TMC 18C30/18C50
|
||||
device ncv # NCR 53C500
|
||||
device nsp # Workbit Ninja SCSI-3
|
||||
device stg # TMC 18C30/18C50
|
||||
|
||||
# ATA/SCSI peripherals
|
||||
device scbus # SCSI bus (required for ATA/SCSI)
|
||||
device ch # SCSI media changers
|
||||
device da # Direct Access (disks)
|
||||
device sa # Sequential Access (tape etc)
|
||||
device cd # CD
|
||||
device pass # Passthrough device (direct ATA/SCSI access)
|
||||
device ses # Enclosure Services (SES and SAF-TE)
|
||||
device scbus # SCSI bus (required for ATA/SCSI)
|
||||
device ch # SCSI media changers
|
||||
device da # Direct Access (disks)
|
||||
device sa # Sequential Access (tape etc)
|
||||
device cd # CD
|
||||
device pass # Passthrough device (direct ATA/SCSI access)
|
||||
device ses # Enclosure Services (SES and SAF-TE)
|
||||
#device ctl # CAM Target Layer
|
||||
|
||||
# keyboard driver
|
||||
device pckbd # PC98 keyboard
|
||||
device pckbd # PC98 keyboard
|
||||
|
||||
device gdc # GDC screen
|
||||
device gdc # GDC screen
|
||||
|
||||
device splash # Splash screen and screen saver support
|
||||
device splash # Splash screen and screen saver support
|
||||
|
||||
# syscons is the default console driver, resembling an SCO console
|
||||
device sc
|
||||
|
||||
#device agp # support several AGP chipsets
|
||||
#device agp # support several AGP chipsets
|
||||
|
||||
# Power management support (see NOTES for more options)
|
||||
#device apm
|
||||
@ -134,114 +139,116 @@ device sc
|
||||
|
||||
# PCCARD (PCMCIA) support
|
||||
# PCMCIA and cardbus bridge support
|
||||
device cbb # cardbus (yenta) bridge
|
||||
device pccard # PC Card (16-bit) bus
|
||||
device cardbus # CardBus (32-bit) bus
|
||||
device cbb # cardbus (yenta) bridge
|
||||
device pccard # PC Card (16-bit) bus
|
||||
device cardbus # CardBus (32-bit) bus
|
||||
|
||||
# Serial (COM) ports
|
||||
#options COM_MULTIPORT
|
||||
#options COM_ESP # ESP98
|
||||
#device sio # 8250, 16[45]50, 8251 based serial ports
|
||||
device uart # Generic UART driver
|
||||
#options COM_ESP # ESP98
|
||||
#device sio # 8250, 16[45]50, 8251 based serial ports
|
||||
device uart # Generic UART driver
|
||||
|
||||
device mse
|
||||
#device joy
|
||||
|
||||
# NEW Parallel port
|
||||
# Parallel port
|
||||
device ppc
|
||||
device ppbus # Parallel port bus (required)
|
||||
device lpt # Printer
|
||||
device ppi # Parallel port interface device
|
||||
#device vpo # Requires scbus and da
|
||||
device ppbus # Parallel port bus (required)
|
||||
device lpt # Printer
|
||||
device ppi # Parallel port interface device
|
||||
#device vpo # Requires scbus and da
|
||||
# OLD Parallel port
|
||||
#device olpt
|
||||
|
||||
device puc # Multi I/O cards and multi-channel UARTs
|
||||
|
||||
# PCI Ethernet NICs.
|
||||
device de # DEC/Intel DC21x4x (``Tulip'')
|
||||
#device em # Intel PRO/1000 adapter Gigabit Ethernet Card
|
||||
device le # AMD Am7900 LANCE and Am79C9xx PCnet
|
||||
#device ti # Alteon Networks Tigon I/II gigabit Ethernet
|
||||
device txp # 3Com 3cR990 (``Typhoon'')
|
||||
device vx # 3Com 3c590, 3c595 (``Vortex'')
|
||||
device de # DEC/Intel DC21x4x (``Tulip'')
|
||||
#device em # Intel PRO/1000 Gigabit Ethernet Family
|
||||
device le # AMD Am7900 LANCE and Am79C9xx PCnet
|
||||
#device ti # Alteon Networks Tigon I/II gigabit Ethernet
|
||||
device txp # 3Com 3cR990 (``Typhoon'')
|
||||
device vx # 3Com 3c590, 3c595 (``Vortex'')
|
||||
|
||||
# PCI Ethernet NICs that use the common MII bus controller code.
|
||||
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
|
||||
device miibus # MII bus support
|
||||
device bfe # Broadcom BCM440x 10/100 Ethernet
|
||||
#device bge # Broadcom BCM570xx Gigabit Ethernet
|
||||
device dc # DEC/Intel 21143 and various workalikes
|
||||
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
|
||||
#device lge # Level 1 LXT1001 gigabit Ethernet
|
||||
#device nge # NatSemi DP83820 gigabit Ethernet
|
||||
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
|
||||
device re # RealTek 8139C+/8169/8169S/8110S
|
||||
device rl # RealTek 8129/8139
|
||||
device sf # Adaptec AIC-6915 (``Starfire'')
|
||||
device sis # Silicon Integrated Systems SiS 900/SiS 7016
|
||||
#device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
|
||||
device ste # Sundance ST201 (D-Link DFE-550TX)
|
||||
device tl # Texas Instruments ThunderLAN
|
||||
device tx # SMC EtherPower II (83c170 ``EPIC'')
|
||||
#device vge # VIA VT612x gigabit Ethernet
|
||||
device vr # VIA Rhine, Rhine II
|
||||
device wb # Winbond W89C840F
|
||||
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
|
||||
device miibus # MII bus support
|
||||
device bfe # Broadcom BCM440x 10/100 Ethernet
|
||||
#device bge # Broadcom BCM570xx Gigabit Ethernet
|
||||
device dc # DEC/Intel 21143 and various workalikes
|
||||
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
|
||||
#device lge # Level 1 LXT1001 gigabit Ethernet
|
||||
#device nge # NatSemi DP83820 gigabit Ethernet
|
||||
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
|
||||
device re # RealTek 8139C+/8169/8169S/8110S
|
||||
device rl # RealTek 8129/8139
|
||||
device sf # Adaptec AIC-6915 (``Starfire'')
|
||||
device sis # Silicon Integrated Systems SiS 900/SiS 7016
|
||||
#device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
|
||||
device ste # Sundance ST201 (D-Link DFE-550TX)
|
||||
device tl # Texas Instruments ThunderLAN
|
||||
device tx # SMC EtherPower II (83c170 ``EPIC'')
|
||||
#device vge # VIA VT612x gigabit Ethernet
|
||||
device vr # VIA Rhine, Rhine II
|
||||
device wb # Winbond W89C840F
|
||||
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
|
||||
|
||||
# ISA Ethernet NICs. pccard NICs included.
|
||||
# 'device ed' requires 'device miibus'
|
||||
device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
|
||||
device ep # Etherlink III based cards
|
||||
device fe # Fujitsu MB8696x based cards
|
||||
device sn # SMC's 9000 series of Ethernet chips
|
||||
device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
|
||||
device ep # Etherlink III based cards
|
||||
device fe # Fujitsu MB8696x based cards
|
||||
device sn # SMC's 9000 series of Ethernet chips
|
||||
device snc
|
||||
device xe # Xircom pccard Ethernet
|
||||
device xe # Xircom pccard Ethernet
|
||||
|
||||
# Wireless NIC cards
|
||||
#device wlan # 802.11 support
|
||||
#options IEEE80211_DEBUG # enable debug msgs
|
||||
#device wlan # 802.11 support
|
||||
#options IEEE80211_DEBUG # enable debug msgs
|
||||
#options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
|
||||
options IEEE80211_SUPPORT_MESH # enable 802.11s draft support
|
||||
#device wlan_wep # 802.11 WEP support
|
||||
#device wlan_ccmp # 802.11 CCMP support
|
||||
#device wlan_tkip # 802.11 TKIP support
|
||||
#device wlan_amrr # AMRR transmit rate control algorithm
|
||||
#device an # Aironet 4500/4800 802.11 wireless NICs.
|
||||
#device ath # Atheros NICs
|
||||
#device ath_pci # Atheros pci/cardbus glue
|
||||
#device ath_hal # pci/cardbus chip support
|
||||
#device wlan_wep # 802.11 WEP support
|
||||
#device wlan_ccmp # 802.11 CCMP support
|
||||
#device wlan_tkip # 802.11 TKIP support
|
||||
#device wlan_amrr # AMRR transmit rate control algorithm
|
||||
#device an # Aironet 4500/4800 802.11 wireless NICs.
|
||||
#device ath # Atheros NICs
|
||||
#device ath_pci # Atheros pci/cardbus glue
|
||||
#device ath_hal # pci/cardbus chip support
|
||||
options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
|
||||
#device ath_rate_sample # SampleRate tx rate control for ath
|
||||
#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 ath_rate_sample # SampleRate tx rate control for ath
|
||||
#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.
|
||||
|
||||
# Pseudo devices.
|
||||
device loop # Network loopback
|
||||
device random # Entropy device
|
||||
device ether # Ethernet support
|
||||
device vlan # 802.1Q VLAN support
|
||||
device tun # Packet tunnel.
|
||||
device md # Memory "disks"
|
||||
device gif # IPv6 and IPv4 tunneling
|
||||
device faith # IPv6-to-IPv4 relaying (translation)
|
||||
device firmware # firmware assist module
|
||||
device loop # Network loopback
|
||||
device random # Entropy device
|
||||
device ether # Ethernet support
|
||||
device vlan # 802.1Q VLAN support
|
||||
device tun # Packet tunnel.
|
||||
device md # Memory "disks"
|
||||
device gif # IPv6 and IPv4 tunneling
|
||||
device faith # IPv6-to-IPv4 relaying (translation)
|
||||
device firmware # firmware assist module
|
||||
|
||||
# The `bpf' device enables the Berkeley Packet Filter.
|
||||
# Be aware of the administrative consequences of enabling this!
|
||||
# Note that 'bpf' is required for DHCP.
|
||||
device bpf # Berkeley packet filter
|
||||
device bpf # Berkeley packet filter
|
||||
|
||||
# USB support
|
||||
#options USB_DEBUG # enable debug msgs
|
||||
#device uhci # UHCI PCI->USB interface
|
||||
#device ohci # OHCI PCI->USB interface
|
||||
#device ehci # EHCI PCI->USB interface (USB 2.0)
|
||||
#device usb # USB Bus (required)
|
||||
#device ukbd # Keyboard
|
||||
#device umass # Disks/Mass storage - Requires scbus and da
|
||||
#options USB_DEBUG # enable debug msgs
|
||||
#device uhci # UHCI PCI->USB interface
|
||||
#device ohci # OHCI PCI->USB interface
|
||||
#device ehci # EHCI PCI->USB interface (USB 2.0)
|
||||
#device usb # USB Bus (required)
|
||||
#device ukbd # Keyboard
|
||||
#device umass # Disks/Mass storage - Requires scbus and da
|
||||
|
||||
# Sound support
|
||||
#device sound # Generic sound driver (required)
|
||||
#device snd_mss # Microsoft Sound System
|
||||
#device "snd_sb16" # Sound Blaster 16
|
||||
#device snd_sbc # Sound Blaster
|
||||
#device sound # Generic sound driver (required)
|
||||
#device snd_mss # Microsoft Sound System
|
||||
#device "snd_sb16" # Sound Blaster 16
|
||||
#device snd_sbc # Sound Blaster
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user