Author: andrew
Date: Tue May  5 17:59:02 2015
New Revision: 282502
URL: https://svnweb.freebsd.org/changeset/base/282502

Log:
  Move the first batch of common armv6 options to std.armv6.

Modified:
  head/sys/arm/conf/AML8726
  head/sys/arm/conf/ARMADAXP
  head/sys/arm/conf/BEAGLEBONE
  head/sys/arm/conf/CUBIEBOARD
  head/sys/arm/conf/CUBIEBOARD2
  head/sys/arm/conf/EFIKA_MX
  head/sys/arm/conf/IMX53
  head/sys/arm/conf/IMX6
  head/sys/arm/conf/PANDABOARD
  head/sys/arm/conf/RK3188
  head/sys/arm/conf/RPI-B
  head/sys/arm/conf/RPI2
  head/sys/arm/conf/SOCKIT.common
  head/sys/arm/conf/VERSATILEPB
  head/sys/arm/conf/VYBRID
  head/sys/arm/conf/ZEDBOARD
  head/sys/arm/conf/std.armv6

Modified: head/sys/arm/conf/AML8726
==============================================================================
--- head/sys/arm/conf/AML8726   Tue May  5 16:37:59 2015        (r282501)
+++ head/sys/arm/conf/AML8726   Tue May  5 17:59:02 2015        (r282502)
@@ -25,39 +25,8 @@ include      "../amlogic/aml8726/std.aml8726
 
 options        HZ=100
 options        SCHED_ULE               # ULE scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        PRINTF_BUFR_SIZE=128    # Prevent printf output being 
interspersed.
-options        KBD_INSTALL_CDEV        # install a CDEV entry in /dev
-options        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
 options        LINUX_BOOT_ABI
-options        VFP                     # Enable floating point hardware support
 options        SMP                     # Enable multiple cores
 
 # Debugging

Modified: head/sys/arm/conf/ARMADAXP
==============================================================================
--- head/sys/arm/conf/ARMADAXP  Tue May  5 16:37:59 2015        (r282501)
+++ head/sys/arm/conf/ARMADAXP  Tue May  5 17:59:02 2015        (r282502)
@@ -28,36 +28,7 @@ options      SOC_MV_ARMADAXP
 makeoptions    WERROR="-Werror"
 
 options        HZ=1000
-#options       SCHED_ULE               # ULE scheduler
 options        SCHED_ULE               # ULE scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        VFP                     # Enable floating point hardware support
 options        SMP                     # Enable multiple cores
 
 # Debugging for use in -current

Modified: head/sys/arm/conf/BEAGLEBONE
==============================================================================
--- head/sys/arm/conf/BEAGLEBONE        Tue May  5 16:37:59 2015        
(r282501)
+++ head/sys/arm/conf/BEAGLEBONE        Tue May  5 17:59:02 2015        
(r282502)
@@ -36,38 +36,7 @@ makeoptions  MODULES_EXTRA+="opensolaris 
 
 options        HZ=100
 options        SCHED_4BSD              # 4BSD scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        PLATFORM
-options        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
-options        VFP                     # Enable floating point hardware support
 
 # Debugging for use in -current
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols

Modified: head/sys/arm/conf/CUBIEBOARD
==============================================================================
--- head/sys/arm/conf/CUBIEBOARD        Tue May  5 16:37:59 2015        
(r282501)
+++ head/sys/arm/conf/CUBIEBOARD        Tue May  5 17:59:02 2015        
(r282502)
@@ -26,37 +26,6 @@ include              "../allwinner/std.a10"
 
 options        HZ=100
 options        SCHED_4BSD              # 4BSD scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
-options        VFP                     # Enable floating point hardware support
 
 # Debugging for use in -current
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols

Modified: head/sys/arm/conf/CUBIEBOARD2
==============================================================================
--- head/sys/arm/conf/CUBIEBOARD2       Tue May  5 16:37:59 2015        
(r282501)
+++ head/sys/arm/conf/CUBIEBOARD2       Tue May  5 17:59:02 2015        
(r282502)
@@ -26,37 +26,6 @@ include              "../allwinner/a20/std.a20"
 
 options        HZ=100
 options        SCHED_ULE               # ULE scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
-options        VFP                     # Enable floating point hardware support
 options        SMP                     # Enable multiple cores
 
 # Debugging for use in -current

Modified: head/sys/arm/conf/EFIKA_MX
==============================================================================
--- head/sys/arm/conf/EFIKA_MX  Tue May  5 16:37:59 2015        (r282501)
+++ head/sys/arm/conf/EFIKA_MX  Tue May  5 17:59:02 2015        (r282502)
@@ -28,43 +28,13 @@ makeoptions WITHOUT_MODULES="ahc"
 options        SOC_IMX51
 
 options        SCHED_4BSD              # 4BSD scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
 #options       MD_ROOT                 # MD is a potential root device
-options        NFSCL                   # Network Filesystem Client
 #options       NFSD                    # Network Filesystem Server
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-options        GEOM_LABEL              # Provides labelization
 #options       COMPAT_FREEBSD5         # Compatible with FreeBSD5
 #options       COMPAT_FREEBSD6         # Compatible with FreeBSD6
 #options       COMPAT_FREEBSD7         # Compatible with FreeBSD7
-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        PLATFORM
 options        INCLUDE_CONFIG_FILE     # Include this file in kernel
-options        VFP                     # Enable floating point hardware support
 
 # Debugging for use in -current
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols

Modified: head/sys/arm/conf/IMX53
==============================================================================
--- head/sys/arm/conf/IMX53     Tue May  5 16:37:59 2015        (r282501)
+++ head/sys/arm/conf/IMX53     Tue May  5 17:59:02 2015        (r282502)
@@ -26,42 +26,12 @@ include     "../freescale/imx/std.imx53"
 options        SOC_IMX53
 
 options        SCHED_4BSD              # 4BSD scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
 #options       NFSD                    # Network Filesystem Server
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-options        GEOM_LABEL              # Provides labelization
 #options       COMPAT_FREEBSD5         # Compatible with FreeBSD5
 #options       COMPAT_FREEBSD6         # Compatible with FreeBSD6
 #options       COMPAT_FREEBSD7         # Compatible with FreeBSD7
-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        PLATFORM
 options        INCLUDE_CONFIG_FILE     # Include this file in kernel
-options        VFP                     # Enable floating point hardware support
 
 # Debugging for use in -current
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols

Modified: head/sys/arm/conf/IMX6
==============================================================================
--- head/sys/arm/conf/IMX6      Tue May  5 16:37:59 2015        (r282501)
+++ head/sys/arm/conf/IMX6      Tue May  5 17:59:02 2015        (r282502)
@@ -26,39 +26,9 @@ options      SOC_IMX6
 
 options        HZ=500                  # Scheduling quantum is 2 milliseconds.
 options        SCHED_ULE               # ULE scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
 #options       NFSD                    # Network Filesystem Server
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-options        GEOM_LABEL              # Provides labelization
-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        INCLUDE_CONFIG_FILE     # Include this file in kernel
 options        PLATFORM
-options        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
-options        VFP                     # Enable floating point hardware support
 options        SMP                     # Enable multiple cores
 
 # Debugging for use in -current

Modified: head/sys/arm/conf/PANDABOARD
==============================================================================
--- head/sys/arm/conf/PANDABOARD        Tue May  5 16:37:59 2015        
(r282501)
+++ head/sys/arm/conf/PANDABOARD        Tue May  5 17:59:02 2015        
(r282502)
@@ -32,38 +32,7 @@ include      "../ti/omap4/pandaboard/std.pan
 
 options        HZ=100
 options        SCHED_ULE               # ULE scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        PLATFORM
-options        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
-options        VFP                     # Enable floating point hardware support
 options        SMP                     # Enable multiple cores
 
 # Debugging for use in -current

Modified: head/sys/arm/conf/RK3188
==============================================================================
--- head/sys/arm/conf/RK3188    Tue May  5 16:37:59 2015        (r282501)
+++ head/sys/arm/conf/RK3188    Tue May  5 17:59:02 2015        (r282502)
@@ -25,37 +25,6 @@ include              "../rockchip/std.rk30xx"
 
 options        HZ=100
 options        SCHED_ULE               # ULE scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
-options        VFP                     # Enable floating point hardware support
 options        SMP                     # Enable multiple cores
 
 # Debugging for use in -current

Modified: head/sys/arm/conf/RPI-B
==============================================================================
--- head/sys/arm/conf/RPI-B     Tue May  5 16:37:59 2015        (r282501)
+++ head/sys/arm/conf/RPI-B     Tue May  5 17:59:02 2015        (r282502)
@@ -26,38 +26,7 @@ include              "../broadcom/bcm2835/std.bcm283
 
 options        HZ=100
 options        SCHED_4BSD              # 4BSD scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        PLATFORM
-options        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
-options        VFP                     # Enable floating point hardware support
 
 # Debugging for use in -current
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols

Modified: head/sys/arm/conf/RPI2
==============================================================================
--- head/sys/arm/conf/RPI2      Tue May  5 16:37:59 2015        (r282501)
+++ head/sys/arm/conf/RPI2      Tue May  5 17:59:02 2015        (r282502)
@@ -26,38 +26,7 @@ include              "../broadcom/bcm2835/std.bcm283
 
 options        HZ=100
 options        SCHED_4BSD              # 4BSD scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        PLATFORM
-options        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
-options        VFP                     # Enable floating point hardware support
 
 # Debugging for use in -current
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols

Modified: head/sys/arm/conf/SOCKIT.common
==============================================================================
--- head/sys/arm/conf/SOCKIT.common     Tue May  5 16:37:59 2015        
(r282501)
+++ head/sys/arm/conf/SOCKIT.common     Tue May  5 17:59:02 2015        
(r282502)
@@ -27,37 +27,6 @@ makeoptions  WERROR="-Werror"
 
 options        HZ=100
 options        SCHED_ULE               # ULE scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
-options        VFP                     # Enable floating point hardware support
 options        SMP                     # Enable multiple cores
 
 # Debugging for use in -current

Modified: head/sys/arm/conf/VERSATILEPB
==============================================================================
--- head/sys/arm/conf/VERSATILEPB       Tue May  5 16:37:59 2015        
(r282501)
+++ head/sys/arm/conf/VERSATILEPB       Tue May  5 17:59:02 2015        
(r282502)
@@ -34,38 +34,7 @@ options      PHYSADDR=0x00000000
 
 options        HZ=100
 options        SCHED_4BSD              # 4BSD scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
 options        LINUX_BOOT_ABI          # Process metadata passed from Linux 
boot loaders
-options        VFP                     # Enable floating point hardware support
 
 # Debugging for use in -current
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols

Modified: head/sys/arm/conf/VYBRID
==============================================================================
--- head/sys/arm/conf/VYBRID    Tue May  5 16:37:59 2015        (r282501)
+++ head/sys/arm/conf/VYBRID    Tue May  5 17:59:02 2015        (r282502)
@@ -26,38 +26,7 @@ makeoptions  WERROR="-Werror"
 
 options        HZ=100
 options        SCHED_4BSD              # 4BSD scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-options        MSDOSFS                 # MSDOS Filesystem
-options        CD9660                  # ISO 9660 Filesystem
 #options       NANDFS                  # NAND Filesystem
-options        PROCFS                  # Process filesystem (requires PSEUDOFS)
-options        PSEUDOFS                # Pseudo-filesystem framework
-options        TMPFS                   # Efficient memory filesystem
-options        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
-options        VFP                     # Enable floating point hardware support
 #options       SMP                     # Enable multiple cores
 
 # Debugging for use in -current

Modified: head/sys/arm/conf/ZEDBOARD
==============================================================================
--- head/sys/arm/conf/ZEDBOARD  Tue May  5 16:37:59 2015        (r282501)
+++ head/sys/arm/conf/ZEDBOARD  Tue May  5 17:59:02 2015        (r282502)
@@ -25,37 +25,7 @@ include              "std.armv6"
 include        "../xilinx/zedboard/std.zedboard"
 
 options        SCHED_ULE               # ULE scheduler
-options        PREEMPTION              # Enable kernel thread preemption
-options        INET                    # InterNETworking
-options        INET6                   # IPv6 communications protocols
-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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
-options        QUOTA                   # Enable disk quotas for UFS
-options        NFSCL                   # Network Filesystem Client
 #options       NFSSD                   # Network Filesystem Server
-options        NFSLOCKD                # Network Lock Manager
-options        NFS_ROOT                # NFS usable as /, requires NFSCL
-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        GEOM_PART_GPT           # GUID Partition Tables
-options        GEOM_PART_BSD           # BSD partition scheme
-options        GEOM_PART_MBR           # MBR partition scheme
-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        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
-options        VFP                     # Enable floating point hardware support
 options        SMP                     # Enable multiple cores
 
 # Debugging for use in -current

Modified: head/sys/arm/conf/std.armv6
==============================================================================
--- head/sys/arm/conf/std.armv6 Tue May  5 16:37:59 2015        (r282501)
+++ head/sys/arm/conf/std.armv6 Tue May  5 17:59:02 2015        (r282502)
@@ -2,5 +2,37 @@
 #
 # $FreeBSD$
 
-options        ARM_NEW_PMAP            # Use new pmap code.
+options        PREEMPTION              # Enable kernel thread preemption
+options        INET                    # InterNETworking
+options        INET6                   # IPv6 communications protocols
+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        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
+options        QUOTA                   # Enable disk quotas for UFS
+options        NFSCL                   # Network Filesystem Client
+options        NFSLOCKD                # Network Lock Manager
+options        NFS_ROOT                # NFS usable as /, requires NFSCL
+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        GEOM_PART_GPT           # GUID Partition Tables
+options        GEOM_PART_BSD           # BSD partition scheme
+options        GEOM_PART_MBR           # MBR partition scheme
+options        GEOM_LABEL              # Provides labelization
+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        FREEBSD_BOOT_LOADER     # Process metadata passed from loader(8)
+options        VFP                     # Enable floating point hardware support
 
+options        ARM_NEW_PMAP            # Use new pmap code.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to