summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2014-03-18 14:41:18 +0000
committerimp <imp@FreeBSD.org>2014-03-18 14:41:18 +0000
commitea27b8b5414364301a4616dbd45c6487b2576fed (patch)
treea52604c57a2c4c999f135e7f0cc4d8a5de448f09
parentbe3902ef94dec213ab9220bd1e709859c6cf5873 (diff)
downloadFreeBSD-src-ea27b8b5414364301a4616dbd45c6487b2576fed.zip
FreeBSD-src-ea27b8b5414364301a4616dbd45c6487b2576fed.tar.gz
In kernel config files, it is supposed to be 'options<space><tab>' not
'options<tab><tab>', per long standing (but recently not so strictly enforced) convention.
-rw-r--r--sys/amd64/conf/NOTES4
-rw-r--r--sys/arm/conf/AC1002
-rw-r--r--sys/arm/conf/ARMADAXP2
-rw-r--r--sys/arm/conf/ARNDALE72
-rw-r--r--sys/arm/conf/ATMEL2
-rw-r--r--sys/arm/conf/AVILA2
-rw-r--r--sys/arm/conf/BEAGLEBONE2
-rw-r--r--sys/arm/conf/BWCT2
-rw-r--r--sys/arm/conf/CAMBRIA2
-rw-r--r--sys/arm/conf/CNS11XXNAS2
-rw-r--r--sys/arm/conf/COLIBRI-VF504
-rw-r--r--sys/arm/conf/COSMIC4
-rw-r--r--sys/arm/conf/CRB2
-rw-r--r--sys/arm/conf/CUBIEBOARD8
-rw-r--r--sys/arm/conf/CUBIEBOARD22
-rw-r--r--sys/arm/conf/DB-78XXX2
-rw-r--r--sys/arm/conf/DB-88F5XXX2
-rw-r--r--sys/arm/conf/DB-88F6XXX2
-rw-r--r--sys/arm/conf/DIGI-CCWMX532
-rw-r--r--sys/arm/conf/DOCKSTAR2
-rw-r--r--sys/arm/conf/DREAMPLUG-10012
-rw-r--r--sys/arm/conf/EA32502
-rw-r--r--sys/arm/conf/EB92002
-rw-r--r--sys/arm/conf/EFIKA_MX2
-rw-r--r--sys/arm/conf/EP802192
-rw-r--r--sys/arm/conf/ETHERNUT52
-rw-r--r--sys/arm/conf/GUMSTIX2
-rw-r--r--sys/arm/conf/HL2002
-rw-r--r--sys/arm/conf/HL2012
-rw-r--r--sys/arm/conf/IMX53-QSB2
-rw-r--r--sys/arm/conf/IMX62
-rw-r--r--sys/arm/conf/IQ312442
-rw-r--r--sys/arm/conf/KB920X2
-rw-r--r--sys/arm/conf/LN2410SBC2
-rw-r--r--sys/arm/conf/NSLU2
-rw-r--r--sys/arm/conf/PANDABOARD2
-rw-r--r--sys/arm/conf/QILA9G202
-rw-r--r--sys/arm/conf/QUARTZ4
-rw-r--r--sys/arm/conf/RADXA68
-rw-r--r--sys/arm/conf/RPI-B4
-rw-r--r--sys/arm/conf/SAM9260EK2
-rw-r--r--sys/arm/conf/SAM9G20EK2
-rw-r--r--sys/arm/conf/SAM9X25EK2
-rw-r--r--sys/arm/conf/SHEEVAPLUG2
-rw-r--r--sys/arm/conf/SN9G452
-rw-r--r--sys/arm/conf/TS78002
-rw-r--r--sys/arm/conf/VERSATILEPB6
-rw-r--r--sys/arm/conf/VYBRID.common68
-rw-r--r--sys/arm/conf/WANDBOARD.common2
-rw-r--r--sys/arm/conf/ZEDBOARD4
-rw-r--r--sys/i386/conf/NOTES4
-rw-r--r--sys/i386/conf/XEN4
-rw-r--r--sys/ia64/conf/GENERIC4
-rw-r--r--sys/mips/conf/ALCHEMY26
-rw-r--r--sys/mips/conf/ALFA_HORNET_UB6
-rw-r--r--sys/mips/conf/AP1216
-rw-r--r--sys/mips/conf/AP918
-rw-r--r--sys/mips/conf/AP938
-rw-r--r--sys/mips/conf/AP9416
-rw-r--r--sys/mips/conf/AP968
-rw-r--r--sys/mips/conf/AR71XX_BASE64
-rw-r--r--sys/mips/conf/AR724X_BASE60
-rw-r--r--sys/mips/conf/AR91XX_BASE56
-rw-r--r--sys/mips/conf/AR933X_BASE60
-rw-r--r--sys/mips/conf/AR934X_BASE60
-rw-r--r--sys/mips/conf/CARAMBOLA26
-rw-r--r--sys/mips/conf/DB12010
-rw-r--r--sys/mips/conf/DIR-825B120
-rw-r--r--sys/mips/conf/ENH2008
-rw-r--r--sys/mips/conf/PB4710
-rw-r--r--sys/mips/conf/PB9264
-rw-r--r--sys/mips/conf/PICOSTATION_M2HP8
-rw-r--r--sys/mips/conf/ROUTERSTATION8
-rw-r--r--sys/mips/conf/ROUTERSTATION_MFS8
-rw-r--r--sys/mips/conf/RSPRO8
-rw-r--r--sys/mips/conf/RSPRO_MFS8
-rw-r--r--sys/mips/conf/RSPRO_STANDALONE6
-rw-r--r--sys/mips/conf/RT305X44
-rw-r--r--sys/mips/conf/SENTRY528
-rw-r--r--sys/mips/conf/SWARM64_SMP4
-rw-r--r--sys/mips/conf/SWARM_SMP4
-rw-r--r--sys/mips/conf/TP-WN1043ND4
-rw-r--r--sys/mips/conf/WZR-300HP16
-rw-r--r--sys/mips/conf/XLRN326
-rw-r--r--sys/mips/conf/std.SWARM34
-rw-r--r--sys/mips/conf/std.XLP10
-rw-r--r--sys/powerpc/conf/GENERIC6
-rw-r--r--sys/powerpc/conf/GENERIC646
-rw-r--r--sys/powerpc/conf/MPC85XX6
-rw-r--r--sys/powerpc/conf/NOTES2
90 files changed, 524 insertions, 524 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 8589e21..ad0b103 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -187,7 +187,7 @@ options VESA_DEBUG
device dpms # DPMS suspend & resume via VESA BIOS
# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa
-options X86BIOS
+options X86BIOS
#
# Optional devices:
@@ -440,7 +440,7 @@ device ips
#
# 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
diff --git a/sys/arm/conf/AC100 b/sys/arm/conf/AC100
index f6ab0e4..3612cbc 100644
--- a/sys/arm/conf/AC100
+++ b/sys/arm/conf/AC100
@@ -25,7 +25,7 @@ options FFS # Berkeley Fast Filesystem
#options BOOTP_NFSV3
#options BOOTP_WIRED_TO=mge0
-options TMPFS # Efficient memory filesystem
+options TMPFS # Efficient memory filesystem
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
options GEOM_PART_GPT
diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP
index 0a06798..edfe75c 100644
--- a/sys/arm/conf/ARMADAXP
+++ b/sys/arm/conf/ARMADAXP
@@ -26,7 +26,7 @@ options BOOTP_NFSROOT
options BOOTP_NFSV3
options BOOTP_WIRED_TO=mge0
-options TMPFS # Efficient memory filesystem
+options TMPFS # Efficient memory filesystem
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
options GEOM_PART_GPT
diff --git a/sys/arm/conf/ARNDALE b/sys/arm/conf/ARNDALE
index f50f9a1..39869e6 100644
--- a/sys/arm/conf/ARNDALE
+++ b/sys/arm/conf/ARNDALE
@@ -27,49 +27,49 @@ makeoptions WITHOUT_MODULES="ahc"
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 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 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 KBD_INSTALL_CDEV
-options PREEMPTION
-options FREEBSD_BOOT_LOADER
+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 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 KBD_INSTALL_CDEV
+options PREEMPTION
+options FREEBSD_BOOT_LOADER
options VFP # vfp/neon
# Debugging
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-options BREAK_TO_DEBUGGER
+options BREAK_TO_DEBUGGER
#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 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 DIAGNOSTIC
+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
@@ -83,7 +83,7 @@ device mmc # mmc/sd bus
device mmcsd # mmc/sd flash cards
device sdhci # generic sdhci
-options ROOTDEVNAME=\"ufs:/dev/da0\"
+options ROOTDEVNAME=\"ufs:/dev/da0\"
#options SMP
@@ -98,7 +98,7 @@ device gpio
# USB support
options USB_HOST_ALIGN=64 # Align usb buffers to cache line size.
device usb
-options USB_DEBUG
+options USB_DEBUG
#options USB_REQ_DEBUG
#options USB_VERBOSE
#device musb
@@ -134,6 +134,6 @@ device axe # ASIX Electronics USB Ethernet
device bpf # Berkeley packet filter
#FDT
-options FDT
-options FDT_DTB_STATIC
+options FDT
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=exynos5250-arndale.dts
diff --git a/sys/arm/conf/ATMEL b/sys/arm/conf/ATMEL
index 2868c05..59ef417 100644
--- a/sys/arm/conf/ATMEL
+++ b/sys/arm/conf/ATMEL
@@ -48,7 +48,7 @@ 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 TMPFS # Efficient memory filesystem
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA
index 8b2e87e..aed017d 100644
--- a/sys/arm/conf/AVILA
+++ b/sys/arm/conf/AVILA
@@ -49,7 +49,7 @@ 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 TMPFS # Efficient memory filesystem
options FFS # Berkeley Fast Filesystem
options SOFTUPDATES # Enable FFS soft updates support
options NFSCL # New Network Filesystem Client
diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE
index f4ddd24..312e10f 100644
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@@ -36,7 +36,7 @@ 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 TMPFS # Efficient memory filesystem
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT
index 690a521..4c00019 100644
--- a/sys/arm/conf/BWCT
+++ b/sys/arm/conf/BWCT
@@ -53,7 +53,7 @@ options BOOTP
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/CAMBRIA b/sys/arm/conf/CAMBRIA
index 73c8922..55c7257 100644
--- a/sys/arm/conf/CAMBRIA
+++ b/sys/arm/conf/CAMBRIA
@@ -50,7 +50,7 @@ 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 TMPFS # Efficient memory filesystem
options FFS # Berkeley Fast Filesystem
options SOFTUPDATES # Enable FFS soft updates support
options NFSCL # New Network Filesystem Client
diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS
index d9b0147..c3284aa 100644
--- a/sys/arm/conf/CNS11XXNAS
+++ b/sys/arm/conf/CNS11XXNAS
@@ -71,7 +71,7 @@ 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 TMPFS # Efficient memory filesystem
options MSDOSFS # MSDOS Filesystem
#options CD9660 # ISO 9660 Filesystem
#options PROCFS # Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/COLIBRI-VF50 b/sys/arm/conf/COLIBRI-VF50
index a38ddd8..343fb89 100644
--- a/sys/arm/conf/COLIBRI-VF50
+++ b/sys/arm/conf/COLIBRI-VF50
@@ -21,6 +21,6 @@ include "VYBRID.common"
ident COLIBRI-VF50
#FDT
-options FDT
-options FDT_DTB_STATIC
+options FDT
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=vybrid-colibri-vf50.dts
diff --git a/sys/arm/conf/COSMIC b/sys/arm/conf/COSMIC
index 464d852..b3b4074 100644
--- a/sys/arm/conf/COSMIC
+++ b/sys/arm/conf/COSMIC
@@ -21,6 +21,6 @@ include "VYBRID.common"
ident COSMIC
#FDT
-options FDT
-options FDT_DTB_STATIC
+options FDT
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=vybrid-cosmic.dts
diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB
index 9f36dd5..d9b3893 100644
--- a/sys/arm/conf/CRB
+++ b/sys/arm/conf/CRB
@@ -47,7 +47,7 @@ options NFS_ROOT # NFS usable as /, requires NFSCL
#options MSDOSFS # MSDOS Filesystem
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-options TMPFS # Efficient memory filesystem
+options TMPFS # Efficient memory filesystem
options CD9660 # ISO 9660 Filesystem
#options PROCFS # Process filesystem (requires PSEUDOFS)
options PSEUDOFS # Pseudo-filesystem framework
diff --git a/sys/arm/conf/CUBIEBOARD b/sys/arm/conf/CUBIEBOARD
index c488956..27447aa 100644
--- a/sys/arm/conf/CUBIEBOARD
+++ b/sys/arm/conf/CUBIEBOARD
@@ -31,7 +31,7 @@ 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 TMPFS # Efficient memory filesystem
options FFS # Berkeley Fast Filesystem
options SOFTUPDATES # Enable FFS soft updates support
options UFS_ACL # Support for access control lists
@@ -82,7 +82,7 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
#device mmcsd # mmc/sd flash cards
# Boot device is 2nd slice on MMC/SD card
-options ROOTDEVNAME=\"ufs:/dev/da0s2\"
+options ROOTDEVNAME=\"ufs:/dev/da0s2\"
# ATA controllers
#device ahci # AHCI-compatible SATA controllers
@@ -134,7 +134,7 @@ device emac
device miibus
# Flattened Device Tree
-options FDT
-options FDT_DTB_STATIC
+options FDT
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=cubieboard.dts
diff --git a/sys/arm/conf/CUBIEBOARD2 b/sys/arm/conf/CUBIEBOARD2
index b68a0f7..b9a125b 100644
--- a/sys/arm/conf/CUBIEBOARD2
+++ b/sys/arm/conf/CUBIEBOARD2
@@ -31,7 +31,7 @@ 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 TMPFS # Efficient memory filesystem
options FFS # Berkeley Fast Filesystem
options SOFTUPDATES # Enable FFS soft updates support
options UFS_ACL # Support for access control lists
diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX
index 607923e..f76fd36 100644
--- a/sys/arm/conf/DB-78XXX
+++ b/sys/arm/conf/DB-78XXX
@@ -18,7 +18,7 @@ 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 TMPFS # Efficient memory filesystem
options FFS # Berkeley Fast Filesystem
options NANDFS # NAND Filesystem
options NFSCL # New Network Filesystem Client
diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX
index 084cb83..1a35428 100644
--- a/sys/arm/conf/DB-88F5XXX
+++ b/sys/arm/conf/DB-88F5XXX
@@ -18,7 +18,7 @@ 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 TMPFS # Efficient memory filesystem
options FFS # Berkeley Fast Filesystem
options NFSCL # New Network Filesystem Client
options NFSLOCKD # Network Lock Manager
diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX
index 1aa0ca0..1eaf5d1 100644
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@@ -18,7 +18,7 @@ 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 TMPFS # Efficient memory filesystem
options FFS # Berkeley Fast Filesystem
options NANDFS # NAND Filesystem
options NFSCL # New Network Filesystem Client
diff --git a/sys/arm/conf/DIGI-CCWMX53 b/sys/arm/conf/DIGI-CCWMX53
index 9fbb632..9cd06ce 100644
--- a/sys/arm/conf/DIGI-CCWMX53
+++ b/sys/arm/conf/DIGI-CCWMX53
@@ -41,7 +41,7 @@ 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 TMPFS # Efficient memory filesystem
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
#options PROCFS # Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/DOCKSTAR b/sys/arm/conf/DOCKSTAR
index 9660bf9..7c88696 100644
--- a/sys/arm/conf/DOCKSTAR
+++ b/sys/arm/conf/DOCKSTAR
@@ -34,7 +34,7 @@ options INET6 # IPv6 communications protocols
options SOFTUPDATES
options CD9660 # ISO 9660 filesystem
options FFS # Berkeley Fast Filesystem
-options TMPFS # Efficient memory filesystem
+options TMPFS # Efficient memory filesystem
options MSDOSFS # MS DOS File System (FAT, FAT32)
options NULLFS # NULL filesystem
options SYSVSHM # SYSV-style shared memory
diff --git a/sys/arm/conf/DREAMPLUG-1001 b/sys/arm/conf/DREAMPLUG-1001
index 7e6f281..2d829ce 100644
--- a/sys/arm/conf/DREAMPLUG-1001
+++ b/sys/arm/conf/DREAMPLUG-1001
@@ -35,7 +35,7 @@ options SCHED_4BSD # 4BSD scheduler
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options SOFTUPDATES
-options TMPFS # Efficient memory filesystem
+options TMPFS # Efficient memory filesystem
options CD9660 # ISO 9660 filesystem
options FFS # Berkeley Fast Filesystem
options MSDOSFS # MS DOS File System (FAT, FAT32)
diff --git a/sys/arm/conf/EA3250 b/sys/arm/conf/EA3250
index 4f17a98..f2f809e 100644
--- a/sys/arm/conf/EA3250
+++ b/sys/arm/conf/EA3250
@@ -22,7 +22,7 @@ options NFSLOCKD # Network Lock Manager
options NFS_ROOT # NFS usable as /, requires NFSCLIENT
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-options TMPFS # Efficient memory filesystem
+options TMPFS # Efficient memory filesystem
options MSDOSFS
options BOOTP
options BOOTP_NFSROOT
diff --git a/sys/arm/conf/EB9200 b/sys/arm/conf/EB9200
index bb5f6e6..0afa9b4 100644
--- a/sys/arm/conf/EB9200
+++ b/sys/arm/conf/EB9200
@@ -43,7 +43,7 @@ options BOOTP
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX
index 3c0e4dc..826b3c7 100644
--- a/sys/arm/conf/EFIKA_MX
+++ b/sys/arm/conf/EFIKA_MX
@@ -41,7 +41,7 @@ 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 TMPFS # Efficient memory filesystem
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
#options PROCFS # Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219
index 3a3978c..349c27d 100644
--- a/sys/arm/conf/EP80219
+++ b/sys/arm/conf/EP80219
@@ -43,7 +43,7 @@ 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 TMPFS # Efficient memory filesystem
#options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
#options PROCFS # Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/ETHERNUT5 b/sys/arm/conf/ETHERNUT5
index facecd4..9bc234d 100644
--- a/sys/arm/conf/ETHERNUT5
+++ b/sys/arm/conf/ETHERNUT5
@@ -43,7 +43,7 @@ options NFSLOCKD # Network Lock Manager
options NFS_ROOT # NFS usable as /, requires NFSCL
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX
index e8be75a..d430d8f 100644
--- a/sys/arm/conf/GUMSTIX
+++ b/sys/arm/conf/GUMSTIX
@@ -49,7 +49,7 @@ options NFSCL # New Network Filesystem Client
options NFS_ROOT # NFS usable as /, requires NFSCL
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
index 1342d6f..c8d43c2 100644
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@@ -51,7 +51,7 @@ options BOOTP_COMPAT
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201
index 3bd8a3b..200f2f8 100644
--- a/sys/arm/conf/HL201
+++ b/sys/arm/conf/HL201
@@ -54,7 +54,7 @@ options ALT_BREAK_TO_DEBUGGER
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/IMX53-QSB b/sys/arm/conf/IMX53-QSB
index f689817..dd7b9a1 100644
--- a/sys/arm/conf/IMX53-QSB
+++ b/sys/arm/conf/IMX53-QSB
@@ -40,7 +40,7 @@ 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 TMPFS # Efficient memory filesystem
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
#options PROCFS # Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6
index 3034f79..4393042 100644
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@@ -36,7 +36,7 @@ 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 TMPFS # Efficient memory filesystem
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
#options PROCFS # Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244
index 0cc2990..af69f8e 100644
--- a/sys/arm/conf/IQ31244
+++ b/sys/arm/conf/IQ31244
@@ -46,7 +46,7 @@ options NFSLOCKD # Network Lock Manager
options NFS_ROOT # NFS usable as /, requires NFSCL
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index 0a01c51..916425a 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -49,7 +49,7 @@ options NFSCL # New Network Filesystem Client
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/LN2410SBC b/sys/arm/conf/LN2410SBC
index 6e11105..4c7480c 100644
--- a/sys/arm/conf/LN2410SBC
+++ b/sys/arm/conf/LN2410SBC
@@ -49,7 +49,7 @@ options ROOTDEVNAME=\"ufs:da0s1\"
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-options TMPFS # Efficient memory filesystem
+options TMPFS # Efficient memory filesystem
options PSEUDOFS # Pseudo-filesystem framework
#options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU
index 7fed92a..a8c04d3 100644
--- a/sys/arm/conf/NSLU
+++ b/sys/arm/conf/NSLU
@@ -63,7 +63,7 @@ options NFSLOCKD # Network Lock Manager
options NFS_ROOT # NFS usable as /, requires NFSCL
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD
index 0247e46..1205dbc 100644
--- a/sys/arm/conf/PANDABOARD
+++ b/sys/arm/conf/PANDABOARD
@@ -56,7 +56,7 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT
#options BOOTP_WIRED_TO=ue0
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20
index 26fe378..e005557 100644
--- a/sys/arm/conf/QILA9G20
+++ b/sys/arm/conf/QILA9G20
@@ -55,7 +55,7 @@ options ALT_BREAK_TO_DEBUGGER
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/QUARTZ b/sys/arm/conf/QUARTZ
index 4a31667..b6c20bb 100644
--- a/sys/arm/conf/QUARTZ
+++ b/sys/arm/conf/QUARTZ
@@ -21,6 +21,6 @@ include "VYBRID.common"
ident QUARTZ
#FDT
-options FDT
-options FDT_DTB_STATIC
+options FDT
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=vybrid-quartz.dts
diff --git a/sys/arm/conf/RADXA b/sys/arm/conf/RADXA
index 4505736..997efc3 100644
--- a/sys/arm/conf/RADXA
+++ b/sys/arm/conf/RADXA
@@ -25,44 +25,44 @@ include "../rockchip/std.rk30xx"
makeoptions MODULES_OVERRIDE=""
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 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 KBD_INSTALL_CDEV # install a CDEV entry in /dev
-options PREEMPTION
-options FREEBSD_BOOT_LOADER
-options VFP # vfp/neon
+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
-options BREAK_TO_DEBUGGER
+options BREAK_TO_DEBUGGER
#options VERBOSE_SYSINIT # Enable verbose sysinit messages
-options KDB
-options DDB # Enable the kernel debugger
+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 DIAGNOSTIC
+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
@@ -74,7 +74,7 @@ options DIAGNOSTIC
#device mmcsd # mmc/sd flash cards
# Boot device is 2nd slice on MMC/SD card
-options ROOTDEVNAME=\"ufs:/dev/da0s2\"
+options ROOTDEVNAME=\"ufs:/dev/da0s2\"
# Console and misc
device uart
@@ -98,7 +98,7 @@ device pass
# USB support
options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device usb
-options USB_DEBUG
+options USB_DEBUG
#options USB_REQ_DEBUG
#options USB_VERBOSE
device dwcotg # DWC OTG controller
@@ -117,7 +117,7 @@ device miibus
device udav
# Flattened Device Tree
-options FDT
-options FDT_DTB_STATIC
+options FDT
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=rk3188-radxa.dts
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index e5dce0e..c2b8e0d 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -27,14 +27,14 @@ options HZ=100
options SCHED_4BSD # 4BSD scheduler
options INET # InterNETworking
options INET6 # IPv6 communications protocols
-options SCTP # Stream Control Transmission Protocol
+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 GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-options TMPFS # Efficient memory filesystem
+options TMPFS # Efficient memory filesystem
options MSDOSFS # MSDOS Filesystem
device snp
diff --git a/sys/arm/conf/SAM9260EK b/sys/arm/conf/SAM9260EK
index 59e2c76..930429d 100644
--- a/sys/arm/conf/SAM9260EK
+++ b/sys/arm/conf/SAM9260EK
@@ -43,7 +43,7 @@ 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 TMPFS # Efficient memory filesystem
#options MSDOSFS # MSDOS Filesystem
#options CD9660 # ISO 9660 Filesystem
#options PROCFS # Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK
index 9f90fe4..3c29f35 100644
--- a/sys/arm/conf/SAM9G20EK
+++ b/sys/arm/conf/SAM9G20EK
@@ -34,7 +34,7 @@ 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 TMPFS # Efficient memory filesystem
options FFS # Berkeley Fast Filesystem
#options SOFTUPDATES # Enable FFS soft updates support
#options UFS_ACL # Support for access control lists
diff --git a/sys/arm/conf/SAM9X25EK b/sys/arm/conf/SAM9X25EK
index 8847d10..63fa815 100644
--- a/sys/arm/conf/SAM9X25EK
+++ b/sys/arm/conf/SAM9X25EK
@@ -35,7 +35,7 @@ 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 TMPFS # Efficient memory filesystem
options FFS # Berkeley Fast Filesystem
#options SOFTUPDATES # Enable FFS soft updates support
#options UFS_ACL # Support for access control lists
diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG
index 3d6cfab..dc49b6a 100644
--- a/sys/arm/conf/SHEEVAPLUG
+++ b/sys/arm/conf/SHEEVAPLUG
@@ -18,7 +18,7 @@ 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 TMPFS # Efficient memory filesystem
options FFS # Berkeley Fast Filesystem
options NANDFS # NAND Filesystem
options NFSCL # New Network Filesystem Client
diff --git a/sys/arm/conf/SN9G45 b/sys/arm/conf/SN9G45
index f1f673e..e44a0cf 100644
--- a/sys/arm/conf/SN9G45
+++ b/sys/arm/conf/SN9G45
@@ -54,7 +54,7 @@ options ALT_BREAK_TO_DEBUGGER
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
diff --git a/sys/arm/conf/TS7800 b/sys/arm/conf/TS7800
index 998efd5..49ec878 100644
--- a/sys/arm/conf/TS7800
+++ b/sys/arm/conf/TS7800
@@ -28,7 +28,7 @@ options BOOTP_WIRED_TO=mge0
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-options TMPFS # Efficient memory filesystem
+options TMPFS # Efficient memory filesystem
options SYSVSHM # SYSV-style shared memory
options SYSVMSG # SYSV-style message queues
diff --git a/sys/arm/conf/VERSATILEPB b/sys/arm/conf/VERSATILEPB
index ca769f0..fb2087a 100644
--- a/sys/arm/conf/VERSATILEPB
+++ b/sys/arm/conf/VERSATILEPB
@@ -29,8 +29,8 @@ makeoptions KERNVIRTADDR=0xc0100000
options KERNPHYSADDR=0x00100000
makeoptions KERNPHYSADDR=0x00100000
options PHYSADDR=0x00000000
-options FREEBSD_BOOT_LOADER
-options LINUX_BOOT_ABI
+options FREEBSD_BOOT_LOADER
+options LINUX_BOOT_ABI
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options HZ=100
@@ -45,7 +45,7 @@ device snp
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-options TMPFS # Efficient memory filesystem
+options TMPFS # Efficient memory filesystem
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
diff --git a/sys/arm/conf/VYBRID.common b/sys/arm/conf/VYBRID.common
index ac6be07..412f65c 100644
--- a/sys/arm/conf/VYBRID.common
+++ b/sys/arm/conf/VYBRID.common
@@ -25,32 +25,32 @@ makeoptions WITHOUT_MODULES="ahc"
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 FFS # Berkeley Fast Filesystem
-options SOFTUPDATES
-options UFS_ACL # Support for access control lists
-options UFS_DIRHASH # Improve performance on big directories
+options HZ=100
+options SCHED_4BSD # 4BSD scheduler
+options INET # InterNETworking
+options INET6 # IPv6 communications protocols
+options FFS # Berkeley Fast Filesystem
+options SOFTUPDATES
+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 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 NANDFS # NAND Filesystem
-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 KBD_INSTALL_CDEV
-options PREEMPTION
-options FREEBSD_BOOT_LOADER
+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 KBD_INSTALL_CDEV
+options PREEMPTION
+options FREEBSD_BOOT_LOADER
options MUTEX_NOINLINE
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
@@ -59,10 +59,10 @@ options VFP # vfp/neon
# Debugging
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-options BREAK_TO_DEBUGGER
+options BREAK_TO_DEBUGGER
#options VERBOSE_SYSINIT # Enable verbose sysinit messages
-options KDB
-options DDB # Enable the kernel debugger
+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
@@ -70,9 +70,9 @@ options DDB # Enable the kernel debugger
#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
@@ -86,9 +86,9 @@ device mmc # mmc/sd bus
device mmcsd # mmc/sd flash cards
device sdhci # generic sdhci
-#options ROOTDEVNAME=\"nfs:10.5.0.1:/tftpboot/cosmic\"
-#options ROOTDEVNAME=\"nandfs:/dev/gnand0s.root\"
-options ROOTDEVNAME=\"ufs:/dev/da0\"
+#options ROOTDEVNAME=\"nfs:10.5.0.1:/tftpboot/cosmic\"
+#options ROOTDEVNAME=\"nandfs:/dev/gnand0s.root\"
+options ROOTDEVNAME=\"ufs:/dev/da0\"
#options SMP
@@ -103,7 +103,7 @@ device gpio
# USB support
options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device usb
-options USB_DEBUG
+options USB_DEBUG
#options USB_REQ_DEBUG
#options USB_VERBOSE
#device musb
@@ -143,6 +143,6 @@ device sound
# Framebuffer
device vt
device kbdmux
-options SC_DFLT_FONT # compile font in
+options SC_DFLT_FONT # compile font in
makeoptions SC_DFLT_FONT=cp437
device ukbd
diff --git a/sys/arm/conf/WANDBOARD.common b/sys/arm/conf/WANDBOARD.common
index 3f4c717..a147353 100644
--- a/sys/arm/conf/WANDBOARD.common
+++ b/sys/arm/conf/WANDBOARD.common
@@ -35,7 +35,7 @@ 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 TMPFS # Efficient memory filesystem
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
#options PROCFS # Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD
index 295b6ca..147c7f3 100644
--- a/sys/arm/conf/ZEDBOARD
+++ b/sys/arm/conf/ZEDBOARD
@@ -43,7 +43,7 @@ options NFSCL # Network Filesystem Client
options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
-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)
@@ -54,7 +54,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 FREEBSD_BOOT_LOADER
+options FREEBSD_BOOT_LOADER
options VFP # vfp/neon
# Debugging
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 8d1fb04..b5b4d9b 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -381,7 +381,7 @@ options VESA_DEBUG
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.
@@ -756,7 +756,7 @@ device ips
#
# 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
diff --git a/sys/i386/conf/XEN b/sys/i386/conf/XEN
index 2c2712a..f785c34 100644
--- a/sys/i386/conf/XEN
+++ b/sys/i386/conf/XEN
@@ -83,8 +83,8 @@ device gif # IPv6 and IPv4 tunneling
device faith # IPv6-to-IPv4 relaying (translation)
# Wireless cards
-options IEEE80211_SUPPORT_MESH
-options AH_SUPPORT_AR5416
+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!
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 0a16b87..bb53cf9 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -183,11 +183,11 @@ device uvscom # USB serial support for DDI pocket's PHS
# Wireless NIC cards.
# The wlan(4) module assumes this, so just define it so it
# at least correctly loads.
-options IEEE80211_SUPPORT_MESH
+options IEEE80211_SUPPORT_MESH
# The ath(4) and ath_hal(4) code requires this. The module currently
# builds everything including AR5416 (and later 11n NIC) support.
-options AH_SUPPORT_AR5416
+options AH_SUPPORT_AR5416
# Various (pseudo) devices
device ether # Ethernet support
diff --git a/sys/mips/conf/ALCHEMY b/sys/mips/conf/ALCHEMY
index 9b078f9..a4508ad 100644
--- a/sys/mips/conf/ALCHEMY
+++ b/sys/mips/conf/ALCHEMY
@@ -28,15 +28,15 @@ include "../alchemy/std.alchemy"
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
-options DDB
-options KDB
+options DDB
+options KDB
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-options NFSCL #Network Filesystem Client
-options NFS_ROOT #NFS usable as /, requires NFSCL
-options PSEUDOFS #Pseudo-filesystem framework
-# options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
+options NFSCL #Network Filesystem Client
+options NFS_ROOT #NFS usable as /, requires NFSCL
+options PSEUDOFS #Pseudo-filesystem framework
+# options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options BOOTP
options BOOTP_NFSROOT
@@ -48,15 +48,15 @@ options BOOTP_COMPAT
# options SOFTUPDATES #Enable FFS soft updates support
# options UFS_ACL #Support for access control lists
# options UFS_DIRHASH #Improve performance on big directories
-options ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\"
+options ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\"
# 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 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
device loop
device ether
diff --git a/sys/mips/conf/ALFA_HORNET_UB b/sys/mips/conf/ALFA_HORNET_UB
index 296634e..d1f7497 100644
--- a/sys/mips/conf/ALFA_HORNET_UB
+++ b/sys/mips/conf/ALFA_HORNET_UB
@@ -40,11 +40,11 @@ device etherswitch
device arswitch
# read MSDOS formatted disks - USB
-#options MSDOSFS
+#options MSDOSFS
# Enable the uboot environment stuff rather then the
# redboot stuff.
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
device geom_uncompress
@@ -54,4 +54,4 @@ options GEOM_UNCOMPRESS
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
diff --git a/sys/mips/conf/AP121 b/sys/mips/conf/AP121
index ac4a3b6..81002d3 100644
--- a/sys/mips/conf/AP121
+++ b/sys/mips/conf/AP121
@@ -34,11 +34,11 @@ device etherswitch
device arswitch
# read MSDOS formatted disks - USB
-#options MSDOSFS
+#options MSDOSFS
# Enable the uboot environment stuff rather then the
# redboot stuff.
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
device geom_uncompress
@@ -48,4 +48,4 @@ options GEOM_UNCOMPRESS
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
diff --git a/sys/mips/conf/AP91 b/sys/mips/conf/AP91
index c1c2077..42f099c 100644
--- a/sys/mips/conf/AP91
+++ b/sys/mips/conf/AP91
@@ -16,9 +16,9 @@ include "AR724X_BASE"
ident "AP91"
hints "AP91.hints"
-options AR71XX_REALMEM=16*1024*1024
+options AR71XX_REALMEM=16*1024*1024
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# Limit inlines
makeoptions INLINE_LIMIT=768
@@ -37,8 +37,8 @@ options NO_SWAPPING
# uncompress - to boot read-only lzma natively from flash
device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options GEOM_UNCOMPRESS
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
# Not enough space for these..
nooptions INVARIANTS
diff --git a/sys/mips/conf/AP93 b/sys/mips/conf/AP93
index 4315b1e..639f0eb 100644
--- a/sys/mips/conf/AP93
+++ b/sys/mips/conf/AP93
@@ -16,17 +16,17 @@ include "AR724X_BASE"
ident "AP93"
hints "AP93.hints"
-options AR71XX_REALMEM=64*1024*1024
+options AR71XX_REALMEM=64*1024*1024
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# For DOS - enable if required
options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options GEOM_UNCOMPRESS
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
# Used for the static uboot partition map
device geom_map
diff --git a/sys/mips/conf/AP94 b/sys/mips/conf/AP94
index 091ec8b..505c154 100644
--- a/sys/mips/conf/AP94
+++ b/sys/mips/conf/AP94
@@ -20,16 +20,16 @@ hints "AP94.hints"
# GEOM modules
device geom_redboot # to get access to the SPI flash partitions
device geom_uzip # compressed in-memory filesystem hackery!
-options GEOM_UZIP
+options GEOM_UZIP
-options ROOTDEVNAME=\"ufs:md0.uzip\"
-options AR71XX_REALMEM=32*1024*1024
+options ROOTDEVNAME=\"ufs:md0.uzip\"
+options AR71XX_REALMEM=32*1024*1024
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
-# options MD_ROOT
-# options MD_ROOT_SIZE="6144"
+# options MD_ROOT
+# options MD_ROOT_SIZE="6144"
-options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash
-options ATH_EEPROM_FIRMWARE # Use EEPROM from flash
+options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash
+options ATH_EEPROM_FIRMWARE # Use EEPROM from flash
device firmware # Used by the above
diff --git a/sys/mips/conf/AP96 b/sys/mips/conf/AP96
index 5254a68..fa8b3f7 100644
--- a/sys/mips/conf/AP96
+++ b/sys/mips/conf/AP96
@@ -17,17 +17,17 @@ include "AR71XX_BASE"
ident "AP96"
hints "AP96.hints"
-options AR71XX_REALMEM=64*1024*1024
+options AR71XX_REALMEM=64*1024*1024
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# For DOS - enable if required
options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options GEOM_UNCOMPRESS
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
# Used for the static uboot partition map
device geom_map
diff --git a/sys/mips/conf/AR71XX_BASE b/sys/mips/conf/AR71XX_BASE
index 69b10a2..b652506 100644
--- a/sys/mips/conf/AR71XX_BASE
+++ b/sys/mips/conf/AR71XX_BASE
@@ -11,8 +11,8 @@ machine mips mips
ident AR71XX_BASE
cpu CPU_MIPS4KC
makeoptions KERNLOADADDR=0x80050000
-options HZ=1000
-options HWPMC_HOOKS
+options HZ=1000
+options HWPMC_HOOKS
files "../atheros/files.ar71xx"
@@ -26,43 +26,43 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
# modules already built.
makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_pci"
-options DDB
-options KDB
+options DDB
+options KDB
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-options INET6 # IPv6
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
+options INET6 # IPv6
-# options NFSCL #Network Filesystem Client
+# options NFSCL #Network Filesystem Client
-options PSEUDOFS #Pseudo-filesystem framework
-options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options PSEUDOFS #Pseudo-filesystem framework
+options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-# options NFS_LEGACYRPC
+# options NFS_LEGACYRPC
# Debugging for use in -current
-options INVARIANTS
-options INVARIANT_SUPPORT
-options WITNESS
-options WITNESS_SKIPSPIN
-options DEBUG_REDZONE
-options DEBUG_MEMGUARD
+options INVARIANTS
+options INVARIANT_SUPPORT
+options WITNESS
+options WITNESS_SKIPSPIN
+options DEBUG_REDZONE
+options DEBUG_MEMGUARD
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 MSDOSFS # Read MSDOS filesystems; useful for USB/CF
+# options MSDOSFS # Read MSDOS filesystems; useful for USB/CF
device pci
device ar71xx_pci
# 802.11 framework
-options IEEE80211_DEBUG
-options IEEE80211_ALQ
-options IEEE80211_SUPPORT_MESH
+options IEEE80211_DEBUG
+options IEEE80211_ALQ
+options IEEE80211_SUPPORT_MESH
# This option is currently broken for if_ath_tx.
-options IEEE80211_SUPPORT_TDMA
-options IEEE80211_AMPDU_AGE
+options IEEE80211_SUPPORT_TDMA
+options IEEE80211_AMPDU_AGE
device wlan # 802.11 support
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
@@ -73,11 +73,11 @@ device wlan_xauth # 802.11 hostap support
device ath # Atheros interface support
device ath_pci # Atheros PCI/Cardbus bus
options ATH_DEBUG
-options ATH_DIAGAPI
-options ATH_ENABLE_11N
-options AH_DEBUG
-options AH_DEBUG_ALQ
-options ALQ
+options ATH_DIAGAPI
+options ATH_ENABLE_11N
+options AH_DEBUG
+options AH_DEBUG_ALQ
+options ALQ
device ath_hal
option AH_SUPPORT_AR5416
device ath_rate_sample
@@ -92,9 +92,9 @@ device mii
device arge
device usb
-options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
-options USB_DEBUG
-options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this
+options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
+options USB_DEBUG
+options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this
device ehci
device scbus
@@ -119,7 +119,7 @@ device if_bridge
device gif # ip[46] in ip[46] tunneling protocol
device gre # generic encapsulation - only for IPv4 in IPv4 though atm
-options ARGE_DEBUG # Enable if_arge debugging for now
+options ARGE_DEBUG # Enable if_arge debugging for now
# Enable GPIO
device gpio
diff --git a/sys/mips/conf/AR724X_BASE b/sys/mips/conf/AR724X_BASE
index 7ffadb1..bec11e2 100644
--- a/sys/mips/conf/AR724X_BASE
+++ b/sys/mips/conf/AR724X_BASE
@@ -12,8 +12,8 @@ machine mips mips
ident AR724X_BASE
cpu CPU_MIPS4KC
makeoptions KERNLOADADDR=0x80050000
-options HZ=1000
-options HWPMC_HOOKS
+options HZ=1000
+options HWPMC_HOOKS
files "../atheros/files.ar71xx"
@@ -27,24 +27,24 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
# modules already built.
makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_pci hwpmc cam"
-options DDB
-options KDB
+options DDB
+options KDB
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
#options INET6 # IPv6
#options NFSCL #Network Filesystem Client
-options PSEUDOFS #Pseudo-filesystem framework
-options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options PSEUDOFS #Pseudo-filesystem framework
+options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-#options NFS_LEGACYRPC
+#options NFS_LEGACYRPC
# Debugging for use in -current
-options INVARIANTS
-options INVARIANT_SUPPORT
-options WITNESS
-options WITNESS_SKIPSPIN
-options DEBUG_REDZONE
-options DEBUG_MEMGUARD
+options INVARIANTS
+options INVARIANT_SUPPORT
+options WITNESS
+options WITNESS_SKIPSPIN
+options DEBUG_REDZONE
+options DEBUG_MEMGUARD
# Don't include the SCSI/CAM strings in the default build
options SCSI_NO_SENSE_STRINGS
@@ -58,18 +58,18 @@ options NO_FFS_SNAPSHOT
# options SOFTUPDATES #Enable FFS soft updates support
# options UFS_ACL #Support for access control lists
# options UFS_DIRHASH #Improve performance on big directories
-# options MSDOSFS # Read MSDOS filesystems; useful for USB/CF
+# options MSDOSFS # Read MSDOS filesystems; useful for USB/CF
device pci
device ar724x_pci
# 802.11 framework
-options IEEE80211_DEBUG
-options IEEE80211_ALQ
-options IEEE80211_SUPPORT_MESH
-options IEEE80211_SUPPORT_SUPERG
-options IEEE80211_SUPPORT_TDMA
-options IEEE80211_AMPDU_AGE
+options IEEE80211_DEBUG
+options IEEE80211_ALQ
+options IEEE80211_SUPPORT_MESH
+options IEEE80211_SUPPORT_SUPERG
+options IEEE80211_SUPPORT_TDMA
+options IEEE80211_AMPDU_AGE
#device wlan # 802.11 support
#device wlan_wep # 802.11 WEP support
#device wlan_ccmp # 802.11 CCMP support
@@ -80,11 +80,11 @@ options IEEE80211_AMPDU_AGE
#device ath # Atheros interface support
#device ath_pci # Atheros PCI/Cardbus bus
options ATH_DEBUG
-options ATH_DIAGAPI
-options ATH_ENABLE_11N
-options AH_DEBUG
-options AH_DEBUG_ALQ
-options ALQ
+options ATH_DIAGAPI
+options ATH_ENABLE_11N
+options AH_DEBUG
+options AH_DEBUG_ALQ
+options ALQ
#device ath_hal
option AH_SUPPORT_AR5416
#device ath_rate_sample
@@ -100,9 +100,9 @@ device arge
options ARGE_DEBUG # Enable if_arge debugging for now
#device usb
-options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
-options USB_DEBUG
-options USB_HOST_ALIGN=32 # AR724X (MIPS in general?) requires this
+options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
+options USB_DEBUG
+options USB_HOST_ALIGN=32 # AR724X (MIPS in general?) requires this
#device ehci
#device umass
diff --git a/sys/mips/conf/AR91XX_BASE b/sys/mips/conf/AR91XX_BASE
index a84474d..5608562 100644
--- a/sys/mips/conf/AR91XX_BASE
+++ b/sys/mips/conf/AR91XX_BASE
@@ -14,7 +14,7 @@ machine mips mips
ident AR91XX_BASE
cpu CPU_MIPS4KC
makeoptions KERNLOADADDR=0x80050000
-options HZ=1000
+options HZ=1000
files "../atheros/files.ar71xx"
hints "AR91XX_BASE.hints"
@@ -22,38 +22,38 @@ hints "AR91XX_BASE.hints"
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc"
-options DDB
-options KDB
+options DDB
+options KDB
options ALQ
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-options INET6 #InterNETworking
-#options NFSCL #Network Filesystem Client
-options PSEUDOFS #Pseudo-filesystem framework
-options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
+options INET6 #InterNETworking
+#options NFSCL #Network Filesystem Client
+options PSEUDOFS #Pseudo-filesystem framework
+options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
# PMC
-options HWPMC_HOOKS
+options HWPMC_HOOKS
device hwpmc
device hwpmc_mips24k
-# options NFS_LEGACYRPC
+# options NFS_LEGACYRPC
# Debugging for use in -current
-options INVARIANTS
-options INVARIANT_SUPPORT
-options WITNESS
-options WITNESS_SKIPSPIN
-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 NO_FFS_SNAPSHOT # We don't require snapshot support
+options INVARIANTS
+options INVARIANT_SUPPORT
+options WITNESS
+options WITNESS_SKIPSPIN
+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 NO_FFS_SNAPSHOT # We don't require snapshot support
# Wireless NIC cards
-options IEEE80211_DEBUG
-options IEEE80211_SUPPORT_MESH
-options IEEE80211_SUPPORT_TDMA
+options IEEE80211_DEBUG
+options IEEE80211_SUPPORT_MESH
+options IEEE80211_SUPPORT_TDMA
options IEEE80211_ALQ # 802.11 ALQ logging support
device wlan # 802.11 support
device wlan_wep # 802.11 WEP support
@@ -66,7 +66,7 @@ device ath # Atheros network device
device ath_rate_sample
device ath_ahb # Atheros host bus glue
options ATH_DEBUG
-options ATH_DIAGAPI
+options ATH_DIAGAPI
option ATH_ENABLE_11N
option AH_DEBUG_ALQ
@@ -80,7 +80,7 @@ device ath_ar5212
device ath_ar5416
device ath_ar9130
-options AH_DEBUG
+options AH_DEBUG
option AH_SUPPORT_AR5416
option AH_SUPPORT_AR9130 # Makes other chipsets not function!
option AH_DEBUG_ALQ
@@ -91,9 +91,9 @@ device mii
device arge
device usb
-options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
-options USB_DEBUG
-options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this
+options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
+options USB_DEBUG
+options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this
device ehci
device scbus
diff --git a/sys/mips/conf/AR933X_BASE b/sys/mips/conf/AR933X_BASE
index 282f3b3..7190017 100644
--- a/sys/mips/conf/AR933X_BASE
+++ b/sys/mips/conf/AR933X_BASE
@@ -14,7 +14,7 @@ machine mips mips
ident AR933X_BASE
cpu CPU_MIPS4KC
makeoptions KERNLOADADDR=0x80050000
-options HZ=1000
+options HZ=1000
files "../atheros/files.ar71xx"
hints "AR933X_BASE.hints"
@@ -23,16 +23,16 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
# makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc"
makeoptions MODULES_OVERRIDE=""
-options DDB
-options KDB
+options DDB
+options KDB
options ALQ
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-#options INET6 #InterNETworking
-#options NFSCL #Network Filesystem Client
-options PSEUDOFS #Pseudo-filesystem framework
-options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
+#options INET6 #InterNETworking
+#options NFSCL #Network Filesystem Client
+options PSEUDOFS #Pseudo-filesystem framework
+options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
# Don't include the SCSI/CAM strings in the default build
options SCSI_NO_SENSE_STRINGS
@@ -42,33 +42,33 @@ options SCSI_NO_OP_STRINGS
options NO_SYSCTL_DESCR
# Limit IO size
-options NBUF=128
+options NBUF=128
# Limit UMTX hash size
-# options UMTX_NUM_CHAINS=64
+# options UMTX_NUM_CHAINS=64
# PMC
-#options HWPMC_HOOKS
+#options HWPMC_HOOKS
#device hwpmc
#device hwpmc_mips24k
-# options NFS_LEGACYRPC
+# options NFS_LEGACYRPC
# Debugging for use in -current
-#options INVARIANTS
-#options INVARIANT_SUPPORT
-#options WITNESS
-#options WITNESS_SKIPSPIN
-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 NO_FFS_SNAPSHOT # We don't require snapshot support
+#options INVARIANTS
+#options INVARIANT_SUPPORT
+#options WITNESS
+#options WITNESS_SKIPSPIN
+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 NO_FFS_SNAPSHOT # We don't require snapshot support
# Wireless NIC cards
-options IEEE80211_DEBUG
-options IEEE80211_SUPPORT_MESH
-options IEEE80211_SUPPORT_TDMA
-options IEEE80211_SUPPORT_SUPERG
+options IEEE80211_DEBUG
+options IEEE80211_SUPPORT_MESH
+options IEEE80211_SUPPORT_TDMA
+options IEEE80211_SUPPORT_SUPERG
options IEEE80211_ALQ # 802.11 ALQ logging support
device wlan # 802.11 support
device wlan_wep # 802.11 WEP support
@@ -81,7 +81,7 @@ device ath # Atheros network device
device ath_rate_sample
device ath_ahb # Atheros host bus glue
options ATH_DEBUG
-options ATH_DIAGAPI
+options ATH_DIAGAPI
option ATH_ENABLE_11N
option AH_DEBUG_ALQ
@@ -97,9 +97,9 @@ device mii
device arge
device usb
-options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
-options USB_DEBUG
-options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this
+options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
+options USB_DEBUG
+options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this
device ehci
device scbus
diff --git a/sys/mips/conf/AR934X_BASE b/sys/mips/conf/AR934X_BASE
index a7a5911..442a681 100644
--- a/sys/mips/conf/AR934X_BASE
+++ b/sys/mips/conf/AR934X_BASE
@@ -14,7 +14,7 @@ machine mips mips
ident AR934X_BASE
cpu CPU_MIPS74KC
makeoptions KERNLOADADDR=0x80050000
-options HZ=1000
+options HZ=1000
files "../atheros/files.ar71xx"
hints "AR934X_BASE.hints"
@@ -23,16 +23,16 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
# makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc"
makeoptions MODULES_OVERRIDE=""
-options DDB
-options KDB
+options DDB
+options KDB
options ALQ
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-#options INET6 #InterNETworking
-#options NFSCL #Network Filesystem Client
-options PSEUDOFS #Pseudo-filesystem framework
-options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
+#options INET6 #InterNETworking
+#options NFSCL #Network Filesystem Client
+options PSEUDOFS #Pseudo-filesystem framework
+options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
# Don't include the SCSI/CAM strings in the default build
options SCSI_NO_SENSE_STRINGS
@@ -42,33 +42,33 @@ options SCSI_NO_OP_STRINGS
options NO_SYSCTL_DESCR
# Limit IO size
-options NBUF=128
+options NBUF=128
# Limit UMTX hash size
-# options UMTX_NUM_CHAINS=64
+# options UMTX_NUM_CHAINS=64
# PMC
-#options HWPMC_HOOKS
+#options HWPMC_HOOKS
#device hwpmc
#device hwpmc_mips24k
-# options NFS_LEGACYRPC
+# options NFS_LEGACYRPC
# Debugging for use in -current
-#options INVARIANTS
-#options INVARIANT_SUPPORT
-#options WITNESS
-#options WITNESS_SKIPSPIN
-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 NO_FFS_SNAPSHOT # We don't require snapshot support
+#options INVARIANTS
+#options INVARIANT_SUPPORT
+#options WITNESS
+#options WITNESS_SKIPSPIN
+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 NO_FFS_SNAPSHOT # We don't require snapshot support
# Wireless NIC cards
-options IEEE80211_DEBUG
-options IEEE80211_SUPPORT_MESH
-options IEEE80211_SUPPORT_TDMA
-options IEEE80211_SUPPORT_SUPERG
+options IEEE80211_DEBUG
+options IEEE80211_SUPPORT_MESH
+options IEEE80211_SUPPORT_TDMA
+options IEEE80211_SUPPORT_SUPERG
options IEEE80211_ALQ # 802.11 ALQ logging support
device wlan # 802.11 support
device wlan_wep # 802.11 WEP support
@@ -81,7 +81,7 @@ device ath # Atheros network device
device ath_rate_sample
device ath_ahb # Atheros host bus glue
options ATH_DEBUG
-options ATH_DIAGAPI
+options ATH_DIAGAPI
option ATH_ENABLE_11N
option AH_DEBUG_ALQ
@@ -97,9 +97,9 @@ device mii
device arge
device usb
-options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
-options USB_DEBUG
-options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this
+options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
+options USB_DEBUG
+options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this
device ehci
device pci
diff --git a/sys/mips/conf/CARAMBOLA2 b/sys/mips/conf/CARAMBOLA2
index 25566c9..78c212a 100644
--- a/sys/mips/conf/CARAMBOLA2
+++ b/sys/mips/conf/CARAMBOLA2
@@ -36,11 +36,11 @@ device etherswitch
device arswitch
# read MSDOS formatted disks - USB
-#options MSDOSFS
+#options MSDOSFS
# Enable the uboot environment stuff rather then the
# redboot stuff.
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
device geom_uncompress
@@ -50,4 +50,4 @@ options GEOM_UNCOMPRESS
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
diff --git a/sys/mips/conf/DB120 b/sys/mips/conf/DB120
index 682a50d..79d0b010 100644
--- a/sys/mips/conf/DB120
+++ b/sys/mips/conf/DB120
@@ -29,11 +29,11 @@ device etherswitch
device arswitch
# read MSDOS formatted disks - USB
-#options MSDOSFS
+#options MSDOSFS
# Enable the uboot environment stuff rather then the
# redboot stuff.
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
device geom_uncompress
@@ -44,9 +44,9 @@ device geom_map
# yes, this board has a PCI connected atheros device
device ath_pci
-options AR71XX_ATH_EEPROM
+options AR71XX_ATH_EEPROM
device firmware # Used by the above
-options ATH_EEPROM_FIRMWARE
+options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
diff --git a/sys/mips/conf/DIR-825B1 b/sys/mips/conf/DIR-825B1
index 6112ea4..174348c 100644
--- a/sys/mips/conf/DIR-825B1
+++ b/sys/mips/conf/DIR-825B1
@@ -53,19 +53,19 @@ options NO_SYSCTL_DESCR
# GEOM modules
device geom_map # to get access to the SPI flash partitions
device geom_uncompress # compressed in-memory filesystem hackery!
-options GEOM_UNCOMPRESS
-options GEOM_PART_GPT
+options GEOM_UNCOMPRESS
+options GEOM_PART_GPT
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
-options AR71XX_REALMEM=64*1024*1024
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options AR71XX_REALMEM=64*1024*1024
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
-options MSDOSFS # Read MSDOS filesystems; useful for USB/CF
+options MSDOSFS # Read MSDOS filesystems; useful for USB/CF
-# options MD_ROOT
-# options MD_ROOT_SIZE="6144"
+# options MD_ROOT
+# options MD_ROOT_SIZE="6144"
-options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash
-options ATH_EEPROM_FIRMWARE # Use EEPROM from flash
+options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash
+options ATH_EEPROM_FIRMWARE # Use EEPROM from flash
device firmware # Used by the above
diff --git a/sys/mips/conf/ENH200 b/sys/mips/conf/ENH200
index 886397f..bb88694 100644
--- a/sys/mips/conf/ENH200
+++ b/sys/mips/conf/ENH200
@@ -16,17 +16,17 @@ include "AR724X_BASE"
ident "ENH200"
hints "ENH200.hints"
-options AR71XX_REALMEM=32*1024*1024
+options AR71XX_REALMEM=32*1024*1024
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# For DOS - enable if required
options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options GEOM_UNCOMPRESS
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
# Used for the static uboot partition map
device geom_map
diff --git a/sys/mips/conf/PB47 b/sys/mips/conf/PB47
index f006405..65e54fd 100644
--- a/sys/mips/conf/PB47
+++ b/sys/mips/conf/PB47
@@ -19,22 +19,22 @@ hints "PB47.hints"
# Enable the uboot environment stuff rather then the
# redboot stuff.
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# XXX TODO: add uboot boot parameter parsing to extract MAC, RAM.
# Right now it will just detect 32mb out of 64mb, as well as
# return a garbage MAC address.
-options AR71XX_REALMEM=64*1024*1024
+options AR71XX_REALMEM=64*1024*1024
# For DOS - enable if required
-options MSDOSFS
+options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
device geom_uncompress
-options GEOM_UNCOMPRESS
+options GEOM_UNCOMPRESS
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
diff --git a/sys/mips/conf/PB92 b/sys/mips/conf/PB92
index 2ca7cfe..b634cae 100644
--- a/sys/mips/conf/PB92
+++ b/sys/mips/conf/PB92
@@ -8,13 +8,13 @@
ident PB92
# XXX The default load address in the Uboot environment is 0x80010000
makeoptions KERNLOADADDR=0x80050000
-options HZ=1000
+options HZ=1000
# The PB92 has 32mb of RAM; hard-code that
-options AR71XX_REALMEM=32*1024*1024
+options AR71XX_REALMEM=32*1024*1024
# It's UBOOT, not Redboot - without this, things will hang at startup
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# We have to build most things as modules rather than in the kernel.
# The PB92 has 4MB of SPI flash and the default kernel "partition"
@@ -30,24 +30,24 @@ include "../atheros/std.ar71xx"
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions MODULES_OVERRIDE=""
-options DDB
-options KDB
+options DDB
+options KDB
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
# Can't do IPv6 - it just doesn't fit.
-# options INET6
-# options NFSCL #Network Filesystem Client
-options PSEUDOFS #Pseudo-filesystem framework
-options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-options ALQ
+# options INET6
+# options NFSCL #Network Filesystem Client
+options PSEUDOFS #Pseudo-filesystem framework
+options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options ALQ
# Debugging for use in -current
-options DEADLKRES
-options INVARIANTS
-options INVARIANT_SUPPORT
-options WITNESS
-options WITNESS_SKIPSPIN
+options DEADLKRES
+options INVARIANTS
+options INVARIANT_SUPPORT
+options WITNESS
+options WITNESS_SKIPSPIN
options FFS #Berkeley Fast Filesystem
#options SOFTUPDATES #Enable FFS soft updates support
#options UFS_ACL #Support for access control lists
@@ -55,8 +55,8 @@ options FFS #Berkeley Fast Filesystem
# Support uncompress lzma rootfs
device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options GEOM_UNCOMPRESS
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
# PCI bus
device pci
@@ -66,10 +66,10 @@ device ar724x_pci
device nvram2env
# Wireless NIC cards
-options IEEE80211_DEBUG
-options IEEE80211_SUPPORT_MESH
-options IEEE80211_SUPPORT_TDMA
-options IEEE80211_ALQ
+options IEEE80211_DEBUG
+options IEEE80211_SUPPORT_MESH
+options IEEE80211_SUPPORT_TDMA
+options IEEE80211_ALQ
#device wlan # 802.11 support
#device wlan_wep # 802.11 WEP support
#device wlan_ccmp # 802.11 CCMP support
@@ -79,13 +79,13 @@ options IEEE80211_ALQ
#device ath # Atheros pci/cardbus NIC's
#device ath_pci # PCI/PCIe bus glue
options ATH_DEBUG
-options ATH_ENABLE_11N
-options ATH_DIAGAPI
+options ATH_ENABLE_11N
+options ATH_DIAGAPI
# device ath_hal
-options AH_SUPPORT_AR5416
-options AH_DEBUG
-options AH_DEBUG_ALQ
+options AH_SUPPORT_AR5416
+options AH_DEBUG
+options AH_DEBUG_ALQ
# device ath_rate_sample
@@ -95,9 +95,9 @@ device arge
# USB devices - PB92 has EHCI only
#device usb
-options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
-options USB_DEBUG
-options USB_HOST_ALIGN=32
+options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
+options USB_DEBUG
+options USB_HOST_ALIGN=32
#device ehci
# Mass storage
@@ -106,7 +106,7 @@ options USB_HOST_ALIGN=32
#device da
# Read MSDOS formatted disks
-# options MSDOSFS
+# options MSDOSFS
# GPIO Bus
#device gpio
diff --git a/sys/mips/conf/PICOSTATION_M2HP b/sys/mips/conf/PICOSTATION_M2HP
index 0f5ac17..da6228b 100644
--- a/sys/mips/conf/PICOSTATION_M2HP
+++ b/sys/mips/conf/PICOSTATION_M2HP
@@ -16,9 +16,9 @@ include "AR724X_BASE"
ident "PICOSTATION_M2HP"
hints "PICOSTATION_M2HP.hints"
-options AR71XX_REALMEM=32*1024*1024
+options AR71XX_REALMEM=32*1024*1024
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# Limit inlines
makeoptions INLINE_LIMIT=768
@@ -37,8 +37,8 @@ options NO_SWAPPING
# uncompress - to boot read-only lzma natively from flash
device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options GEOM_UNCOMPRESS
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
# Not enough space for these..
nooptions INVARIANTS
diff --git a/sys/mips/conf/ROUTERSTATION b/sys/mips/conf/ROUTERSTATION
index dded480..a680c26 100644
--- a/sys/mips/conf/ROUTERSTATION
+++ b/sys/mips/conf/ROUTERSTATION
@@ -13,16 +13,16 @@ hints "ROUTERSTATION.hints"
# GEOM modules
device geom_redboot # to get access to the SPI flash partitions
device geom_uzip # compressed in-memory filesystem support
-options GEOM_UZIP
+options GEOM_UZIP
# For DOS
-options MSDOSFS
+options MSDOSFS
# Etherswitch support
-options ARGE_MDIO
+options ARGE_MDIO
device miiproxy
device etherswitch
device ukswitch
# Boot path - redboot MFS
-options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\"
+options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\"
diff --git a/sys/mips/conf/ROUTERSTATION_MFS b/sys/mips/conf/ROUTERSTATION_MFS
index 087659b..6c0f0f1 100644
--- a/sys/mips/conf/ROUTERSTATION_MFS
+++ b/sys/mips/conf/ROUTERSTATION_MFS
@@ -11,9 +11,9 @@ hints "ROUTERSTATION.hints"
# GEOM modules
device geom_redboot # to get access to the SPI flash partitions
device geom_uzip # compressed in-memory filesystem hackery!
-options GEOM_UZIP
+options GEOM_UZIP
-options ROOTDEVNAME=\"ufs:md0.uzip\"
+options ROOTDEVNAME=\"ufs:md0.uzip\"
-options MD_ROOT
-options MD_ROOT_SIZE="6144"
+options MD_ROOT
+options MD_ROOT_SIZE="6144"
diff --git a/sys/mips/conf/RSPRO b/sys/mips/conf/RSPRO
index bdb606c..d5a5405 100644
--- a/sys/mips/conf/RSPRO
+++ b/sys/mips/conf/RSPRO
@@ -14,17 +14,17 @@ device pcf2123_rtc
# GEOM modules
device geom_redboot # to get access to the SPI flash partitions
device geom_uzip # compressed in-memory filesystem support
-options GEOM_UZIP
+options GEOM_UZIP
# For DOS
-options MSDOSFS
+options MSDOSFS
# For etherswitch support
-options ARGE_MDIO
+options ARGE_MDIO
device miiproxy
device etherswitch
device arswitch
# Boot off of flash
-options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\"
+options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\"
diff --git a/sys/mips/conf/RSPRO_MFS b/sys/mips/conf/RSPRO_MFS
index b9598f1..f0c9b5b 100644
--- a/sys/mips/conf/RSPRO_MFS
+++ b/sys/mips/conf/RSPRO_MFS
@@ -14,10 +14,10 @@ device pcf2123_rtc
# GEOM modules
device geom_redboot # to get access to the SPI flash partitions
device geom_uzip # compressed in-memory filesystem hackery!
-options GEOM_UZIP
+options GEOM_UZIP
# Boot from the first MFS uzip
-options ROOTDEVNAME=\"ufs:md0.uzip\"
+options ROOTDEVNAME=\"ufs:md0.uzip\"
-options MD_ROOT
-options MD_ROOT_SIZE="6144"
+options MD_ROOT
+options MD_ROOT_SIZE="6144"
diff --git a/sys/mips/conf/RSPRO_STANDALONE b/sys/mips/conf/RSPRO_STANDALONE
index 2a7014f..24b2750 100644
--- a/sys/mips/conf/RSPRO_STANDALONE
+++ b/sys/mips/conf/RSPRO_STANDALONE
@@ -15,10 +15,10 @@ device pcf2123_rtc
# GEOM modules
device geom_redboot # to get access to the SPI flash partitions
device geom_uzip # compressed in-memory filesystem support
-options GEOM_UZIP
+options GEOM_UZIP
# For DOS
-options MSDOSFS
+options MSDOSFS
# .. first DOS-partitioned, BSD sliced flash disk
-options ROOTDEVNAME=\"ufs:da0s1a\"
+options ROOTDEVNAME=\"ufs:da0s1a\"
diff --git a/sys/mips/conf/RT305X b/sys/mips/conf/RT305X
index 6527782..9d6ea17 100644
--- a/sys/mips/conf/RT305X
+++ b/sys/mips/conf/RT305X
@@ -35,10 +35,10 @@ hints "RT305X.hints" #Default places to look for devices.
# 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 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 DEBUG_LOCKS
#options DEBUG_VFS_LOCKS
@@ -48,7 +48,7 @@ options KDB
options SCHED_ULE
#options SCHED_4BSD #4BSD scheduler
-#options COMPAT_43
+#options COMPAT_43
options INET #InterNETworking
options NFSCL #Network Filesystem Client
options NFS_ROOT #NFS usable as /, requires NFSCL
@@ -61,7 +61,7 @@ options BOOTP_NFSV3
options BOOTP_WIRED_TO=rt0
options BOOTP_COMPAT
options CD9660 # ISO 9660 Filesystem
-options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uncompress\"
+options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uncompress\"
options TMPFS # TMP Memory Filesystem
#options FFS #Berkeley Fast Filesystem
@@ -72,22 +72,22 @@ options TMPFS # TMP Memory Filesystem
# Options for making kernel less hangry
makeoptions INLINE_LIMIT=1024
-options MAXUSERS=3
-options MAXFILES=512
-options NSFBUFS=256
-options SHMALL=128
-options MSGBUF_SIZE=65536
+options MAXUSERS=3
+options MAXFILES=512
+options NSFBUFS=256
+options SHMALL=128
+options MSGBUF_SIZE=65536
# Options for making kernel smallest
-options NO_SYSCTL_DESCR # No description string of sysctl
-#options NO_FFS_SNAPSHOT # Disable Snapshot supporting
-options SCSI_NO_SENSE_STRINGS
-options SCSI_NO_OP_STRINGS
-options RWLOCK_NOINLINE
-options SX_NOINLINE
-options NO_SWAPPING
+options NO_SYSCTL_DESCR # No description string of sysctl
+#options NO_FFS_SNAPSHOT # Disable Snapshot supporting
+options SCSI_NO_SENSE_STRINGS
+options SCSI_NO_OP_STRINGS
+options RWLOCK_NOINLINE
+options SX_NOINLINE
+options NO_SWAPPING
options MROUTING # Multicast routing
-options IPFIREWALL_DEFAULT_TO_ACCEPT
+options IPFIREWALL_DEFAULT_TO_ACCEPT
device random
device loop
@@ -125,8 +125,8 @@ device usb
#device scbus
options SCSI_DELAY=1000 # Delay (in ms) before probing SCSI
-#options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
-#options USB_DEBUG
-#options USB_REQ_DEBUG
+#options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
+#options USB_DEBUG
+#options USB_REQ_DEBUG
diff --git a/sys/mips/conf/SENTRY5 b/sys/mips/conf/SENTRY5
index 9436441..dadf790 100644
--- a/sys/mips/conf/SENTRY5
+++ b/sys/mips/conf/SENTRY5
@@ -32,27 +32,27 @@ hints "SENTRY5.hints"
include "../sentry5/std.sentry5"
# sentry5 normally ships with cfe firmware; use the console for now
-options CFE
-options CFE_CONSOLE
-options ALT_BREAK_TO_DEBUGGER
+options CFE
+options CFE_CONSOLE
+options ALT_BREAK_TO_DEBUGGER
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions MODULES_OVERRIDE=""
-options DDB
-options KDB
+options DDB
+options KDB
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-options NFSCL #Network Filesystem Client
-options NFS_ROOT #NFS usable as /, requires NFSCL
-options PSEUDOFS #Pseudo-filesystem framework
-options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
+options NFSCL #Network Filesystem Client
+options NFS_ROOT #NFS usable as /, requires NFSCL
+options PSEUDOFS #Pseudo-filesystem framework
+options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
# Debugging for use in -current
#options DEADLKRES
-options INVARIANTS
-options INVARIANT_SUPPORT
+options INVARIANTS
+options INVARIANT_SUPPORT
#options BUS_DEBUG
#makeoptions BUS_DEBUG
@@ -68,7 +68,7 @@ device pci # siba_pcib
#device ath # in pci slot
#device ath_pci # Atheros pci/cardbus glue
#device ath_hal # pci chip support
-#options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
+#options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
options USB_DEBUG # enable debug msgs
device usb # USB Bus (required)
diff --git a/sys/mips/conf/SWARM64_SMP b/sys/mips/conf/SWARM64_SMP
index b4cd666..870caca 100644
--- a/sys/mips/conf/SWARM64_SMP
+++ b/sys/mips/conf/SWARM64_SMP
@@ -6,8 +6,8 @@ include "std.SWARM"
ident SWARM64_SMP
-options SMP
-options PRINTF_BUFR_SIZE=128
+options SMP
+options PRINTF_BUFR_SIZE=128
machine mips mips64
makeoptions ARCH_FLAGS="-mabi=64 -march=mips64"
diff --git a/sys/mips/conf/SWARM_SMP b/sys/mips/conf/SWARM_SMP
index d4f1541..cc54880 100644
--- a/sys/mips/conf/SWARM_SMP
+++ b/sys/mips/conf/SWARM_SMP
@@ -6,8 +6,8 @@ include "std.SWARM"
ident SWARM_SMP
-options SMP
-options PRINTF_BUFR_SIZE=128
+options SMP
+options PRINTF_BUFR_SIZE=128
machine mips mips
diff --git a/sys/mips/conf/TP-WN1043ND b/sys/mips/conf/TP-WN1043ND
index 5493d0f..ed3309c 100644
--- a/sys/mips/conf/TP-WN1043ND
+++ b/sys/mips/conf/TP-WN1043ND
@@ -28,11 +28,11 @@ device etherswitch
device rtl8366rb
# read MSDOS formatted disks - USB
-options MSDOSFS
+options MSDOSFS
# Enable the uboot environment stuff rather then the
# redboot stuff.
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
# uncompress - to boot natively from flash
device geom_uncompress
diff --git a/sys/mips/conf/WZR-300HP b/sys/mips/conf/WZR-300HP
index aff305e..ce86403 100644
--- a/sys/mips/conf/WZR-300HP
+++ b/sys/mips/conf/WZR-300HP
@@ -16,11 +16,11 @@ include "AR724X_BASE"
ident "WZR-300HP"
hints "WZR-300HP.hints"
-options AR71XX_REALMEM=64*1024*1024
+options AR71XX_REALMEM=64*1024*1024
-options AR71XX_ENV_UBOOT
+options AR71XX_ENV_UBOOT
-options BOOTVERBOSE
+options BOOTVERBOSE
# Don't include the SCSI/CAM strings in the default build
options SCSI_NO_SENSE_STRINGS
options SCSI_NO_OP_STRINGS
@@ -32,13 +32,13 @@ options NO_SYSCTL_DESCR
device geom_map # to get access to the SPI flash partitions
device geom_uncompress # compressed in-memory filesystem hackery!
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
-# options MD_ROOT
-# options MD_ROOT_SIZE="6144"
+# options MD_ROOT
+# options MD_ROOT_SIZE="6144"
-options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash
-options ATH_EEPROM_FIRMWARE # Use EEPROM from flash
+options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash
+options ATH_EEPROM_FIRMWARE # Use EEPROM from flash
device firmware # Used by the above
# Options required for miiproxy and mdiobus
diff --git a/sys/mips/conf/XLRN32 b/sys/mips/conf/XLRN32
index d81eaf9..c23b451 100644
--- a/sys/mips/conf/XLRN32
+++ b/sys/mips/conf/XLRN32
@@ -40,15 +40,15 @@ 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
-options NFS_ROOT
+options NFSCL
+options NFS_ROOT
#
options BOOTP
options BOOTP_NFSROOT
options BOOTP_NFSV3
options BOOTP_WIRED_TO=nlge0
options BOOTP_COMPAT
-options ROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\"
+options ROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\"
#
#options MD_ROOT # MD is a potential root device
#options MD_ROOT_SIZE=27000
diff --git a/sys/mips/conf/std.SWARM b/sys/mips/conf/std.SWARM
index 0405b0a..c737905 100644
--- a/sys/mips/conf/std.SWARM
+++ b/sys/mips/conf/std.SWARM
@@ -5,35 +5,35 @@
hints "SWARM.hints"
include "../sibyte/std.sibyte"
-options CFE
-options CFE_CONSOLE
-options CFE_ENV
-options ALT_BREAK_TO_DEBUGGER
+options CFE
+options CFE_CONSOLE
+options CFE_ENV
+options ALT_BREAK_TO_DEBUGGER
cpu CPU_SB1
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions MODULES_OVERRIDE=""
-options DDB
-options KDB
+options DDB
+options KDB
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-options NFSCL #Network Filesystem Client
-options NFS_ROOT #NFS usable as /, requires NFSCL
-options PSEUDOFS #Pseudo-filesystem framework
-options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
+options NFSCL #Network Filesystem Client
+options NFS_ROOT #NFS usable as /, requires NFSCL
+options PSEUDOFS #Pseudo-filesystem framework
+options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
# Debugging for use in -current
#options DEADLKRES
-options INVARIANTS
-options INVARIANT_SUPPORT
-options WITNESS
+options INVARIANTS
+options INVARIANT_SUPPORT
+options WITNESS
options FFS #Fast filesystem
-options KTRACE
+options KTRACE
device pci
device miibus
@@ -43,7 +43,7 @@ device ether
device md
device random
-options USB_DEBUG
+options USB_DEBUG
device usb
device ohci
device uhci
diff --git a/sys/mips/conf/std.XLP b/sys/mips/conf/std.XLP
index bf5fbe8..3d249bc 100644
--- a/sys/mips/conf/std.XLP
+++ b/sys/mips/conf/std.XLP
@@ -19,9 +19,9 @@ 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
-options NFS_ROOT
-options MSDOSFS #MSDOS Filesystem
+options NFSCL
+options NFS_ROOT
+options MSDOSFS #MSDOS Filesystem
#
#options BOOTP
#options BOOTP_NFSROOT
@@ -31,8 +31,8 @@ options MSDOSFS #MSDOS Filesystem
#options ROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\"
options MD_ROOT # MD is a potential root device
-options MD_ROOT_SIZE=132000
-options ROOTDEVNAME=\"ufs:md0\"
+options MD_ROOT_SIZE=132000
+options ROOTDEVNAME=\"ufs:md0\"
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options HZ=1000
options NO_SWAPPING
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index f41c9df..4400b53 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -30,7 +30,7 @@ makeoptions WITH_CTF=1
options POWERMAC #NewWorld Apple PowerMacs
options PSIM #GDB PSIM ppc simulator
options MAMBO #IBM Mambo Full System Simulator
-options PSERIES #PAPR-compliant systems
+options PSERIES #PAPR-compliant systems
options SCHED_ULE #ULE scheduler
options PREEMPTION #Enable kernel thread preemption
@@ -185,8 +185,8 @@ device cue # CATC USB Ethernet
device kue # Kawasaki LSI USB Ethernet
# Wireless NIC cards
-options IEEE80211_SUPPORT_MESH
-options AH_SUPPORT_AR5416
+options IEEE80211_SUPPORT_MESH
+options AH_SUPPORT_AR5416
# Misc
device iicbus # I2C bus code
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 24dc7da..60bd04e 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -30,7 +30,7 @@ makeoptions WITH_CTF=1
options POWERMAC #NewWorld Apple PowerMacs
options PS3 #Sony Playstation 3
options MAMBO #IBM Mambo Full System Simulator
-options PSERIES #PAPR-compliant systems (e.g. IBM p)
+options PSERIES #PAPR-compliant systems (e.g. IBM p)
options SCHED_ULE #ULE scheduler
options PREEMPTION #Enable kernel thread preemption
@@ -185,8 +185,8 @@ device cue # CATC USB Ethernet
device kue # Kawasaki LSI USB Ethernet
# Wireless NIC cards
-options IEEE80211_SUPPORT_MESH
-options AH_SUPPORT_AR5416
+options IEEE80211_SUPPORT_MESH
+options AH_SUPPORT_AR5416
# FireWire support
device firewire # FireWire bus code
diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX
index d296484..6c9a2aa 100644
--- a/sys/powerpc/conf/MPC85XX
+++ b/sys/powerpc/conf/MPC85XX
@@ -49,9 +49,9 @@ options NFSLOCKD
options PROCFS
options PSEUDOFS
options SCHED_ULE
-options CAPABILITIES
-options CAPABILITY_MODE
-options SMP
+options CAPABILITIES
+options CAPABILITY_MODE
+options SMP
options SYSVMSG
options SYSVSEM
options SYSVSHM
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 3388b7a..a0443c4 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -23,7 +23,7 @@ options FPU_EMU
options POWERMAC #NewWorld Apple PowerMacs
#options PS3 #Sony Playstation 3
options PSIM #GDB PSIM ppc simulator
-options MAMBO #IBM Mambo Full System Simulator
+options MAMBO #IBM Mambo Full System Simulator
#options WII #Nintendo Wii
options SC_OFWFB # OFW frame buffer
OpenPOWER on IntegriCloud