From owner-svn-src-all@FreeBSD.ORG Tue Mar 18 14:41:30 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E7E76CA; Tue, 18 Mar 2014 14:41:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 12AB3AA7; Tue, 18 Mar 2014 14:41:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2IEfT8Z088029; Tue, 18 Mar 2014 14:41:29 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2IEfIDi087619; Tue, 18 Mar 2014 14:41:18 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201403181441.s2IEfIDi087619@svn.freebsd.org> From: Warner Losh Date: Tue, 18 Mar 2014 14:41:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263301 - in head/sys: amd64/conf arm/conf i386/conf ia64/conf mips/conf powerpc/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Mar 2014 14:41:30 -0000 Author: imp Date: Tue Mar 18 14:41:18 2014 New Revision: 263301 URL: http://svnweb.freebsd.org/changeset/base/263301 Log: In kernel config files, it is supposed to be 'options' not 'options', per long standing (but recently not so strictly enforced) convention. Modified: head/sys/amd64/conf/NOTES head/sys/arm/conf/AC100 head/sys/arm/conf/ARMADAXP head/sys/arm/conf/ARNDALE head/sys/arm/conf/ATMEL head/sys/arm/conf/AVILA head/sys/arm/conf/BEAGLEBONE head/sys/arm/conf/BWCT head/sys/arm/conf/CAMBRIA head/sys/arm/conf/CNS11XXNAS head/sys/arm/conf/COLIBRI-VF50 head/sys/arm/conf/COSMIC head/sys/arm/conf/CRB head/sys/arm/conf/CUBIEBOARD head/sys/arm/conf/CUBIEBOARD2 head/sys/arm/conf/DB-78XXX head/sys/arm/conf/DB-88F5XXX head/sys/arm/conf/DB-88F6XXX head/sys/arm/conf/DIGI-CCWMX53 head/sys/arm/conf/DOCKSTAR head/sys/arm/conf/DREAMPLUG-1001 head/sys/arm/conf/EA3250 head/sys/arm/conf/EB9200 head/sys/arm/conf/EFIKA_MX head/sys/arm/conf/EP80219 head/sys/arm/conf/ETHERNUT5 head/sys/arm/conf/GUMSTIX head/sys/arm/conf/HL200 head/sys/arm/conf/HL201 head/sys/arm/conf/IMX53-QSB head/sys/arm/conf/IMX6 head/sys/arm/conf/IQ31244 head/sys/arm/conf/KB920X head/sys/arm/conf/LN2410SBC head/sys/arm/conf/NSLU head/sys/arm/conf/PANDABOARD head/sys/arm/conf/QILA9G20 head/sys/arm/conf/QUARTZ head/sys/arm/conf/RADXA head/sys/arm/conf/RPI-B head/sys/arm/conf/SAM9260EK head/sys/arm/conf/SAM9G20EK head/sys/arm/conf/SAM9X25EK head/sys/arm/conf/SHEEVAPLUG head/sys/arm/conf/SN9G45 head/sys/arm/conf/TS7800 head/sys/arm/conf/VERSATILEPB head/sys/arm/conf/VYBRID.common head/sys/arm/conf/WANDBOARD.common head/sys/arm/conf/ZEDBOARD head/sys/i386/conf/NOTES head/sys/i386/conf/XEN head/sys/ia64/conf/GENERIC head/sys/mips/conf/ALCHEMY head/sys/mips/conf/ALFA_HORNET_UB head/sys/mips/conf/AP121 head/sys/mips/conf/AP91 head/sys/mips/conf/AP93 head/sys/mips/conf/AP94 head/sys/mips/conf/AP96 head/sys/mips/conf/AR71XX_BASE head/sys/mips/conf/AR724X_BASE head/sys/mips/conf/AR91XX_BASE head/sys/mips/conf/AR933X_BASE head/sys/mips/conf/AR934X_BASE head/sys/mips/conf/CARAMBOLA2 head/sys/mips/conf/DB120 head/sys/mips/conf/DIR-825B1 head/sys/mips/conf/ENH200 head/sys/mips/conf/PB47 head/sys/mips/conf/PB92 head/sys/mips/conf/PICOSTATION_M2HP head/sys/mips/conf/ROUTERSTATION head/sys/mips/conf/ROUTERSTATION_MFS head/sys/mips/conf/RSPRO head/sys/mips/conf/RSPRO_MFS head/sys/mips/conf/RSPRO_STANDALONE head/sys/mips/conf/RT305X head/sys/mips/conf/SENTRY5 head/sys/mips/conf/SWARM64_SMP head/sys/mips/conf/SWARM_SMP head/sys/mips/conf/TP-WN1043ND head/sys/mips/conf/WZR-300HP head/sys/mips/conf/XLRN32 head/sys/mips/conf/std.SWARM head/sys/mips/conf/std.XLP head/sys/powerpc/conf/GENERIC head/sys/powerpc/conf/GENERIC64 head/sys/powerpc/conf/MPC85XX head/sys/powerpc/conf/NOTES Modified: head/sys/amd64/conf/NOTES ============================================================================== --- head/sys/amd64/conf/NOTES Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/amd64/conf/NOTES Tue Mar 18 14:41:18 2014 (r263301) @@ -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 Modified: head/sys/arm/conf/AC100 ============================================================================== --- head/sys/arm/conf/AC100 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/AC100 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/ARMADAXP ============================================================================== --- head/sys/arm/conf/ARMADAXP Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/ARMADAXP Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/ARNDALE ============================================================================== --- head/sys/arm/conf/ARNDALE Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/ARNDALE Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/ATMEL ============================================================================== --- head/sys/arm/conf/ATMEL Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/ATMEL Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/AVILA ============================================================================== --- head/sys/arm/conf/AVILA Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/AVILA Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/BEAGLEBONE ============================================================================== --- head/sys/arm/conf/BEAGLEBONE Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/BEAGLEBONE Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/BWCT ============================================================================== --- head/sys/arm/conf/BWCT Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/BWCT Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/CAMBRIA ============================================================================== --- head/sys/arm/conf/CAMBRIA Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/CAMBRIA Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/CNS11XXNAS ============================================================================== --- head/sys/arm/conf/CNS11XXNAS Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/CNS11XXNAS Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/COLIBRI-VF50 ============================================================================== --- head/sys/arm/conf/COLIBRI-VF50 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/COLIBRI-VF50 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/COSMIC ============================================================================== --- head/sys/arm/conf/COSMIC Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/COSMIC Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/CRB ============================================================================== --- head/sys/arm/conf/CRB Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/CRB Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/CUBIEBOARD ============================================================================== --- head/sys/arm/conf/CUBIEBOARD Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/CUBIEBOARD Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/CUBIEBOARD2 ============================================================================== --- head/sys/arm/conf/CUBIEBOARD2 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/CUBIEBOARD2 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/DB-78XXX ============================================================================== --- head/sys/arm/conf/DB-78XXX Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/DB-78XXX Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/DB-88F5XXX ============================================================================== --- head/sys/arm/conf/DB-88F5XXX Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/DB-88F5XXX Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/DB-88F6XXX ============================================================================== --- head/sys/arm/conf/DB-88F6XXX Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/DB-88F6XXX Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/DIGI-CCWMX53 ============================================================================== --- head/sys/arm/conf/DIGI-CCWMX53 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/DIGI-CCWMX53 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/DOCKSTAR ============================================================================== --- head/sys/arm/conf/DOCKSTAR Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/DOCKSTAR Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/DREAMPLUG-1001 ============================================================================== --- head/sys/arm/conf/DREAMPLUG-1001 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/DREAMPLUG-1001 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/EA3250 ============================================================================== --- head/sys/arm/conf/EA3250 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/EA3250 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/EB9200 ============================================================================== --- head/sys/arm/conf/EB9200 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/EB9200 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/EFIKA_MX ============================================================================== --- head/sys/arm/conf/EFIKA_MX Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/EFIKA_MX Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/EP80219 ============================================================================== --- head/sys/arm/conf/EP80219 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/EP80219 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/ETHERNUT5 ============================================================================== --- head/sys/arm/conf/ETHERNUT5 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/ETHERNUT5 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/GUMSTIX ============================================================================== --- head/sys/arm/conf/GUMSTIX Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/GUMSTIX Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/HL200 ============================================================================== --- head/sys/arm/conf/HL200 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/HL200 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/HL201 ============================================================================== --- head/sys/arm/conf/HL201 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/HL201 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/IMX53-QSB ============================================================================== --- head/sys/arm/conf/IMX53-QSB Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/IMX53-QSB Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/IMX6 ============================================================================== --- head/sys/arm/conf/IMX6 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/IMX6 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/IQ31244 ============================================================================== --- head/sys/arm/conf/IQ31244 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/IQ31244 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/KB920X ============================================================================== --- head/sys/arm/conf/KB920X Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/KB920X Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/LN2410SBC ============================================================================== --- head/sys/arm/conf/LN2410SBC Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/LN2410SBC Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/NSLU ============================================================================== --- head/sys/arm/conf/NSLU Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/NSLU Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/PANDABOARD ============================================================================== --- head/sys/arm/conf/PANDABOARD Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/PANDABOARD Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/QILA9G20 ============================================================================== --- head/sys/arm/conf/QILA9G20 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/QILA9G20 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/QUARTZ ============================================================================== --- head/sys/arm/conf/QUARTZ Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/QUARTZ Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/RADXA ============================================================================== --- head/sys/arm/conf/RADXA Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/RADXA Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/RPI-B ============================================================================== --- head/sys/arm/conf/RPI-B Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/RPI-B Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/SAM9260EK ============================================================================== --- head/sys/arm/conf/SAM9260EK Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/SAM9260EK Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/SAM9G20EK ============================================================================== --- head/sys/arm/conf/SAM9G20EK Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/SAM9G20EK Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/SAM9X25EK ============================================================================== --- head/sys/arm/conf/SAM9X25EK Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/SAM9X25EK Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/SHEEVAPLUG ============================================================================== --- head/sys/arm/conf/SHEEVAPLUG Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/SHEEVAPLUG Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/SN9G45 ============================================================================== --- head/sys/arm/conf/SN9G45 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/SN9G45 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/TS7800 ============================================================================== --- head/sys/arm/conf/TS7800 Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/TS7800 Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/VERSATILEPB ============================================================================== --- head/sys/arm/conf/VERSATILEPB Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/VERSATILEPB Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/VYBRID.common ============================================================================== --- head/sys/arm/conf/VYBRID.common Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/VYBRID.common Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/WANDBOARD.common ============================================================================== --- head/sys/arm/conf/WANDBOARD.common Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/WANDBOARD.common Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/arm/conf/ZEDBOARD ============================================================================== --- head/sys/arm/conf/ZEDBOARD Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/arm/conf/ZEDBOARD Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/i386/conf/NOTES ============================================================================== --- head/sys/i386/conf/NOTES Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/i386/conf/NOTES Tue Mar 18 14:41:18 2014 (r263301) @@ -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 Modified: head/sys/i386/conf/XEN ============================================================================== --- head/sys/i386/conf/XEN Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/i386/conf/XEN Tue Mar 18 14:41:18 2014 (r263301) @@ -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: head/sys/ia64/conf/GENERIC ============================================================================== --- head/sys/ia64/conf/GENERIC Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/ia64/conf/GENERIC Tue Mar 18 14:41:18 2014 (r263301) @@ -183,11 +183,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: head/sys/mips/conf/ALCHEMY ============================================================================== --- head/sys/mips/conf/ALCHEMY Tue Mar 18 14:19:53 2014 (r263300) +++ head/sys/mips/conf/ALCHEMY Tue Mar 18 14:41:18 2014 (r263301) @@ -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 ***