Author: ian
Date: Fri Dec 13 22:52:59 2013
New Revision: 259361
URL: http://svnweb.freebsd.org/changeset/base/259361

Log:
  MFC r257603, r257604:
  
    Rename WANDBOARD-COMMON to WANDBOARD.common and adjust the configs that
    include it accordingly.  The build machinery for universe and tinderbox
    tries to build every kernel config whose name begins and ends with [A-Z0-9]
    and the common include file that has most of the options isn't buildable
    by itself, so the new lowercase .common will avoid building it.

Added:
  stable/10/sys/arm/conf/WANDBOARD.common
     - copied unchanged from r257603, head/sys/arm/conf/WANDBOARD.common
Deleted:
  stable/10/sys/arm/conf/WANDBOARD-COMMON
Modified:
  stable/10/sys/arm/conf/WANDBOARD-DUAL
  stable/10/sys/arm/conf/WANDBOARD-QUAD
  stable/10/sys/arm/conf/WANDBOARD-SOLO
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/conf/WANDBOARD-DUAL
==============================================================================
--- stable/10/sys/arm/conf/WANDBOARD-DUAL       Fri Dec 13 22:51:09 2013        
(r259360)
+++ stable/10/sys/arm/conf/WANDBOARD-DUAL       Fri Dec 13 22:52:59 2013        
(r259361)
@@ -17,7 +17,7 @@
 #
 # $FreeBSD$
 
-include        WANDBOARD-COMMON
+include        "WANDBOARD.common"
 ident          WANDBOARD-DUAL
 
 # Flattened Device Tree

Modified: stable/10/sys/arm/conf/WANDBOARD-QUAD
==============================================================================
--- stable/10/sys/arm/conf/WANDBOARD-QUAD       Fri Dec 13 22:51:09 2013        
(r259360)
+++ stable/10/sys/arm/conf/WANDBOARD-QUAD       Fri Dec 13 22:52:59 2013        
(r259361)
@@ -17,7 +17,7 @@
 #
 # $FreeBSD$
 
-include        WANDBOARD-COMMON
+include        "WANDBOARD.common"
 ident          WANDBOARD-QUAD
 
 # Flattened Device Tree

Modified: stable/10/sys/arm/conf/WANDBOARD-SOLO
==============================================================================
--- stable/10/sys/arm/conf/WANDBOARD-SOLO       Fri Dec 13 22:51:09 2013        
(r259360)
+++ stable/10/sys/arm/conf/WANDBOARD-SOLO       Fri Dec 13 22:52:59 2013        
(r259361)
@@ -17,7 +17,7 @@
 #
 # $FreeBSD$
 
-include        WANDBOARD-COMMON
+include        "WANDBOARD.common"
 ident          WANDBOARD-SOLO
 
 # Flattened Device Tree

Copied: stable/10/sys/arm/conf/WANDBOARD.common (from r257603, 
head/sys/arm/conf/WANDBOARD.common)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ stable/10/sys/arm/conf/WANDBOARD.common     Fri Dec 13 22:52:59 2013        
(r259361, copy of r257603, head/sys/arm/conf/WANDBOARD.common)
@@ -0,0 +1,155 @@
+# Kernel configuration for Wandboard
+#
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
+#
+#    
http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD$
+
+include        "../freescale/imx/std.imx6"
+
+options        HZ=250                  # Scheduling quantum is 4 milliseconds.
+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       MD_ROOT                 # MD is a potential root device
+options        NFSCL                   # New Network Filesystem Client
+#options       NFSD                    # New Network Filesystem Server
+options        NFSLOCKD                # Network Lock Manager
+options        NFS_ROOT                # NFS usable as /, requires NFSCL
+options        MSDOSFS                 # MSDOS Filesystem
+options        CD9660                  # ISO 9660 Filesystem
+#options       PROCFS                  # Process filesystem (requires PSEUDOFS)
+options        PSEUDOFS                # Pseudo-filesystem framework
+options        TMPFS                   # TMP Memory Filesystem
+options        GEOM_PART_GPT           # GUID Partition Tables.
+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        INCLUDE_CONFIG_FILE     # Include this file in kernel
+
+# Debugging support.  Always need this:
+options        KDB                     # Enable kernel debugger support.
+# For minimum debugger support use KDB_TRACE, for interactive use DDB.
+#options       KDB_TRACE               # Print a stack trace for a panic.
+options        DDB                     # Support DDB.
+# For full debugger support use this instead:
+#options       GDB                     # Support remote GDB.
+# Other debugging options...
+makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols
+options        ALT_BREAK_TO_DEBUGGER   # Use <CR><tilde><ctrl-b> to enter 
debugger.
+#options       DEBUG
+#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
+
+# Note that 'bpf' is required for DHCP.
+device         bpf             # Berkeley packet filter
+
+# Pseudo devices.
+device         loop            # Network loopback
+device         random          # Entropy device
+device         vlan            # 802.1Q VLAN support
+device         tun             # Packet tunnel.
+device         md              # Memory "disks"
+#device        gif             # IPv6 and IPv4 tunneling
+#device        faith           # IPv6-to-IPv4 relaying (translation)
+#device        firmware        # firmware assist module
+device         ether           # Ethernet support
+device         miibus          # Required for ethernet
+
+# Serial (COM) ports
+device         uart            # Multi-uart driver
+
+#device        iomux           # IO Multiplexor
+
+# SCSI peripherals
+device         scbus           # SCSI bus (required for SCSI)
+device         da              # Direct Access (disks)
+device         cd              # CD
+device         pass            # Passthrough device (direct SCSI access)
+
+# USB support
+#options       USB_DEBUG       # enable debug msgs
+options  USB_HOST_ALIGN=32     # Required for ARM, set to cache line size.
+device         ehci            # OHCI USB interface
+device         usb             # USB Bus (required)
+device         umass           # Disks/Mass storage - Requires scbus and da
+device         uhid            # "Human Interface Devices"
+device         u3g             # USB modems
+
+# USB Ethernet, requires miibus
+#device        aue             # ADMtek USB Ethernet
+#device        axe             # ASIX Electronics USB Ethernet
+#device        cdce            # Generic USB over Ethernet
+#device        cue             # CATC USB Ethernet
+#device        kue             # Kawasaki LSI USB Ethernet
+#device        rue             # RealTek RTL8150 USB Ethernet
+#device        udav            # Davicom DM9601E USB
+
+# USB Wireless
+#device        rum             # Ralink Technology RT2501USB wireless NICs
+
+# Watchdog timer.
+# WARNING: can't be disabled!!!
+#device        imxwdt          # Watchdog
+
+# Wireless NIC cards
+#device        wlan            # 802.11 support
+#device        wlan_wep        # 802.11 WEP support
+#device        wlan_ccmp       # 802.11 CCMP support
+#device        wlan_tkip       # 802.11 TKIP support
+#device        wlan_amrr       # AMRR transmit rate control algorithm
+
+# NOTE: serial console will be disabled if syscons enabled
+# Uncomment following lines for framebuffer/syscons support
+# Wandboard has no video console support yet.
+#device        sc
+#device        kbdmux
+#options       SC_DFLT_FONT    # compile font in
+#makeoptions   SC_DFLT_FONT=cp437
+#device        ukbd            # Allow keyboard like HIDs to control console
+#device        ums
+
+# required for netbooting
+#options       BOOTP
+#options       BOOTP_COMPAT
+#options       BOOTP_NFSROOT
+#options       BOOTP_NFSV3
+#options       BOOTP_WIRED_TO=ffec0
+
+# U-Boot stuff lives on slice 1, FreeBSD on slice 2.
+options        ROOTDEVNAME=\"ufs:mmcsd0s2a\"
+
+#device        fsliic          # Freescale i2c/iic (not ready yet)
+#device        iic             # iic protocol
+#device        iicbus          # iic bus
+
+device         sdhci           # SD controller
+device         mmc             # SD/MMC protocol
+device         mmcsd           # SDCard disk device
+
+device         ffec            # Freescale Fast Ethernet Controller
+
_______________________________________________
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