svn commit: r263245 - head/sys/arm/conf
Warner Losh
imp at FreeBSD.org
Sun Mar 16 15:22:48 UTC 2014
Author: imp
Date: Sun Mar 16 15:22:46 2014
New Revision: 263245
URL: http://svnweb.freebsd.org/changeset/base/263245
Log:
Make all the comments '# ' and align to same column. This fixes the
rampently incosnsitent usage which made cut and paste from one file
to another look ugly.
Modified:
head/sys/arm/conf/AC100
head/sys/arm/conf/ARMADAXP
head/sys/arm/conf/ARNDALE
head/sys/arm/conf/ATMEL
head/sys/arm/conf/AVILA
head/sys/arm/conf/BEAGLEBONE
head/sys/arm/conf/BWCT
head/sys/arm/conf/CAMBRIA
head/sys/arm/conf/CNS11XXNAS
head/sys/arm/conf/CRB
head/sys/arm/conf/CUBIEBOARD
head/sys/arm/conf/CUBIEBOARD2
head/sys/arm/conf/DB-78XXX
head/sys/arm/conf/DB-88F5XXX
head/sys/arm/conf/DB-88F6XXX
head/sys/arm/conf/DIGI-CCWMX53
head/sys/arm/conf/DOCKSTAR
head/sys/arm/conf/DREAMPLUG-1001
head/sys/arm/conf/EA3250
head/sys/arm/conf/EB9200
head/sys/arm/conf/EFIKA_MX
head/sys/arm/conf/EP80219
head/sys/arm/conf/ETHERNUT5
head/sys/arm/conf/GUMSTIX
head/sys/arm/conf/HL200
head/sys/arm/conf/HL201
head/sys/arm/conf/IMX53-QSB
head/sys/arm/conf/IMX6
head/sys/arm/conf/IQ31244
head/sys/arm/conf/KB920X
head/sys/arm/conf/LN2410SBC
head/sys/arm/conf/NSLU
head/sys/arm/conf/PANDABOARD
head/sys/arm/conf/QILA9G20
head/sys/arm/conf/RADXA
head/sys/arm/conf/RPI-B
head/sys/arm/conf/SAM9260EK
head/sys/arm/conf/SAM9G20EK
head/sys/arm/conf/SAM9X25EK
head/sys/arm/conf/SHEEVAPLUG
head/sys/arm/conf/SN9G45
head/sys/arm/conf/TS7800
head/sys/arm/conf/VERSATILEPB
head/sys/arm/conf/VYBRID.common
head/sys/arm/conf/WANDBOARD.common
head/sys/arm/conf/ZEDBOARD
Modified: head/sys/arm/conf/AC100
==============================================================================
--- head/sys/arm/conf/AC100 Sun Mar 16 14:42:58 2014 (r263244)
+++ head/sys/arm/conf/AC100 Sun Mar 16 15:22:46 2014 (r263245)
@@ -9,32 +9,32 @@ include "../tegra/std.tegra2"
makeoptions MODULES_OVERRIDE=""
-makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions WERROR="-Werror"
-#options SCHED_ULE #ULE scheduler
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-#options INET6 #IPv6 communications protocols
-options FFS #Berkeley Fast Filesystem
-#options NFSCL #Network Filesystem Client
-#options NFSLOCKD #Network Lock Manager
-#options NFS_ROOT #NFS usable as /, requires NFSCLIENT
+#options SCHED_ULE # ULE scheduler
+options SCHED_4BSD # 4BSD scheduler
+options INET # InterNETworking
+#options INET6 # IPv6 communications protocols
+options FFS # Berkeley Fast Filesystem
+#options NFSCL # Network Filesystem Client
+#options NFSLOCKD # Network Lock Manager
+#options NFS_ROOT # NFS usable as /, requires NFSCLIENT
#options BOOTP
#options BOOTP_NFSROOT
#options BOOTP_NFSV3
#options BOOTP_WIRED_TO=mge0
-options TMPFS #Efficient memory filesystem
-options GEOM_PART_BSD #BSD partition scheme
-options GEOM_PART_MBR #MBR partition scheme
+options TMPFS # Efficient memory filesystem
+options GEOM_PART_BSD # BSD partition scheme
+options GEOM_PART_MBR # MBR partition scheme
options GEOM_PART_GPT
options ROOTDEVNAME=\"ufs:/dev/da0p1\"
-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 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 MUTEX_NOINLINE
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
@@ -48,8 +48,8 @@ options VERBOSE_SYSINIT
options DDB
options GDB
options DIAGNOSTIC
-options INVARIANTS #Enable calls of extra sanity checking
-options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
+options INVARIANTS # Enable calls of extra sanity checking
+options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
options KDB
options KDB_TRACE
#options KTR
@@ -57,8 +57,8 @@ options KDB_TRACE
#options KTR_ENTRIES=16384
#options KTR_MASK=(KTR_SPARE2)
#options KTR_COMPILE=KTR_ALL
-options WITNESS #Enable checks to detect deadlocks and cycles
-options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+options WITNESS # Enable checks to detect deadlocks and cycles
+options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
#options WITNESS_KDB
options MUTEX_DEBUG
Modified: head/sys/arm/conf/ARMADAXP
==============================================================================
--- head/sys/arm/conf/ARMADAXP Sun Mar 16 14:42:58 2014 (r263244)
+++ head/sys/arm/conf/ARMADAXP Sun Mar 16 15:22:46 2014 (r263245)
@@ -10,32 +10,32 @@ include "../mv/armadaxp/std.mv78x60"
options SOC_MV_ARMADAXP
makeoptions MODULES_OVERRIDE=""
-makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions WERROR="-Werror"
-#options SCHED_ULE #ULE scheduler
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-options INET6 #IPv6 communications protocols
-options FFS #Berkeley Fast Filesystem
-options NFSCL #Network Filesystem Client
-options NFSLOCKD #Network Lock Manager
-options NFS_ROOT #NFS usable as /, requires NFSCLIENT
+#options SCHED_ULE # ULE scheduler
+options SCHED_4BSD # 4BSD scheduler
+options INET # InterNETworking
+options INET6 # IPv6 communications protocols
+options FFS # Berkeley Fast Filesystem
+options NFSCL # Network Filesystem Client
+options NFSLOCKD # Network Lock Manager
+options NFS_ROOT # NFS usable as /, requires NFSCLIENT
options BOOTP
options BOOTP_NFSROOT
options BOOTP_NFSV3
options BOOTP_WIRED_TO=mge0
-options TMPFS #Efficient memory filesystem
-options GEOM_PART_BSD #BSD partition scheme
-options GEOM_PART_MBR #MBR partition scheme
+options TMPFS # Efficient memory filesystem
+options GEOM_PART_BSD # BSD partition scheme
+options GEOM_PART_MBR # MBR partition scheme
options GEOM_PART_GPT
options ROOTDEVNAME=\"ufs:/dev/da0p1\"
-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 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 MUTEX_NOINLINE
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
@@ -50,8 +50,8 @@ options ALT_BREAK_TO_DEBUGGER
options DDB
options GDB
#options DIAGNOSTIC
-#options INVARIANTS #Enable calls of extra sanity checking
-#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
+#options INVARIANTS # Enable calls of extra sanity checking
+#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
options KDB
options KDB_TRACE
#options KTR
@@ -59,8 +59,8 @@ options KDB_TRACE
#options KTR_ENTRIES=16384
#options KTR_MASK=(KTR_SPARE2)
#options KTR_COMPILE=KTR_ALL
-#options WITNESS #Enable checks to detect deadlocks and cycles
-#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+#options WITNESS # Enable checks to detect deadlocks and cycles
+#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
#options WITNESS_KDB
# Pseudo devices
Modified: head/sys/arm/conf/ARNDALE
==============================================================================
--- head/sys/arm/conf/ARNDALE Sun Mar 16 14:42:58 2014 (r263244)
+++ head/sys/arm/conf/ARNDALE Sun Mar 16 15:22:46 2014 (r263245)
@@ -24,55 +24,55 @@ include "../samsung/exynos/std.exynos5"
makeoptions MODULES_OVERRIDE=""
makeoptions WITHOUT_MODULES="ahc"
-makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions WERROR="-Werror"
-options HZ=100 ##
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-options INET6 #IPv6 communications protocols
-options GEOM_PART_BSD #BSD partition scheme
-options GEOM_PART_MBR #MBR partition scheme
-options TMPFS #Efficient memory filesystem
-options FFS #Berkeley Fast Filesystem
+options HZ=100
+options SCHED_4BSD # 4BSD scheduler
+options INET # InterNETworking
+options INET6 # IPv6 communications protocols
+options GEOM_PART_BSD # BSD partition scheme
+options GEOM_PART_MBR # MBR partition scheme
+options TMPFS # Efficient memory filesystem
+options FFS # Berkeley Fast Filesystem
options SOFTUPDATES
-options UFS_ACL #Support for access control lists
-options UFS_DIRHASH #Improve performance on big directories
-options MSDOSFS #MSDOS Filesystem
-options CD9660 #ISO 9660 Filesystem
-options PROCFS #Process filesystem (requires PSEUDOFS)
-options PSEUDOFS #Pseudo-filesystem framework
-options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
-options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
+options UFS_ACL # Support for access control lists
+options UFS_DIRHASH # Improve performance on big directories
+options MSDOSFS # MSDOS Filesystem
+options CD9660 # ISO 9660 Filesystem
+options PROCFS # Process filesystem (requires PSEUDOFS)
+options PSEUDOFS # Pseudo-filesystem framework
+options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]
+options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE
-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 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 KBD_INSTALL_CDEV
options PREEMPTION
options FREEBSD_BOOT_LOADER
-options VFP # vfp/neon
+options VFP # vfp/neon
# Debugging
-makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options BREAK_TO_DEBUGGER
-#options VERBOSE_SYSINIT #Enable verbose sysinit messages
+#options VERBOSE_SYSINIT # Enable verbose sysinit messages
options KDB
-options DDB #Enable the kernel debugger
-options INVARIANTS #Enable calls of extra sanity checking
-options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-#options WITNESS #Enable checks to detect deadlocks and cycles
-#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+options DDB # Enable the kernel debugger
+options INVARIANTS # Enable calls of extra sanity checking
+options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
+#options WITNESS # Enable checks to detect deadlocks and cycles
+#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
options DIAGNOSTIC
# NFS support
-options NFSCL #Network Filesystem Client
-options NFSLOCKD #Network Lock Manager
-options NFS_ROOT #NFS usable as /, requires NFSCLIENT
+options NFSCL # Network Filesystem Client
+options NFSLOCKD # Network Lock Manager
+options NFS_ROOT # NFS usable as /, requires NFSCLIENT
# Uncomment this for NFS root
-#options NFS_ROOT #NFS usable as /, requires NFSCL
+#options NFS_ROOT # NFS usable as /, requires NFSCL
#options BOOTP_NFSROOT
#options BOOTP_COMPAT
#options BOOTP
Modified: head/sys/arm/conf/ATMEL
==============================================================================
--- head/sys/arm/conf/ATMEL Sun Mar 16 14:42:58 2014 (r263244)
+++ head/sys/arm/conf/ATMEL Sun Mar 16 15:22:46 2014 (r263245)
@@ -48,13 +48,13 @@ options NFSCL # New Network Filesyste
options NFSD # New Network Filesystem Server
options NFSLOCKD # Network Lock Manager
options NFS_ROOT # NFS usable as /, requires NFSCL
-options TMPFS #Efficient memory filesystem
+options TMPFS # Efficient memory filesystem
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
options PSEUDOFS # Pseudo-filesystem framework
-options GEOM_PART_BSD #BSD partition scheme
-options GEOM_PART_MBR #MBR partition scheme
+options GEOM_PART_BSD # BSD partition scheme
+options GEOM_PART_MBR # MBR partition scheme
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
@@ -109,73 +109,73 @@ options GDB # Support remote GDB.
# 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
# Ethernet
-device mii # Minimal MII support
-device ate # Atmel AT91 Ethernet friver
+device mii # Minimal MII support
+device ate # Atmel AT91 Ethernet friver
# I2C
-device at91_twi # Atmel AT91 Two-wire Interface
-device iic # I2C generic I/O device driver
-device iicbus # I2C bus system
-device pcf8563 # NXP PCF8563 clock/calendar
+device at91_twi # Atmel AT91 Two-wire Interface
+device iic # I2C generic I/O device driver
+device iicbus # I2C bus system
+device pcf8563 # NXP PCF8563 clock/calendar
# MMC/SD
-device at91_mci # Atmel AT91 Multimedia Card Interface
+device at91_mci # Atmel AT91 Multimedia Card Interface
options AT91_MCI_HAS_4WIRE
-device mmc # MMC/SD bus
-device mmcsd # MMC/SD memory card
+device mmc # MMC/SD bus
+device mmcsd # MMC/SD memory card
# DataFlash
-device at91_spi # Atmel AT91 Serial Peripheral Interface
-device spibus # SPI bus
-device at45d # Atmel AT45D
-device geom_map # GEOM partition mapping
+device at91_spi # Atmel AT91 Serial Peripheral Interface
+device spibus # SPI bus
+device at45d # Atmel AT45D
+device geom_map # GEOM partition mapping
# 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
# 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
# Serial (COM) ports
-device uart # Multi-uart driver
+device uart # Multi-uart driver
options ALT_BREAK_TO_DEBUGGER
# USB support
-options USB_DEBUG # enable debug msgs
-device ohci # OHCI USB interface
-device usb # USB Bus (required)
-device umass # Disks/Mass storage - Requires scbus and da
+options USB_DEBUG # enable debug msgs
+device ohci # OHCI USB interface
+device usb # USB Bus (required)
+device umass # Disks/Mass storage - Requires scbus and da
# USB device (gadget) support
-device at91_dci # Atmel's usb device
-device usfs # emulate a flash
-device cdce # emulate an ethernet
-device usb_template # Control of the gadget
+device at91_dci # Atmel's usb device
+device usfs # emulate a flash
+device cdce # emulate an ethernet
+device usb_template # Control of the gadget
# watchdog
-device at91_wdt # Atmel AT91 Watchdog Timer
+device at91_wdt # Atmel AT91 Watchdog Timer
device at91_rtc
device at91_ssc
-#device at91_tc # missing?
+#device at91_tc # missing?
# NAND Flash - Reference design has Samsung 256MB but others possible
device nand # NAND interface on CS3
Modified: head/sys/arm/conf/AVILA
==============================================================================
--- head/sys/arm/conf/AVILA Sun Mar 16 14:42:58 2014 (r263244)
+++ head/sys/arm/conf/AVILA Sun Mar 16 15:22:46 2014 (r263245)
@@ -25,10 +25,10 @@ include "../xscale/ixp425/std.ixp425"
include "../xscale/ixp425/std.avila"
options XSCALE_CACHE_READ_WRITE_ALLOCATE
#To statically compile in device wiring instead of /boot/device.hints
-hints "AVILA.hints" #Default places to look for devices.
+hints "AVILA.hints" # Default places to look for devices.
makeoptions MODULES_OVERRIDE=""
-makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions CONF_CFLAGS=-mcpu=xscale
#options HZ=1000
options HZ=100
@@ -37,23 +37,23 @@ options DEVICE_POLLING
# Debugging for use in -current
options KDB
#options GDB
-options DDB #Enable the kernel debugger
-#options DEADLKRES #Enable the deadlock resolver
-options INVARIANTS #Enable calls of extra sanity checking
-options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-#options WITNESS #Enable checks to detect deadlocks and cycles
-#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+options DDB # Enable the kernel debugger
+#options DEADLKRES # Enable the deadlock resolver
+options INVARIANTS # Enable calls of extra sanity checking
+options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
+#options WITNESS # Enable checks to detect deadlocks and cycles
+#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
#options DIAGNOSTIC
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-options GEOM_PART_BSD #BSD partition scheme
-options GEOM_PART_MBR #MBR partition scheme
-options TMPFS #Efficient memory filesystem
-options FFS #Berkeley Fast Filesystem
-options SOFTUPDATES #Enable FFS soft updates support
-options NFSCL #New Network Filesystem Client
-options NFS_ROOT #NFS usable as /, requires NFSCL
+options SCHED_4BSD # 4BSD scheduler
+options INET # InterNETworking
+options GEOM_PART_BSD # BSD partition scheme
+options GEOM_PART_MBR # MBR partition scheme
+options TMPFS # Efficient memory filesystem
+options FFS # Berkeley Fast Filesystem
+options SOFTUPDATES # Enable FFS soft updates support
+options NFSCL # New Network Filesystem Client
+options NFS_ROOT # NFS usable as /, requires NFSCL
options BOOTP
options BOOTP_NFSROOT
options BOOTP_NFSV3
@@ -73,34 +73,34 @@ device hwpmc
device pci
device uart
-device ixpwdog # watchdog timer
-device cfi # flash support
-device cfid # flash disk support
-device geom_redboot # redboot fis parser
+device ixpwdog # watchdog timer
+device cfi # flash support
+device cfid # flash disk support
+device geom_redboot # redboot fis parser
# I2C Bus
device iicbus
device iicbb
device iic
-device ixpiic # I2C bus glue
-device ds1672 # DS1672 on I2C bus
-device ad7418 # AD7418 on I2C bus
+device ixpiic # I2C bus glue
+device ds1672 # DS1672 on I2C bus
+device ad7418 # AD7418 on I2C bus
device avila_led
device gpio
device gpioled
-device avila_gpio # GPIO pins on J8
+device avila_gpio # GPIO pins on J8
device ata
-device avila_ata # Gateworks CF/IDE support
+device avila_ata # Gateworks CF/IDE support
-device npe # Network Processing Engine
+device npe # Network Processing Engine
device npe_fw
device firmware
-device qmgr # Q Manager (required by npe)
-device mii # NB: required by npe
+device qmgr # Q Manager (required by npe)
+device mii # NB: required by npe
device ether
device bpf
@@ -108,24 +108,24 @@ device loop
device if_bridge
device md
-device random # Entropy device
+device random # Entropy device
# Wireless NIC cards
-device wlan # 802.11 support
+device wlan # 802.11 support
options IEEE80211_DEBUG
options IEEE80211_SUPPORT_TDMA
options IEEE80211_SUPPORT_MESH
-device wlan_wep # 802.11 WEP support
-device wlan_ccmp # 802.11 CCMP support
-device wlan_tkip # 802.11 TKIP support
+device wlan_wep # 802.11 WEP support
+device wlan_ccmp # 802.11 CCMP support
+device wlan_tkip # 802.11 TKIP support
device wlan_xauth
-device ath # Atheros NICs
-device ath_pci # Atheros pci/cardbus glue
+device ath # Atheros NICs
+device ath_pci # Atheros pci/cardbus glue
options ATH_DEBUG
options ATH_DIAGAPI
#options ATH_TX99_DIAG
-device ath_rate_sample # SampleRate tx rate control for ath
+device ath_rate_sample # SampleRate tx rate control for ath
#options AH_DEBUG
#options AH_ASSERT
@@ -149,9 +149,9 @@ device usb
device ohci
device ehci
device umass
-device scbus # SCSI bus (required for ATA/SCSI)
-device da # Direct Access (disks)
-device pass # Passthrough device (direct ATA/SCSI access)
+device scbus # SCSI bus (required for ATA/SCSI)
+device da # Direct Access (disks)
+device pass # Passthrough device (direct ATA/SCSI access)
#device ural
#device zyd
Modified: head/sys/arm/conf/BEAGLEBONE
==============================================================================
--- head/sys/arm/conf/BEAGLEBONE Sun Mar 16 14:42:58 2014 (r263244)
+++ head/sys/arm/conf/BEAGLEBONE Sun Mar 16 15:22:46 2014 (r263245)
@@ -27,42 +27,42 @@ include "../ti/am335x/std.beaglebone"
makeoptions WITHOUT_MODULES="ahc"
options HZ=100
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-options INET6 #IPv6 communications protocols
-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 GEOM_PART_BSD #BSD partition scheme
-options GEOM_PART_MBR #MBR partition scheme
-options TMPFS #Efficient memory filesystem
-options MSDOSFS #MSDOS Filesystem
-options CD9660 #ISO 9660 Filesystem
-options PROCFS #Process filesystem (requires PSEUDOFS)
-options PSEUDOFS #Pseudo-filesystem framework
-options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
-options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
-options KTRACE #ktrace(1) support
-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 SCHED_4BSD # 4BSD scheduler
+options INET # InterNETworking
+options INET6 # IPv6 communications protocols
+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 GEOM_PART_BSD # BSD partition scheme
+options GEOM_PART_MBR # MBR partition scheme
+options TMPFS # Efficient memory filesystem
+options MSDOSFS # MSDOS Filesystem
+options CD9660 # ISO 9660 Filesystem
+options PROCFS # Process filesystem (requires PSEUDOFS)
+options PSEUDOFS # Pseudo-filesystem framework
+options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]
+options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+options KTRACE # ktrace(1) support
+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 KBD_INSTALL_CDEV # install a CDEV entry in /dev
options PREEMPTION
options FREEBSD_BOOT_LOADER
options VFP # vfp/neon
# Debugging
-makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options BREAK_TO_DEBUGGER
-#options VERBOSE_SYSINIT #Enable verbose sysinit messages
+#options VERBOSE_SYSINIT # Enable verbose sysinit messages
options KDB
-options DDB #Enable the kernel debugger
-options INVARIANTS #Enable calls of extra sanity checking
-options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-options WITNESS #Enable checks to detect deadlocks and cycles
-options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+options DDB # Enable the kernel debugger
+options INVARIANTS # Enable calls of extra sanity checking
+options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
+options WITNESS # Enable checks to detect deadlocks and cycles
+options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
#options DIAGNOSTIC
# NFS support
@@ -71,7 +71,7 @@ options NFSCL
options NFSLOCKD
# Uncomment this for NFS root
-#options NFS_ROOT #NFS usable as /, requires NFSCL
+#options NFS_ROOT # NFS usable as /, requires NFSCL
#options BOOTP_NFSROOT
#options BOOTP_COMPAT
#options BOOTP
@@ -129,7 +129,7 @@ device miibus
device axe # ASIX Electronics USB Ethernet
# Device mode support and USFS template
-device usb_template # Control of the gadget
+device usb_template # Control of the gadget
device usfs
# Flattened Device Tree
Modified: head/sys/arm/conf/BWCT
==============================================================================
--- head/sys/arm/conf/BWCT Sun Mar 16 14:42:58 2014 (r263244)
+++ head/sys/arm/conf/BWCT Sun Mar 16 15:22:46 2014 (r263245)
@@ -27,42 +27,42 @@ include "../at91/std.bwct"
hints "BWCT.hints"
makeoptions MODULES_OVERRIDE=""
-#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options DDB
options KDB
options BREAK_TO_DEBUGGER
options ALT_BREAK_TO_DEBUGGER
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-#options INET6 #IPv6 communications protocols
-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 MD_ROOT #MD is a potential root device
+options SCHED_4BSD # 4BSD scheduler
+options INET # InterNETworking
+#options INET6 # IPv6 communications protocols
+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 MD_ROOT # MD is a potential root device
#options MD_ROOT_SIZE=4096 # 4MB ram disk
#options ROOTDEVNAME=\"ufs:md0\"
#options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-options NFSCL #New Network Filesystem Client
-#options NFSD #New Network Filesystem Server
-#options NFSLOCKD #Network Lock Manager
-options NFS_ROOT #NFS usable as /, requires NFSCL
+options NFSCL # New Network Filesystem Client
+#options NFSD # New Network Filesystem Server
+#options NFSLOCKD # Network Lock Manager
+options NFS_ROOT # NFS usable as /, requires NFSCL
options BOOTP_NFSROOT
options BOOTP
-options GEOM_PART_BSD #BSD partition scheme
-options GEOM_PART_MBR #MBR partition scheme
-options TMPFS #Efficient memory filesystem
-#options MSDOSFS #MSDOS Filesystem
-#options CD9660 #ISO 9660 Filesystem
-#options PROCFS #Process filesystem (requires PSEUDOFS)
-options PSEUDOFS #Pseudo-filesystem framework
-#options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
-#options KTRACE #ktrace(1) support
-options SYSVSHM #SYSV-style shared memory
-options SYSVMSG #SYSV-style message queues
-options SYSVSEM #SYSV-style semaphores
+options GEOM_PART_BSD # BSD partition scheme
+options GEOM_PART_MBR # MBR partition scheme
+options TMPFS # Efficient memory filesystem
+#options MSDOSFS # MSDOS Filesystem
+#options CD9660 # ISO 9660 Filesystem
+#options PROCFS # Process filesystem (requires PSEUDOFS)
+options PSEUDOFS # Pseudo-filesystem framework
+#options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+#options KTRACE # ktrace(1) support
+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 NO_SYSCTL_DESCR
options MUTEX_NOINLINE
@@ -79,11 +79,11 @@ device mii
device rlswitch
# Debugging for use in -current
-#options DEADLKRES #Enable the deadlock resolver
-#options INVARIANTS #Enable calls of extra sanity checking
-#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-#options WITNESS #Enable checks to detect deadlocks and cycles
-#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+#options DEADLKRES # Enable the deadlock resolver
+#options INVARIANTS # Enable calls of extra sanity checking
+#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
+#options WITNESS # Enable checks to detect deadlocks and cycles
+#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
#options DIAGNOSTIC
device md
@@ -96,17 +96,17 @@ device mmcsd # mmc/sd flash cards
# iic
device iic
device iicbus
-device ds1672 # DS1672 on I2C bus
+device ds1672 # DS1672 on I2C bus
#device iicsmb # smb over i2c bridge
#device smbus # Bus support, required for smb below.
#device smb
# SPI bus
device spibus
-#device at45d # at45db642 and maybe others
+#device at45d # at45db642 and maybe others
-device bpf # Berkeley packet filter
+device bpf # Berkeley packet filter
#options USB_DEBUG
#device ohci
#device usb
-#device umass # Disks/Mass storage - Requires scbus and da
+#device umass # Disks/Mass storage - Requires scbus and da
Modified: head/sys/arm/conf/CAMBRIA
==============================================================================
--- head/sys/arm/conf/CAMBRIA Sun Mar 16 14:42:58 2014 (r263244)
+++ head/sys/arm/conf/CAMBRIA Sun Mar 16 15:22:46 2014 (r263245)
@@ -27,7 +27,7 @@ options XSCALE_CACHE_READ_WRITE_ALLOCAT
#To statically compile in device wiring instead of /boot/device.hints
hints "CAMBRIA.hints" # Default places to look for devices.
-makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions CONF_CFLAGS=-mcpu=xscale
makeoptions MODULES_OVERRIDE=""
#options HZ=1000
@@ -37,24 +37,24 @@ options DEVICE_POLLING
# Debugging for use in -current
options KDB
#options GDB
-options DDB #Enable the kernel debugger
-#options DEADLKRES #Enable the deadlock resolver
-options INVARIANTS #Enable calls of extra sanity checking
-options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-#options WITNESS #Enable checks to detect deadlocks and cycles
-#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+options DDB # Enable the kernel debugger
+#options DEADLKRES # Enable the deadlock resolver
+options INVARIANTS # Enable calls of extra sanity checking
+options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
+#options WITNESS # Enable checks to detect deadlocks and cycles
+#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
#options DIAGNOSTIC
-options SCHED_4BSD #4BSD scheduler
+options SCHED_4BSD # 4BSD scheduler
#options PREEMPTION
-options INET #InterNETworking
-options GEOM_PART_BSD #BSD partition scheme
-options GEOM_PART_MBR #MBR partition scheme
-options TMPFS #Efficient memory filesystem
-options FFS #Berkeley Fast Filesystem
-options SOFTUPDATES #Enable FFS soft updates support
-options NFSCL #New Network Filesystem Client
-options NFS_ROOT #NFS usable as /, requires NFSCL
+options INET # InterNETworking
+options GEOM_PART_BSD # BSD partition scheme
+options GEOM_PART_MBR # MBR partition scheme
+options TMPFS # Efficient memory filesystem
+options FFS # Berkeley Fast Filesystem
+options SOFTUPDATES # Enable FFS soft updates support
+options NFSCL # New Network Filesystem Client
+options NFS_ROOT # NFS usable as /, requires NFSCL
options BOOTP
options BOOTP_NFSROOT
options BOOTP_NFSV3
@@ -73,37 +73,37 @@ options VERBOSE_INIT_ARM
device pci
device uart
-device ixpwdog # watchdog timer
+device ixpwdog # watchdog timer
-options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M
-device cfi # flash support
-device cfid # flash disk support
-device geom_redboot # redboot fis parser
+options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M
+device cfi # flash support
+device cfid # flash disk support
+device geom_redboot # redboot fis parser
# I2C Bus
device iicbus
device iicbb
device iic
-device ixpiic # I2C bus glue
-device ds1672 # DS1672 on I2C bus
-device ad7418 # AD7418 on I2C bus
+device ixpiic # I2C bus glue
+device ds1672 # DS1672 on I2C bus
+device ad7418 # AD7418 on I2C bus
-device cambria_fled # Font Panel LED on I2C bus
-device cambria_led # 8-LED latch
+device cambria_fled # Font Panel LED on I2C bus
+device cambria_led # 8-LED latch
device gpio
device gpioled
-device cambria_gpio # GPIO pins on J11
+device cambria_gpio # GPIO pins on J11
device ata
-device avila_ata # Gateworks CF/IDE support
+device avila_ata # Gateworks CF/IDE support
-device npe # Network Processing Engine
+device npe # Network Processing Engine
device npe_fw
device firmware
-device qmgr # Q Manager (required by npe)
-device mii # NB: required by npe
+device qmgr # Q Manager (required by npe)
+device mii # NB: required by npe
device ether
device bpf
@@ -111,26 +111,26 @@ device loop
device if_bridge
device md
-device random # Entropy device
+device random # Entropy device
# Wireless NIC cards
-device wlan # 802.11 support
+device wlan # 802.11 support
options IEEE80211_DEBUG
options IEEE80211_SUPPORT_TDMA
options IEEE80211_SUPPORT_MESH
-device wlan_wep # 802.11 WEP support
-device wlan_ccmp # 802.11 CCMP support
-device wlan_tkip # 802.11 TKIP support
+device wlan_wep # 802.11 WEP support
+device wlan_ccmp # 802.11 CCMP support
+device wlan_tkip # 802.11 TKIP support
device wlan_xauth
-device ath # Atheros NICs
-device ath_pci # Atheros pci/cardbus glue
+device ath # Atheros NICs
+device ath_pci # Atheros pci/cardbus glue
options ATH_DEBUG
options ATH_DIAGAPI
options ATH_ENABLE_DFS
options ATH_ENABLE_11N
#options ATH_TX99_DIAG
-device ath_rate_sample # SampleRate tx rate control for ath
+device ath_rate_sample # SampleRate tx rate control for ath
options AH_DEBUG
options AH_PRIVATE_DIAG
@@ -139,13 +139,13 @@ device ath_hal
# NB: 2 USB 2.0 ports standard
device usb
-options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
+options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
#options USB_DEBUG
device ehci
device umass
-device scbus # SCSI bus (required for ATA/SCSI)
-device da # Direct Access (disks)
-device pass # Passthrough device (direct ATA/SCSI access)
+device scbus # SCSI bus (required for ATA/SCSI)
+device da # Direct Access (disks)
+device pass # Passthrough device (direct ATA/SCSI access)
#device ural
#device zyd
Modified: head/sys/arm/conf/CNS11XXNAS
==============================================================================
--- head/sys/arm/conf/CNS11XXNAS Sun Mar 16 14:42:58 2014 (r263244)
+++ head/sys/arm/conf/CNS11XXNAS Sun Mar 16 15:22:46 2014 (r263245)
@@ -22,7 +22,7 @@ ident CNS11XXNAS
#options PHYSADDR=0x10000000
#options KERNPHYSADDR=0x10200000
-#options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
+#options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
#options FLASHADDR=0x50000000
#options LOADERRAMADDR=0x00000000
@@ -30,61 +30,61 @@ include "../econa/std.econa"
makeoptions MODULES_OVERRIDE=""
-makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options HZ=100
options DEVICE_POLLING
# Debugging for use in -current
options KDB
#options GDB
-options DDB #Enable the kernel debugger
-#options DEADLKRES #Enable the deadlock resolver
-#options INVARIANTS #Enable calls of extra sanity checking
-#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-#options WITNESS #Enable checks to detect deadlocks and cycles
-##options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+options DDB # Enable the kernel debugger
+#options DEADLKRES # Enable the deadlock resolver
+#options INVARIANTS # Enable calls of extra sanity checking
+#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
+#options WITNESS # Enable checks to detect deadlocks and cycles
+##options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
#options DIAGNOSTIC
#options COMPAT_FREEBSD5
#options COMPAT_FREEBSD6
-#options COMPAT_FREEBSD7
+#options COMPAT_FREEBSD7n
-options SCHED_ULE #ULE scheduler
-#options SCHED_4BSD #4BSD scheduler
-options GEOM_PART_BSD #BSD partition scheme
-options GEOM_PART_MBR #MBR partition scheme
+options SCHED_ULE # ULE scheduler
+#options SCHED_4BSD # 4BSD scheduler
+options GEOM_PART_BSD # BSD partition scheme
+options GEOM_PART_MBR # MBR partition scheme
options GEOM_PART_GPT # GUID Partition Tables.
#options GEOM_PART_EBR
#options GEOM_PART_EBR_COMPAT
options GEOM_LABEL # Provides labelization
-options INET #InterNETworking
-options INET6 #IPv6 communications protocols
-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 NFSCL #New Network Filesystem Client
-#options NFSD #New Network Filesystem Server
-#options NFSLOCKD #Network Lock Manager
-options NFS_ROOT #NFS usable as /, requires NFSCL
-options TMPFS #Efficient memory filesystem
-options MSDOSFS #MSDOS Filesystem
-#options CD9660 #ISO 9660 Filesystem
-#options PROCFS #Process filesystem (requires PSEUDOFS)
-options PSEUDOFS #Pseudo-filesystem framework
-options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
-options KTRACE #ktrace(1) support
-options SYSVSHM #SYSV-style shared memory
-options SYSVMSG #SYSV-style message queues
-options SYSVSEM #SYSV-style semaphores
+options INET # InterNETworking
+options INET6 # IPv6 communications protocols
+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 NFSCL # New Network Filesystem Client
+#options NFSD # New Network Filesystem Server
+#options NFSLOCKD # Network Lock Manager
+options NFS_ROOT # NFS usable as /, requires NFSCL
+options TMPFS # Efficient memory filesystem
+options MSDOSFS # MSDOS Filesystem
+#options CD9660 # ISO 9660 Filesystem
+#options PROCFS # Process filesystem (requires PSEUDOFS)
+options PSEUDOFS # Pseudo-filesystem framework
+options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+options KTRACE # ktrace(1) support
+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 MUTEX_NOINLINE #Mutex inlines are space hogs
-options RWLOCK_NOINLINE #rwlock inlines are space hogs
-options SX_NOINLINE #sx inliens are space hogs
+options MUTEX_NOINLINE # Mutex inlines are space hogs
+options RWLOCK_NOINLINE # rwlock inlines are space hogs
+options SX_NOINLINE # sx inliens are space hogs
#options BOOTP
#options BOOTP_NFSROOT
#options BOOTP_NFSV3
@@ -96,14 +96,14 @@ device uart
device firmware
-device mii # Minimal mii routines
+device mii # Minimal mii routines
device ether
device bpf
device loop
device md
-device random # Entropy device
+device random # Entropy device
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-head
mailing list