[Midnightbsd-cvs] src [9995] trunk/sys/i386/conf: update configs
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 26 18:17:55 EDT 2018
Revision: 9995
http://svnweb.midnightbsd.org/src/?rev=9995
Author: laffer1
Date: 2018-05-26 18:17:54 -0400 (Sat, 26 May 2018)
Log Message:
-----------
update configs
Modified Paths:
--------------
trunk/sys/i386/conf/DEFAULTS
trunk/sys/i386/conf/GENERIC
trunk/sys/i386/conf/GENERIC.hints
trunk/sys/i386/conf/Makefile
trunk/sys/i386/conf/NOTES
trunk/sys/i386/conf/PAE
trunk/sys/i386/conf/XEN
Removed Paths:
-------------
trunk/sys/i386/conf/ALTQ
trunk/sys/i386/conf/XENHVM
Deleted: trunk/sys/i386/conf/ALTQ
===================================================================
--- trunk/sys/i386/conf/ALTQ 2018-05-26 22:13:37 UTC (rev 9994)
+++ trunk/sys/i386/conf/ALTQ 2018-05-26 22:17:54 UTC (rev 9995)
@@ -1,18 +0,0 @@
-#
-# ALTQ -- Generic kernel configuration file for MidnightBSD/i386 ALTQ
-# Use this for systems with ALTQ support
-#
-# $MidnightBSD$
-
-include GENERIC
-
-ident ALTQ-GENERIC
-
-# To make an ALTQ kernel, the next line is needed
-options ALTQ
-options ALTQ_CBQ
-options ALTQ_RED
-options ALTQ_RIO
-options ALTQ_HFSC
-options ALTQ_CDNR
-options ALTQ_PRIQ
Modified: trunk/sys/i386/conf/DEFAULTS
===================================================================
--- trunk/sys/i386/conf/DEFAULTS 2018-05-26 22:13:37 UTC (rev 9994)
+++ trunk/sys/i386/conf/DEFAULTS 2018-05-26 22:17:54 UTC (rev 9995)
@@ -1,8 +1,8 @@
#
# DEFAULTS -- Default kernel configuration file for MidnightBSD/i386
#
+# $FreeBSD: stable/10/sys/i386/conf/DEFAULTS 232619 2012-03-06 20:01:25Z attilio $
# $MidnightBSD$
-# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.10 2007/06/11 00:38:06 marcel Exp $
machine i386
Modified: trunk/sys/i386/conf/GENERIC
===================================================================
--- trunk/sys/i386/conf/GENERIC 2018-05-26 22:13:37 UTC (rev 9994)
+++ trunk/sys/i386/conf/GENERIC 2018-05-26 22:17:54 UTC (rev 9995)
@@ -1,24 +1,19 @@
#
# GENERIC -- Generic kernel configuration file for MidnightBSD/i386
#
-# http://www.midnightbsd.org/wiki/KernelConfig
-#
# An exhaustive list of options and more detailed explanations of the
# device lines is also present in the ../../conf/NOTES and NOTES files.
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# If you have a 486 CPU, you'll need to build your own kernel. Any processor
-# released before I got my first computer is not supported. Few 486 systems
-# have enough ram to run the installer properly anyway.
-#
# $MidnightBSD$
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.5 2006/01/23 14:19:36 marius Exp $
+cpu I486_CPU
+cpu I586_CPU
cpu I686_CPU
ident GENERIC
-makeoptions DEBUG=-gdwarf-2 # Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
options SCHED_ULE # ULE scheduler
@@ -60,13 +55,21 @@
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
+options CAPABILITY_MODE # Capsicum capability mode
+options CAPABILITIES # Capsicum capabilities
+options PROCDESC # Support for process descriptors
options MAC # TrustedBSD MAC Framework
options KDTRACE_HOOKS # Kernel DTrace hooks
-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 DDB_CTF # kernel ELF linker loads CTF data
+options DDB_CTF # Kernel ELF linker loads CTF data
+options INCLUDE_CONFIG_FILE # Include this file in kernel
+options RACCT # Resource accounting framework
+options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
+options RCTL # Resource limits
+# 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
device apic # I/O APIC
@@ -83,93 +86,107 @@
device fdc
# ATA controllers
-device ahci # AHCI-compatible SATA controllers
-device ata # Legacy ATA/SATA controllers
-options ATA_CAM # Handle legacy controllers with CAM
-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 ahb # EISA AHA1742 family
-device ahc # AHA2940 and onboard AIC7xxx devices
+device ahb # EISA AHA1742 family
+device ahc # AHA2940 and onboard AIC7xxx devices
options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~128k to driver.
-device ahd # AHA39320/29320 and onboard AIC79xx devices
+device ahd # AHA39320/29320 and onboard AIC79xx devices
options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~215k to driver.
-device esp # AMD Am53C974 (Tekram DC-390(T))
-device hptiop # Highpoint RocketRaid 3xxx series
-device isp # Qlogic family
-#device ispfw # Firmware for QLogic HBAs- normally a module
-device mpt # LSI-Logic MPT-Fusion
-#device ncr # NCR/Symbios Logic
-device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
-device trm # Tekram DC395U/UW/F DC315U adapters
+device esp # AMD Am53C974 (Tekram DC-390(T))
+device hptiop # Highpoint RocketRaid 3xxx series
+device isp # Qlogic family
+#device ispfw # Firmware for QLogic HBAs- normally a module
+device mpt # LSI-Logic MPT-Fusion
+device mps # LSI-Logic MPT-Fusion 2
+device mpr # LSI-Logic MPT-Fusion 3
+#device ncr # NCR/Symbios Logic
+device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
+device trm # Tekram DC395U/UW/F DC315U adapters
-device adv # Advansys SCSI adapters
-device adw # Advansys wide SCSI adapters
-device aha # Adaptec 154x SCSI adapters
-device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
-device bt # Buslogic/Mylex MultiMaster SCSI adapters
+device adv # Advansys SCSI adapters
+device adw # Advansys wide SCSI adapters
+device aha # Adaptec 154x SCSI adapters
+device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
+device bt # Buslogic/Mylex MultiMaster SCSI adapters
-device ncv # NCR 53C500
-device nsp # Workbit Ninja SCSI-3
-device stg # TMC 18C30/18C50
-device isci # Intel C600 SAS controller
+device ncv # NCR 53C500
+device nsp # Workbit Ninja SCSI-3
+device stg # TMC 18C30/18C50
+device isci # Intel C600 SAS controller
# 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 ctl # CAM Target Layer
+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
# RAID controllers interfaced to the SCSI subsystem
-device amr # AMI MegaRAID
-device arcmsr # Areca SATA II RAID
-device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
-device ciss # Compaq Smart RAID 5*
-device dpt # DPT Smartcache III, IV - See NOTES for options
-device hptmv # Highpoint RocketRAID 182x
-device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
-device hpt27xx # Highpoint RocketRAID 27xx
-device iir # Intel Integrated RAID
-device ips # IBM (Adaptec) ServeRAID
-device mly # Mylex AcceleRAID/eXtremeRAID
-device twa # 3ware 9000 series PATA/SATA RAID
-device tws # LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller
+device amr # AMI MegaRAID
+device arcmsr # Areca SATA II RAID
+device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
+device ciss # Compaq Smart RAID 5*
+device dpt # DPT Smartcache III, IV - See NOTES for options
+device hptmv # Highpoint RocketRAID 182x
+device hptnr # Highpoint DC7280, R750
+device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
+device hpt27xx # Highpoint RocketRAID 27xx
+device iir # Intel Integrated RAID
+device ips # IBM (Adaptec) ServeRAID
+device mly # Mylex AcceleRAID/eXtremeRAID
+device twa # 3ware 9000 series PATA/SATA RAID
+device tws # LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller
# RAID controllers
-device aac # Adaptec FSA RAID
-device aacp # SCSI passthrough for aac (requires CAM)
-device ida # Compaq Smart RAID
-device mfi # LSI MegaRAID SAS
-device mlx # Mylex DAC960 family
-device pst # Promise Supertrak SX6000
-device twe # 3ware ATA RAID
+device aac # Adaptec FSA RAID
+device aacp # SCSI passthrough for aac (requires CAM)
+device aacraid # Adaptec by PMC RAID
+device ida # Compaq Smart RAID
+device mfi # LSI MegaRAID SAS
+device mlx # Mylex DAC960 family
+device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s
+#XXX PCI ID conflicts with ahd(4) and mvs(4)
+#device pmspcv # PMC-Sierra SAS/SATA Controller driver
+device pst # Promise Supertrak SX6000
+device twe # 3ware ATA RAID
+# NVM Express (NVMe) support
+device nvme # base NVMe driver
+device nvd # expose NVMe namespace as disks, depends on nvme
+
# atkbdc0 controls both the keyboard and the PS/2 mouse
-device atkbdc # AT keyboard controller
-device atkbd # AT keyboard
-device psm # PS/2 mouse
+device atkbdc # AT keyboard controller
+device atkbd # AT keyboard
+device psm # PS/2 mouse
-device kbdmux # keyboard multiplexer
+device kbdmux # keyboard multiplexer
-device vga # VGA video card driver
-options VESA # Add support for VESA BIOS Extensions (VBE)
+device vga # VGA video card driver
+options VESA # Add support for VESA BIOS Extensions (VBE)
-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
-options SC_PIXEL_MODE # add support for the raster text mode
+options SC_PIXEL_MODE # add support for the raster text mode
-device agp # support several AGP chipsets
+# vt is the new video console driver
+device vt
+device vt_vga
+device agp # support several AGP chipsets
+
# Power management support (see NOTES for more options)
#device apm
# Add suspend/resume support for the i8254.
@@ -177,186 +194,171 @@
# 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
-device uart # Generic UART driver
+device uart # Generic UART driver
# Parallel port
device ppc
-device ppbus # Parallel port bus (required)
-device lpt # Printer
-device plip # TCP/IP over parallel
-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
-device puc # Multi I/O cards and multi-channel UARTs
+device puc # Multi I/O cards and multi-channel UARTs
# PCI Ethernet NICs.
-device bxe # Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet
-device de # DEC/Intel DC21x4x (``Tulip'')
-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
-device ti # Alteon Networks Tigon I/II gigabit Ethernet
-device txp # 3Com 3cR990 (``Typhoon'')
-device vx # 3Com 3c590, 3c595 (``Vortex'')
+device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
+device de # DEC/Intel DC21x4x (``Tulip'')
+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
+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 ae # Attansic/Atheros L2 FastEthernet
-device age # Attansic/Atheros L1 Gigabit Ethernet
-device alc # Atheros AR8131/AR8132 Ethernet
-device ale # Atheros AR8121/AR8113/AR8114 Ethernet
-device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
-device bfe # Broadcom BCM440x 10/100 Ethernet
-device bge # Broadcom BCM570xx Gigabit Ethernet
-device cas # Sun Cassini/Cassini+ and NS DP83065 Saturn
-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 gem # Sun GEM/Sun ERI/Apple GMAC
-device hme # Sun HME (Happy Meal Ethernet)
-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 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
-device rl # RealTek 8129/8139
-device sf # Adaptec AIC-6915 (``Starfire'')
-device sge # Silicon Integrated Systems SiS190/191
-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 stge # Sundance/Tamarack TC9021 gigabit Ethernet
-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 vte # DM&P Vortex86 RDC R6040 Fast Ethernet
-device wb # Winbond W89C840F
-device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
+device miibus # MII bus support
+device ae # Attansic/Atheros L2 FastEthernet
+device age # Attansic/Atheros L1 Gigabit Ethernet
+device alc # Atheros AR8131/AR8132 Ethernet
+device ale # Atheros AR8121/AR8113/AR8114 Ethernet
+device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
+device bfe # Broadcom BCM440x 10/100 Ethernet
+device bge # Broadcom BCM570xx Gigabit Ethernet
+device cas # Sun Cassini/Cassini+ and NS DP83065 Saturn
+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 gem # Sun GEM/Sun ERI/Apple GMAC
+device hme # Sun HME (Happy Meal Ethernet)
+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 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
+device rl # RealTek 8129/8139
+device sf # Adaptec AIC-6915 (``Starfire'')
+device sge # Silicon Integrated Systems SiS190/191
+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 stge # Sundance/Tamarack TC9021 gigabit Ethernet
+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 vte # DM&P Vortex86 RDC R6040 Fast Ethernet
+device wb # Winbond W89C840F
+device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
# ISA Ethernet NICs. pccard NICs included.
-device cs # Crystal Semiconductor CS89x0 NIC
+device cs # Crystal Semiconductor CS89x0 NIC
# 'device ed' requires 'device miibus'
-device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
-device ex # Intel EtherExpress Pro/10 and Pro/10+
-device ep # Etherlink III based cards
-device fe # Fujitsu MB8696x based cards
-device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
-device sn # SMC's 9000 series of Ethernet chips
-device xe # Xircom pccard Ethernet
+device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
+device ex # Intel EtherExpress Pro/10 and Pro/10+
+device ep # Etherlink III based cards
+device fe # Fujitsu MB8696x based cards
+device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
+device sn # SMC's 9000 series of Ethernet chips
+device xe # Xircom pccard Ethernet
# Wireless NIC cards
-device wlan # 802.11 support
-options IEEE80211_DEBUG # enable debug msgs
-options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
+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 bwi # Broadcom BCM430x/BCM431x wireless NICs.
-#device bwn # Broadcom BCM43xx wireless NICs.
-device ipw # Intel 2100 wireless NICs.
-device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs.
-device iwn # Intel 4965/1000/5000/6000 wireless NICs.
-device malo # Marvell Libertas wireless NICs.
-device mwl # Marvell 88W8363 802.11n wireless NICs.
-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 wpi # Intel 3945ABG wireless NICs.
+options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation
+options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later
+device ath_rate_sample # SampleRate tx rate control for ath
+#device bwi # Broadcom BCM430x/BCM431x wireless NICs.
+#device bwn # Broadcom BCM43xx wireless NICs.
+device ipw # Intel 2100 wireless NICs.
+device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs.
+device iwn # Intel 4965/1000/5000/6000 wireless NICs.
+device malo # Marvell Libertas wireless NICs.
+device mwl # Marvell 88W8363 802.11n wireless NICs.
+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 wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
-device loop # Network loopback
-device random # Entropy device
-options PADLOCK_RNG # VIA Padlock RNG
-options RDRAND_RNG # Intel Bull Mountain RNG
-device ether # Ethernet support
-device vlan # 802.1Q VLAN support
-device tun # Packet tunnel.
-device pty # BSD-style compatibility pseudo ttys
-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 padlock_rng # VIA Padlock RNG
+device rdrand_rng # Intel Bull Mountain RNG
+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 xhci # XHCI PCI->USB interface (USB 3.0)
-device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices (needs netgraph)
-device uhid # "Human Interface Devices"
-device ukbd # Keyboard
-device ulpt # Printer
-device umass # Disks/Mass storage - Requires scbus and da
-device ums # Mouse
-device urio # Diamond Rio 500 MP3 player
-# USB Serial devices
-device u3g # USB-based 3G modems (Option, Huawei, Sierra)
-device uark # Technologies ARK3116 based serial adapters
-device ubsa # Belkin F5U103 and compatible 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
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
-device rue # RealTek RTL8150 USB Ethernet
-device udav # Davicom DM9601E USB
-# USB Wireless
-device rum # Ralink Technology RT2501USB wireless NICs
-device run # Ralink Technology RT2700/RT2800/RT3000 NICs.
-device uath # Atheros AR5523 wireless NICs
-device upgt # Conexant/Intersil PrismGT wireless NICs.
-device ural # Ralink Technology RT2500USB wireless NICs
-device urtw # Realtek RTL8187B/L wireless NICs
-device zyd # ZyDAS zd1211/zd1211b wireless NICs
+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 xhci # XHCI PCI->USB interface (USB 3.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_cmi # CMedia CMI8338/CMI8738
-device snd_csa # Crystal Semiconductor CS461x/428x
-device snd_emu10kx # Creative SoundBlaster Live! and Audigy
-device snd_es137x # Ensoniq AudioPCI ES137x
-device snd_hda # Intel High Definition Audio
-device snd_ich # Intel, NVidia and other ICH AC'97 Audio
-device snd_uaudio # USB Audio
-device snd_via8233 # VIA VT8233x Audio
+device sound # Generic sound driver (required)
+device snd_cmi # CMedia CMI8338/CMI8738
+device snd_csa # Crystal Semiconductor CS461x/428x
+device snd_emu10kx # Creative SoundBlaster Live! and Audigy
+device snd_es137x # Ensoniq AudioPCI ES137x
+device snd_hda # Intel High Definition Audio
+device snd_ich # Intel, NVidia and other ICH AC'97 Audio
+device snd_via8233 # VIA VT8233x Audio
+# MMC/SD
+device mmc # MMC/SD bus
+device mmcsd # MMC/SD memory card
+device sdhci # Generic PCI SD Host Controller
+
# VirtIO support
-device virtio # Generic VirtIO bus (required)
-device virtio_pci # VirtIO PCI Interface
-device vtnet # VirtIO Ethernet device
-device virtio_blk # VirtIO Block device
-device virtio_scsi # VirtIO SCSI device
-device virtio_balloon # VirtIO Memory Balloon device
+device virtio # Generic VirtIO bus (required)
+device virtio_pci # VirtIO PCI device
+device vtnet # VirtIO Ethernet device
+device virtio_blk # VirtIO Block device
+device virtio_scsi # VirtIO SCSI device
+device virtio_balloon # VirtIO Memory Balloon device
+
+# HyperV drivers and enchancement support
+options HYPERV # Hyper-V kernel infrastructure
+device hyperv # HyperV drivers
+
+# Xen HVM Guest Optimizations
+# NOTE: XENHVM depends on xenpci. They must be added or removed together.
+options XENHVM # Xen HVM kernel infrastructure
+device xenpci # Xen HVM Hypervisor services driver
+
+# VMware support
+device vmx # VMware VMXNET3 Ethernet
Modified: trunk/sys/i386/conf/GENERIC.hints
===================================================================
--- trunk/sys/i386/conf/GENERIC.hints 2018-05-26 22:13:37 UTC (rev 9994)
+++ trunk/sys/i386/conf/GENERIC.hints 2018-05-26 22:17:54 UTC (rev 9995)
@@ -1,5 +1,5 @@
# $MidnightBSD$
-# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/i386/conf/GENERIC.hints,v 1.17 2007/10/14 10:55:50 netchild Exp $
+# $FreeBSD: stable/10/sys/i386/conf/GENERIC.hints 298957 2016-05-03 07:48:52Z mav $
hint.fdc.0.at="isa"
hint.fdc.0.port="0x3F0"
hint.fdc.0.irq="6"
@@ -39,22 +39,5 @@
hint.attimer.0.at="isa"
hint.attimer.0.port="0x40"
hint.attimer.0.irq="0"
-hint.wbwd.0.at="isa"
hint.acpi_throttle.0.disabled="1"
hint.p4tcc.0.disabled="1"
-hint.fe.0.at="isa"
-hint.fe.0.disabled="1"
-hint.fe.0.port="0x300"
-hint.le.0.at="isa"
-hint.le.0.disabled="1"
-hint.le.0.port="0x280"
-hint.le.0.irq="10"
-hint.le.0.drq="0"
-hint.lm.0.at="isa"
-hint.lm.0.port="0x290"
-hint.it.0.at="isa"
-hint.it.0.port="0x290"
-hint.it.1.at="isa"
-hint.it.1.port="0xc00"
-hint.it.2.at="isa"
-hint.it.2.port="0xd00"
Modified: trunk/sys/i386/conf/Makefile
===================================================================
--- trunk/sys/i386/conf/Makefile 2018-05-26 22:13:37 UTC (rev 9994)
+++ trunk/sys/i386/conf/Makefile 2018-05-26 22:17:54 UTC (rev 9995)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/sys/i386/conf/Makefile,v 1.2 2006/10/01 22:12:20 laffer1 Exp $
-# $FreeBSD: src/sys/i386/conf/Makefile,v 1.9 2003/02/26 23:36:58 ru Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/i386/conf/Makefile 201813 2010-01-08 18:57:31Z bz $
TARGET=i386
Modified: trunk/sys/i386/conf/NOTES
===================================================================
--- trunk/sys/i386/conf/NOTES 2018-05-26 22:13:37 UTC (rev 9994)
+++ trunk/sys/i386/conf/NOTES 2018-05-26 22:17:54 UTC (rev 9995)
@@ -4,9 +4,8 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
+# $FreeBSD: stable/10/sys/i386/conf/NOTES 330680 2018-03-09 02:55:27Z rpokala $
# $MidnightBSD$
-# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1244.2.3.2.1 2008/02/06 03:24:28 scottl Exp $
-#
#
# We want LINT to cover profiling as well.
@@ -314,7 +313,7 @@
# versions.
#
# MAXMEM specifies the amount of RAM on the machine; if this is not
-# specified, BSD will first read the amount of memory from the CMOS
+# specified, FreeBSD will first read the amount of memory from the CMOS
# RAM, so the amount of memory will initially be limited to 64MB or 16MB
# depending on the BIOS. If the BIOS reports 64MB, a memory probe will
# then attempt to detect the installed amount of RAM. If this probe
@@ -382,7 +381,7 @@
device dpms # DPMS suspend & resume via VESA BIOS
# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa
-options X86BIOS
+options X86BIOS
#
# The Numeric Processing eXtension driver. This is non-optional.
@@ -492,6 +491,7 @@
device acpi
options ACPI_DEBUG
+options ACPI_DMAR
# ACPI WMI Mapping driver
device acpi_wmi
@@ -554,6 +554,8 @@
# Network interfaces:
#
+# bxe: Broadcom NetXtreme II (BCM5771X/BCM578XX) PCIe 10Gb Ethernet
+# adapters.
# ce: Cronyx Tau-PCI/32 sync single/dual port G.703/E1 serial adaptor
# with 32 HDLC subchannels (requires sppp (default), or NETGRAPH if
# NETGRAPH_CRONYX is configured)
@@ -578,11 +580,10 @@
# mlx4ib: Mellanox ConnectX HCA InfiniBand
# mlxen: Mellanox ConnectX HCA Ethernet
# mthca: Mellanox HCA InfiniBand
-# mwl: Marvell 88W8363 IEEE 802.11 adapter
-# Requires the mwl firmware module
# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source)
# nve: nVidia nForce MCP on-board Ethernet Networking
# sbni: Granch SBNI12-xx ISA and PCI adapters
+# vmx: VMware VMXNET3 Ethernet (BSD open source)
# wl: Lucent Wavelan (ISA card only).
# wpi: Intel 3945ABG Wireless LAN controller
# Requires the wpi firmware module
@@ -589,6 +590,7 @@
# Order for ISA/EISA devices is important here
+device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
device ce
device cp
device cs # Crystal Semiconductor CS89x0 NIC
@@ -625,7 +627,6 @@
device mlx4ib # Mellanox ConnectX HCA InfiniBand
device mlxen # Mellanox ConnectX HCA Ethernet
device mthca # Mellanox HCA InfiniBand
-device mwl # Marvell 88W8363 802.11n wireless NICs.
device nfe # nVidia nForce MCP on-board Ethernet
device nve # nVidia nForce MCP on-board Ethernet Networking
device sbni
@@ -633,6 +634,7 @@
hint.sbni.0.port="0x210"
hint.sbni.0.irq="0xefdead"
hint.sbni.0.flags="0"
+device vmx # VMware VMXNET3 Ethernet
device wl
hint.wl.0.at="isa"
hint.wl.0.port="0x300"
@@ -660,7 +662,6 @@
# iwn5150fw: Specific module for the 5150 only
# iwn6000fw: Specific module for the 6000 only
# iwn6050fw: Specific module for the 6050 only
-# mwlfw: Marvell 88W8363 firmware
# wpifw: Intel 3945ABG Wireless LAN Controller firmware
device iwifw
@@ -678,7 +679,6 @@
device iwn5150fw
device iwn6000fw
device iwn6050fw
-device mwlfw
device wpifw
#
@@ -720,6 +720,10 @@
device aac
device aacp # SCSI Passthrough interface (optional, CAM required)
+#
+# Adaptec by PMC RAID controllers, Series 6/7/8 and upcoming families
+device aacraid # Container interface, CAM required
+
# The 'asr' driver provides support for current DPT/Adaptec SCSI RAID
# controllers (SmartRAID V and VI and later).
# These controllers require the CAM infrastructure.
@@ -735,6 +739,10 @@
device hptmv
#
+# Highpoint DC7280 and R750.
+device hptnr
+
+#
# Highpoint RocketRAID. Supports RR172x, RR222x, RR2240, RR232x, RR2340,
# RR2210, RR174x, RR2522, RR231x, RR230x.
device hptrr
@@ -744,6 +752,11 @@
device hptiop
#
+# Intel integrated Memory Controller (iMC) SMBus controller
+# Sandybridge-Xeon, Ivybridge-Xeon, Haswell-Xeon, Broadwell-Xeon
+device imcsmb
+
+#
# IBM (now Adaptec) ServeRAID controllers
device ips
@@ -750,9 +763,17 @@
#
# Intel C600 (Patsburg) integrated SAS controller
device isci
-options ISCI_LOGGING # enable debugging in isci HAL
+options ISCI_LOGGING # enable debugging in isci HAL
#
+# NVM Express (NVMe) support
+device nvme # base NVMe driver
+device nvd # expose NVMe namespaces as disks, depends on nvme
+
+#
+# PMC-Sierra SAS/SATA controller
+device pmspcv
+#
# SafeNet crypto driver: can be moved to the MI NOTES as soon as
# it's tested on a big-endian machine
#
@@ -777,7 +798,7 @@
#
# The virtio entry provides a generic bus for use by the device drivers.
# It must be combined with an interface that communicates with the host.
-# Multiple such interfaces defined by the VirtIO specification. BSD
+# Multiple such interfaces defined by the VirtIO specification. FreeBSD
# only has support for PCI. Therefore, virtio_pci must be statically
# compiled in or loaded as a module for the device drivers to function.
#
@@ -787,7 +808,11 @@
device virtio_blk # VirtIO Block device
device virtio_scsi # VirtIO SCSI device
device virtio_balloon # VirtIO Memory Balloon device
+device virtio_random # VirtIO Entropy device
+device virtio_console # VirtIO Console device
+device hyperv # HyperV drivers
+
#####################################################################
#
@@ -843,6 +868,9 @@
device asmc
#device si
device tpm
+device padlock_rng # VIA Padlock RNG
+device rdrand_rng # Intel Bull Mountain RNG
+device aesni # AES-NI OpenCrypto module
#
# Laptop/Notebook options:
@@ -874,6 +902,7 @@
#
# ichwd: Intel ICH watchdog timer
# amdsbwd: AMD SB7xx watchdog timer
+# viawd: VIA south bridge watchdog timer
# wbwd: Winbond watchdog timer
#
device ichwd
@@ -984,6 +1013,9 @@
options NDISAPI
device ndis
+# Linux-specific pseudo devices support
+device lindev
+
#####################################################################
# VM OPTIONS
@@ -1038,3 +1070,6 @@
# asr old ioctls support, needed by raidutils
options ASR_COMPAT
+
+# Module to enable execution of application via emulators like QEMU
+options IMAGACT_BINMISC
Modified: trunk/sys/i386/conf/PAE
===================================================================
--- trunk/sys/i386/conf/PAE 2018-05-26 22:13:37 UTC (rev 9994)
+++ trunk/sys/i386/conf/PAE 2018-05-26 22:17:54 UTC (rev 9995)
@@ -1,8 +1,8 @@
#
-# PAE -- Generic kernel configuration file for MidnightBSD/i386 PAE
+# PAE -- Generic kernel configuration file for FreeBSD/i386 PAE
#
+# $FreeBSD: stable/10/sys/i386/conf/PAE 278424 2015-02-08 23:09:01Z marius $
# $MidnightBSD$
-# $FreeBSD: src/sys/i386/conf/PAE,v 1.16.2.2 2005/11/08 22:28:37 scottl Exp $
include GENERIC
@@ -11,81 +11,14 @@
# To make a PAE kernel, the next option is needed
options PAE # Physical Address Extensions Kernel
-# Don't build modules with this kernel config, since they are not built with
-# the correct options headers.
-makeoptions NO_MODULES=yes
-
-# force isp firmware to fully loaded
-device ispfw
-
-# What follows is a list of drivers that are normally in GENERIC, but either
-# don't work or are untested with PAE. Be very careful before enabling any
-# of these drivers. Drivers which use DMA and don't handle 64 bit physical
-# address properly may cause data corruption when used in a machine with more
-# than 4 gigabytes of memory.
-
-
-nodevice ahb
-nodevice amd
-nodevice sym
-nodevice trm
-
-nodevice adv
-nodevice adw
-nodevice aha
-nodevice aic
-nodevice bt
-
-nodevice ncv
-nodevice nsp
-nodevice stg
-
-nodevice ctl
-
-nodevice asr
+# The following drivers don't build with PAE enabled.
+makeoptions WITHOUT_MODULES="ctl dpt hptmv ida"
nodevice dpt
-nodevice mly
nodevice hptmv
-nodevice hptrr
+nodevice ida
-nodevice ida
-nodevice mlx
+# The following drivers don't work with PAE enabled.
+makeoptions WITHOUT_MODULES+="asr ncr pst"
+nodevice asr
+nodevice ncr
nodevice pst
-
-nodevice agp
-
-nodevice txp
-nodevice vx
-
-nodevice nve
-nodevice pcn
-nodevice sf
-nodevice sis
-nodevice ste
-nodevice tl
-nodevice tx
-nodevice vr
-nodevice wb
-
-nodevice cs
-nodevice ed
-nodevice ex
-nodevice ep
-nodevice fe
-nodevice ie
-nodevice sn
-nodevice xe
-
-nodevice an
-nodevice ath # Atheros pci/cardbus NICs
-nodevice ath_pci
-nodevice ath_hal
-nodevice ath_rate_sample # SampleRate tx rate control for ath
-nodevice ipw
-nodevice iwi
-nodevice iwn
-nodevice malo
-nodevice mwl
-nodevice ral
-nodevice wi
-nodevice wpi
Modified: trunk/sys/i386/conf/XEN
===================================================================
--- trunk/sys/i386/conf/XEN 2018-05-26 22:13:37 UTC (rev 9994)
+++ trunk/sys/i386/conf/XEN 2018-05-26 22:17:54 UTC (rev 9995)
@@ -1,17 +1,25 @@
#
# XEN -- Kernel configuration for i386 XEN DomU
#
+# $FreeBSD: stable/10/sys/i386/conf/XEN 292213 2015-12-14 15:45:11Z hselasky $
# $MidnightBSD$
cpu I686_CPU
ident XEN
-makeoptions DEBUG=-gdwarf-2 # Build kernel with gdb(1) debug symbols
-makeoptions WITHOUT_MODULES="aha ahb amd ctl cxgb dpt drm drm2 hptnr hptmv ida malo mps mwl nve rdma sound sym trm xfs"
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+# The following drivers don't build with PAE or XEN enabled.
+makeoptions WITHOUT_MODULES="ctl cxgb dpt drm drm2 hptmv ida rdma"
+
+# The following drivers don't work with PAE enabled.
+makeoptions WITHOUT_MODULES+="asr ncr pst"
+
+# The following drivers don't build with XEN enabled.
+makeoptions WITHOUT_MODULES+="mlx5 mlx5en"
+
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-#options SCHED_4BSD
options INET # InterNETworking
options INET6 # IPv6 communications protocols
@@ -65,7 +73,6 @@
options SMP # Symmetric MultiProcessor Kernel
device apic # I/O APIC
-
#device atkbdc # AT keyboard controller
#device atkbd # AT keyboard
device psm # PS/2 mouse
@@ -78,13 +85,15 @@
device random # Entropy device
device ether # Ethernet support
device tun # Packet tunnel.
-device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"
device gif # IPv6 and IPv4 tunneling
device faith # IPv6-to-IPv4 relaying (translation)
+# Wireless cards
+options IEEE80211_SUPPORT_MESH
+options AH_SUPPORT_AR5416
+
# 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
-
Deleted: trunk/sys/i386/conf/XENHVM
===================================================================
--- trunk/sys/i386/conf/XENHVM 2018-05-26 22:13:37 UTC (rev 9994)
+++ trunk/sys/i386/conf/XENHVM 2018-05-26 22:17:54 UTC (rev 9995)
@@ -1,22 +0,0 @@
-#
-# XENHVM -- Xen HVM kernel configuration file for MidnightBSD/i386
-#
-# $MidnightBSD$
-#
-include GENERIC
-ident XENHVM
-
-#
-# Adaptive locks rely on a lock-free pointer read to determine the run state
-# of the thread holding a lock when under contention; under a virtualisation
-# system, the thread run state may not accurately reflect whether the thread
-# (or rather its host VCPU) is actually executing. As such, disable this
-# optimisation.
-#
-options NO_ADAPTIVE_MUTEXES
-options NO_ADAPTIVE_RWLOCKS
-options NO_ADAPTIVE_SX
-
-# Xen HVM support
-options XENHVM
-device xenpci
More information about the Midnightbsd-cvs
mailing list