Author: rodrigc
Date: Tue Jan  6 05:26:13 2015
New Revision: 276735
URL: https://svnweb.freebsd.org/changeset/base/276735

Log:
  Refactor common options from MALTA and MALTA64 kernel
  configs into MALTA_COMMON file.

Added:
  head/sys/mips/conf/MALTA_COMMON   (contents, props changed)
Modified:
  head/sys/mips/conf/MALTA
  head/sys/mips/conf/MALTA64

Modified: head/sys/mips/conf/MALTA
==============================================================================
--- head/sys/mips/conf/MALTA    Tue Jan  6 03:50:43 2015        (r276734)
+++ head/sys/mips/conf/MALTA    Tue Jan  6 05:26:13 2015        (r276735)
@@ -1,71 +1,11 @@
 # MALTA -- Kernel config for MALTA boards
 #
-# For more information on this file, please read 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$
-
+ 
 ident          MALTA
 
+include                "MALTA_COMMON"
+ 
 machine                mips mipsel     # Malta supports both, so it isn't in 
std.malta
-
+ 
 makeoptions    KERNLOADADDR=0x80100000
-
-options        YAMON
-
-# Don't build any modules yet.
-makeoptions    MODULES_OVERRIDE=""
-
-options        TICK_USE_YAMON_FREQ=defined
-#options       TICK_USE_MALTA_RTC=defined
-
-include                "../malta/std.malta"
-
-hints          "MALTA.hints"           #Default places to look for devices.
-
-makeoptions    DEBUG=-g                #Build kernel with gdb(1) debug symbols
-
-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        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        ROOTDEVNAME=\"ufs:ada0\"
-
-
-# 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
-
-device         loop
-device         ether
-device         le
-device         miibus
-device         bpf
-device         md
-device         uart
-device         random

Modified: head/sys/mips/conf/MALTA64
==============================================================================
--- head/sys/mips/conf/MALTA64  Tue Jan  6 03:50:43 2015        (r276734)
+++ head/sys/mips/conf/MALTA64  Tue Jan  6 05:26:13 2015        (r276735)
@@ -1,73 +1,13 @@
-# MALTA -- Kernel config for MALTA boards
-#
-# For more information on this file, please read 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.
+# MALTA64 -- 64-bit kernel config for MALTA boards
 #
 # $FreeBSD$
+ 
+ident          MALTA64
 
-ident          MALTA
-
+include                "MALTA_COMMON"
+ 
 machine                mips mips64el   # Malta supports both, so it isn't in 
std.malta
-
+ 
 makeoptions    ARCH_FLAGS="-march=mips64 -mabi=64"
-
-options        YAMON
-
-# Don't build any modules yet.
-makeoptions    MODULES_OVERRIDE=""
-
-options        TICK_USE_YAMON_FREQ=defined
-#options       TICK_USE_MALTA_RTC=defined
-
+ 
 makeoptions    KERNLOADADDR=0xffffffff80100000
-
-include                "../malta/std.malta"
-
-hints          "MALTA.hints"           #Default places to look for devices.
-
-makeoptions    DEBUG=-g                #Build kernel with gdb(1) debug symbols
-
-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        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        ROOTDEVNAME=\"ufs:ada0\"
-
-
-# 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
-
-device         loop
-device         ether
-device         le
-device         miibus
-device         md
-device         bpf
-device         uart
-device         random

Added: head/sys/mips/conf/MALTA_COMMON
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/mips/conf/MALTA_COMMON     Tue Jan  6 05:26:13 2015        
(r276735)
@@ -0,0 +1,52 @@
+# MALTA_COMMON -- Common kernel config options for MALTA boards
+#
+# $FreeBSD$
+
+machine                mips mipsel     # Malta supports both, so it isn't in 
std.malta
+
+options        YAMON
+
+# Don't build any modules yet.
+makeoptions    MODULES_OVERRIDE=""
+
+options        TICK_USE_YAMON_FREQ=defined
+#options       TICK_USE_MALTA_RTC=defined
+
+include                "../malta/std.malta"
+
+hints          "MALTA.hints"           #Default places to look for devices.
+
+makeoptions    DEBUG=-g                #Build kernel with gdb(1) debug symbols
+
+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        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        ROOTDEVNAME=\"ufs:ada0\"
+
+
+# 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
+
+device         loop
+device         ether
+device         le
+device         miibus
+device         bpf
+device         md
+device         uart
+device         random
_______________________________________________
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