Author: br
Date: Sun Feb  2 19:13:02 2014
New Revision: 261409
URL: http://svnweb.freebsd.org/changeset/base/261409

Log:
  Split kernel configuration to chip common and board specific parts.

Added:
  head/sys/arm/conf/VYBRID.common   (contents, props changed)
Modified:
  head/sys/arm/conf/COSMIC

Modified: head/sys/arm/conf/COSMIC
==============================================================================
--- head/sys/arm/conf/COSMIC    Sun Feb  2 19:06:00 2014        (r261408)
+++ head/sys/arm/conf/COSMIC    Sun Feb  2 19:13:02 2014        (r261409)
@@ -17,123 +17,9 @@
 #
 # $FreeBSD$
 
+include                "VYBRID.common"
 ident          COSMIC
 
-include                "../freescale/vybrid/std.vybrid"
-
-makeoptions    MODULES_OVERRIDE=""
-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                MSDOSFS                 #MSDOS Filesystem
-options                CD9660                  #ISO 9660 Filesystem
-options                PROCFS                  #Process filesystem (requires 
PSEUDOFS)
-options                PSEUDOFS                #Pseudo-filesystem framework
-#options               NANDFS                  #NAND Filesystem
-options                TMPFS
-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       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       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                   #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
-#options       BOOTP_NFSROOT
-#options       BOOTP_COMPAT
-#options       BOOTP
-#options       BOOTP_NFSV3
-#options       BOOTP_WIRED_TO=ffec0
-
-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       SMP
-
-# Pseudo devices
-
-device         loop
-device         random
-device         pty
-device         md
-device         gpio
-
-# USB support
-options        USB_HOST_ALIGN=32       # Align usb buffers to cache line size.
-device         usb
-options                USB_DEBUG
-#options       USB_REQ_DEBUG
-#options       USB_VERBOSE
-#device                musb
-device         ehci
-#device                ohci
-
-device         umass
-device         scbus                   # SCSI bus (required for SCSI)
-device         da                      # Direct Access (disks)
-device         pass
-
-# SATA
-#device                ata
-#device                atadisk
-#device                mvs
-
-device         nand
-
-# Serial ports
-device         uart
-
-# I2C (TWSI)
-#device                iic
-#device                iicbus
-
-# Ethernet
-device         ether
-device         ffec
-
-# USB ethernet support, requires miibus
-device         miibus
-device         axe                     # ASIX Electronics USB Ethernet
-device         bpf                     # Berkeley packet filter
-
 #FDT
 options                FDT
 options                FDT_DTB_STATIC

Added: head/sys/arm/conf/VYBRID.common
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/arm/conf/VYBRID.common     Sun Feb  2 19:13:02 2014        
(r261409)
@@ -0,0 +1,139 @@
+# Kernel configuration for Vybrid Family boards.
+#
+# 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/vybrid/std.vybrid"
+
+makeoptions    MODULES_OVERRIDE=""
+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                MSDOSFS                 #MSDOS Filesystem
+options                CD9660                  #ISO 9660 Filesystem
+options                PROCFS                  #Process filesystem (requires 
PSEUDOFS)
+options                PSEUDOFS                #Pseudo-filesystem framework
+#options               NANDFS                  #NAND Filesystem
+options                TMPFS
+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
+options        NO_SWAPPING
+options        VFP             # vfp/neon
+
+# Debugging
+makeoptions    DEBUG=-g                #Build kernel with gdb(1) debug symbols
+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       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                   #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
+#options       BOOTP_NFSROOT
+#options       BOOTP_COMPAT
+#options       BOOTP
+#options       BOOTP_NFSV3
+#options       BOOTP_WIRED_TO=ffec0
+
+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       SMP
+
+# Pseudo devices
+
+device         loop
+device         random
+device         pty
+device         md
+device         gpio
+
+# USB support
+options        USB_HOST_ALIGN=32       # Align usb buffers to cache line size.
+device         usb
+options                USB_DEBUG
+#options       USB_REQ_DEBUG
+#options       USB_VERBOSE
+#device                musb
+device         ehci
+#device                ohci
+
+device         umass
+device         scbus                   # SCSI bus (required for SCSI)
+device         da                      # Direct Access (disks)
+device         pass
+
+# SATA
+#device                ata
+#device                atadisk
+#device                mvs
+
+device         nand
+
+# Serial ports
+device         uart
+
+# I2C (TWSI)
+#device                iic
+#device                iicbus
+
+# Ethernet
+device         ether
+device         ffec
+
+# USB ethernet support, requires miibus
+device         miibus
+device         axe                     # ASIX Electronics USB Ethernet
+device         bpf                     # Berkeley packet filter
+
+device         sound
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to