svn commit: r266331 - in stable/10/sys: amd64/conf arm/conf i386/conf ia64/conf mips/conf powerpc/conf
Ian Lepore
ian at FreeBSD.org
Sat May 17 17:34:49 UTC 2014
Author: ian
Date: Sat May 17 17:34:37 2014
New Revision: 266331
URL: http://svnweb.freebsd.org/changeset/base/266331
Log:
MFC 263301
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.
Modified:
stable/10/sys/amd64/conf/NOTES
stable/10/sys/arm/conf/AC100
stable/10/sys/arm/conf/ARMADAXP
stable/10/sys/arm/conf/ARNDALE
stable/10/sys/arm/conf/ATMEL
stable/10/sys/arm/conf/AVILA
stable/10/sys/arm/conf/BEAGLEBONE
stable/10/sys/arm/conf/BWCT
stable/10/sys/arm/conf/CAMBRIA
stable/10/sys/arm/conf/CNS11XXNAS
stable/10/sys/arm/conf/COLIBRI-VF50
stable/10/sys/arm/conf/COSMIC
stable/10/sys/arm/conf/CRB
stable/10/sys/arm/conf/CUBIEBOARD
stable/10/sys/arm/conf/CUBIEBOARD2
stable/10/sys/arm/conf/DB-78XXX
stable/10/sys/arm/conf/DB-88F5XXX
stable/10/sys/arm/conf/DB-88F6XXX
stable/10/sys/arm/conf/DIGI-CCWMX53
stable/10/sys/arm/conf/DOCKSTAR
stable/10/sys/arm/conf/DREAMPLUG-1001
stable/10/sys/arm/conf/EA3250
stable/10/sys/arm/conf/EB9200
stable/10/sys/arm/conf/EFIKA_MX
stable/10/sys/arm/conf/EP80219
stable/10/sys/arm/conf/ETHERNUT5
stable/10/sys/arm/conf/GUMSTIX
stable/10/sys/arm/conf/HL200
stable/10/sys/arm/conf/HL201
stable/10/sys/arm/conf/IMX53-QSB
stable/10/sys/arm/conf/IMX6
stable/10/sys/arm/conf/IQ31244
stable/10/sys/arm/conf/KB920X
stable/10/sys/arm/conf/LN2410SBC
stable/10/sys/arm/conf/NSLU
stable/10/sys/arm/conf/PANDABOARD
stable/10/sys/arm/conf/QILA9G20
stable/10/sys/arm/conf/QUARTZ
stable/10/sys/arm/conf/RADXA
stable/10/sys/arm/conf/RPI-B
stable/10/sys/arm/conf/SAM9260EK
stable/10/sys/arm/conf/SAM9G20EK
stable/10/sys/arm/conf/SAM9X25EK
stable/10/sys/arm/conf/SHEEVAPLUG
stable/10/sys/arm/conf/SN9G45
stable/10/sys/arm/conf/TS7800
stable/10/sys/arm/conf/VERSATILEPB
stable/10/sys/arm/conf/VYBRID.common
stable/10/sys/arm/conf/WANDBOARD.common
stable/10/sys/arm/conf/ZEDBOARD
stable/10/sys/i386/conf/NOTES
stable/10/sys/i386/conf/XEN
stable/10/sys/ia64/conf/GENERIC
stable/10/sys/mips/conf/ALCHEMY
stable/10/sys/mips/conf/AP121
stable/10/sys/mips/conf/AP91
stable/10/sys/mips/conf/AP93
stable/10/sys/mips/conf/AP94
stable/10/sys/mips/conf/AP96
stable/10/sys/mips/conf/AR71XX_BASE
stable/10/sys/mips/conf/AR724X_BASE
stable/10/sys/mips/conf/AR91XX_BASE
stable/10/sys/mips/conf/AR933X_BASE
stable/10/sys/mips/conf/AR934X_BASE
stable/10/sys/mips/conf/CARAMBOLA2
stable/10/sys/mips/conf/ENH200
stable/10/sys/mips/conf/PB47
stable/10/sys/mips/conf/PB92
stable/10/sys/mips/conf/PICOSTATION_M2HP
stable/10/sys/mips/conf/ROUTERSTATION
stable/10/sys/mips/conf/ROUTERSTATION_MFS
stable/10/sys/mips/conf/RSPRO
stable/10/sys/mips/conf/RSPRO_MFS
stable/10/sys/mips/conf/RSPRO_STANDALONE
stable/10/sys/mips/conf/RT305X
stable/10/sys/mips/conf/SENTRY5
stable/10/sys/mips/conf/SWARM64_SMP
stable/10/sys/mips/conf/SWARM_SMP
stable/10/sys/mips/conf/TP-WN1043ND
stable/10/sys/mips/conf/WZR-300HP
stable/10/sys/mips/conf/XLRN32
stable/10/sys/mips/conf/std.SWARM
stable/10/sys/mips/conf/std.XLP
stable/10/sys/powerpc/conf/GENERIC
stable/10/sys/powerpc/conf/GENERIC64
stable/10/sys/powerpc/conf/MPC85XX
stable/10/sys/powerpc/conf/NOTES
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/conf/NOTES
==============================================================================
--- stable/10/sys/amd64/conf/NOTES Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/amd64/conf/NOTES Sat May 17 17:34:37 2014 (r266331)
@@ -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:
@@ -442,7 +442,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
Modified: stable/10/sys/arm/conf/AC100
==============================================================================
--- stable/10/sys/arm/conf/AC100 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/AC100 Sat May 17 17:34:37 2014 (r266331)
@@ -25,7 +25,7 @@ options FFS # Berkeley Fast Filesyste
#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
Modified: stable/10/sys/arm/conf/ARMADAXP
==============================================================================
--- stable/10/sys/arm/conf/ARMADAXP Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/ARMADAXP Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/ARNDALE
==============================================================================
--- stable/10/sys/arm/conf/ARNDALE Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/ARNDALE Sat May 17 17:34:37 2014 (r266331)
@@ -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 Eth
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
Modified: stable/10/sys/arm/conf/ATMEL
==============================================================================
--- stable/10/sys/arm/conf/ATMEL Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/ATMEL Sat May 17 17:34:37 2014 (r266331)
@@ -48,7 +48,7 @@ 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)
Modified: stable/10/sys/arm/conf/AVILA
==============================================================================
--- stable/10/sys/arm/conf/AVILA Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/AVILA Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/BEAGLEBONE
==============================================================================
--- stable/10/sys/arm/conf/BEAGLEBONE Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/BEAGLEBONE Sat May 17 17:34:37 2014 (r266331)
@@ -36,7 +36,7 @@ options UFS_ACL # Support for access
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)
Modified: stable/10/sys/arm/conf/BWCT
==============================================================================
--- stable/10/sys/arm/conf/BWCT Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/BWCT Sat May 17 17:34:37 2014 (r266331)
@@ -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)
Modified: stable/10/sys/arm/conf/CAMBRIA
==============================================================================
--- stable/10/sys/arm/conf/CAMBRIA Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/CAMBRIA Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/CNS11XXNAS
==============================================================================
--- stable/10/sys/arm/conf/CNS11XXNAS Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/CNS11XXNAS Sat May 17 17:34:37 2014 (r266331)
@@ -71,7 +71,7 @@ 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)
Modified: stable/10/sys/arm/conf/COLIBRI-VF50
==============================================================================
--- stable/10/sys/arm/conf/COLIBRI-VF50 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/COLIBRI-VF50 Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/COSMIC
==============================================================================
--- stable/10/sys/arm/conf/COSMIC Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/COSMIC Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/CRB
==============================================================================
--- stable/10/sys/arm/conf/CRB Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/CRB Sat May 17 17:34:37 2014 (r266331)
@@ -47,7 +47,7 @@ options NFS_ROOT # NFS usable as /, re
#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
Modified: stable/10/sys/arm/conf/CUBIEBOARD
==============================================================================
--- stable/10/sys/arm/conf/CUBIEBOARD Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/CUBIEBOARD Sat May 17 17:34:37 2014 (r266331)
@@ -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 wi
#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
Modified: stable/10/sys/arm/conf/CUBIEBOARD2
==============================================================================
--- stable/10/sys/arm/conf/CUBIEBOARD2 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/CUBIEBOARD2 Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/DB-78XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-78XXX Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/DB-78XXX Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/DB-88F5XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-88F5XXX Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/DB-88F5XXX Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/DB-88F6XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-88F6XXX Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/DB-88F6XXX Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/DIGI-CCWMX53
==============================================================================
--- stable/10/sys/arm/conf/DIGI-CCWMX53 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/DIGI-CCWMX53 Sat May 17 17:34:37 2014 (r266331)
@@ -41,7 +41,7 @@ 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)
Modified: stable/10/sys/arm/conf/DOCKSTAR
==============================================================================
--- stable/10/sys/arm/conf/DOCKSTAR Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/DOCKSTAR Sat May 17 17:34:37 2014 (r266331)
@@ -34,7 +34,7 @@ options INET6 # IPv6 communications p
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
Modified: stable/10/sys/arm/conf/DREAMPLUG-1001
==============================================================================
--- stable/10/sys/arm/conf/DREAMPLUG-1001 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/DREAMPLUG-1001 Sat May 17 17:34:37 2014 (r266331)
@@ -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)
Modified: stable/10/sys/arm/conf/EA3250
==============================================================================
--- stable/10/sys/arm/conf/EA3250 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/EA3250 Sat May 17 17:34:37 2014 (r266331)
@@ -22,7 +22,7 @@ options NFSLOCKD # Network Lock Manage
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
Modified: stable/10/sys/arm/conf/EB9200
==============================================================================
--- stable/10/sys/arm/conf/EB9200 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/EB9200 Sat May 17 17:34:37 2014 (r266331)
@@ -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)
Modified: stable/10/sys/arm/conf/EFIKA_MX
==============================================================================
--- stable/10/sys/arm/conf/EFIKA_MX Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/EFIKA_MX Sat May 17 17:34:37 2014 (r266331)
@@ -41,7 +41,7 @@ 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)
Modified: stable/10/sys/arm/conf/EP80219
==============================================================================
--- stable/10/sys/arm/conf/EP80219 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/EP80219 Sat May 17 17:34:37 2014 (r266331)
@@ -43,7 +43,7 @@ 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)
Modified: stable/10/sys/arm/conf/ETHERNUT5
==============================================================================
--- stable/10/sys/arm/conf/ETHERNUT5 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/ETHERNUT5 Sat May 17 17:34:37 2014 (r266331)
@@ -43,7 +43,7 @@ options NFSLOCKD # Network Lock Manage
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)
Modified: stable/10/sys/arm/conf/GUMSTIX
==============================================================================
--- stable/10/sys/arm/conf/GUMSTIX Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/GUMSTIX Sat May 17 17:34:37 2014 (r266331)
@@ -49,7 +49,7 @@ options NFSCL # New Network Filesyste
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)
Modified: stable/10/sys/arm/conf/HL200
==============================================================================
--- stable/10/sys/arm/conf/HL200 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/HL200 Sat May 17 17:34:37 2014 (r266331)
@@ -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)
Modified: stable/10/sys/arm/conf/HL201
==============================================================================
--- stable/10/sys/arm/conf/HL201 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/HL201 Sat May 17 17:34:37 2014 (r266331)
@@ -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)
Modified: stable/10/sys/arm/conf/IMX53-QSB
==============================================================================
--- stable/10/sys/arm/conf/IMX53-QSB Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/IMX53-QSB Sat May 17 17:34:37 2014 (r266331)
@@ -40,7 +40,7 @@ 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)
Modified: stable/10/sys/arm/conf/IMX6
==============================================================================
--- stable/10/sys/arm/conf/IMX6 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/IMX6 Sat May 17 17:34:37 2014 (r266331)
@@ -36,7 +36,7 @@ options NFSCL # New Network Filesyst
#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)
Modified: stable/10/sys/arm/conf/IQ31244
==============================================================================
--- stable/10/sys/arm/conf/IQ31244 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/IQ31244 Sat May 17 17:34:37 2014 (r266331)
@@ -46,7 +46,7 @@ options NFSLOCKD # Network Lock Manage
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)
Modified: stable/10/sys/arm/conf/KB920X
==============================================================================
--- stable/10/sys/arm/conf/KB920X Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/KB920X Sat May 17 17:34:37 2014 (r266331)
@@ -49,7 +49,7 @@ options NFSCL # New Network Filesyste
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)
Modified: stable/10/sys/arm/conf/LN2410SBC
==============================================================================
--- stable/10/sys/arm/conf/LN2410SBC Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/LN2410SBC Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/NSLU
==============================================================================
--- stable/10/sys/arm/conf/NSLU Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/NSLU Sat May 17 17:34:37 2014 (r266331)
@@ -63,7 +63,7 @@ options NFSLOCKD # Network Lock Manage
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)
Modified: stable/10/sys/arm/conf/PANDABOARD
==============================================================================
--- stable/10/sys/arm/conf/PANDABOARD Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/PANDABOARD Sat May 17 17:34:37 2014 (r266331)
@@ -56,7 +56,7 @@ options NFS_ROOT # NFS usable as /, re
#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)
Modified: stable/10/sys/arm/conf/QILA9G20
==============================================================================
--- stable/10/sys/arm/conf/QILA9G20 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/QILA9G20 Sat May 17 17:34:37 2014 (r266331)
@@ -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)
Modified: stable/10/sys/arm/conf/QUARTZ
==============================================================================
--- stable/10/sys/arm/conf/QUARTZ Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/QUARTZ Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/RADXA
==============================================================================
--- stable/10/sys/arm/conf/RADXA Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/RADXA Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/RPI-B
==============================================================================
--- stable/10/sys/arm/conf/RPI-B Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/RPI-B Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/SAM9260EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9260EK Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/SAM9260EK Sat May 17 17:34:37 2014 (r266331)
@@ -43,7 +43,7 @@ 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)
Modified: stable/10/sys/arm/conf/SAM9G20EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9G20EK Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/SAM9G20EK Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/SAM9X25EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9X25EK Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/SAM9X25EK Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/SHEEVAPLUG
==============================================================================
--- stable/10/sys/arm/conf/SHEEVAPLUG Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/SHEEVAPLUG Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/SN9G45
==============================================================================
--- stable/10/sys/arm/conf/SN9G45 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/SN9G45 Sat May 17 17:34:37 2014 (r266331)
@@ -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)
Modified: stable/10/sys/arm/conf/TS7800
==============================================================================
--- stable/10/sys/arm/conf/TS7800 Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/TS7800 Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/VERSATILEPB
==============================================================================
--- stable/10/sys/arm/conf/VERSATILEPB Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/VERSATILEPB Sat May 17 17:34:37 2014 (r266331)
@@ -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
Modified: stable/10/sys/arm/conf/VYBRID.common
==============================================================================
--- stable/10/sys/arm/conf/VYBRID.common Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/VYBRID.common Sat May 17 17:34:37 2014 (r266331)
@@ -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 debug
#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
Modified: stable/10/sys/arm/conf/WANDBOARD.common
==============================================================================
--- stable/10/sys/arm/conf/WANDBOARD.common Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/WANDBOARD.common Sat May 17 17:34:37 2014 (r266331)
@@ -35,7 +35,7 @@ options NFSCL # New Network Filesyst
#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)
Modified: stable/10/sys/arm/conf/ZEDBOARD
==============================================================================
--- stable/10/sys/arm/conf/ZEDBOARD Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/arm/conf/ZEDBOARD Sat May 17 17:34:37 2014 (r266331)
@@ -43,7 +43,7 @@ options NFSCL # Network Filesystem Cl
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 m
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
Modified: stable/10/sys/i386/conf/NOTES
==============================================================================
--- stable/10/sys/i386/conf/NOTES Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/i386/conf/NOTES Sat May 17 17:34:37 2014 (r266331)
@@ -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.
@@ -758,7 +758,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
Modified: stable/10/sys/i386/conf/XEN
==============================================================================
--- stable/10/sys/i386/conf/XEN Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/i386/conf/XEN Sat May 17 17:34:37 2014 (r266331)
@@ -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!
Modified: stable/10/sys/ia64/conf/GENERIC
==============================================================================
--- stable/10/sys/ia64/conf/GENERIC Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/ia64/conf/GENERIC Sat May 17 17:34:37 2014 (r266331)
@@ -177,11 +177,11 @@ device uvscom # USB serial support for
# 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
Modified: stable/10/sys/mips/conf/ALCHEMY
==============================================================================
--- stable/10/sys/mips/conf/ALCHEMY Sat May 17 17:18:35 2014 (r266330)
+++ stable/10/sys/mips/conf/ALCHEMY Sat May 17 17:34:37 2014 (r266331)
@@ -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 OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list