svn commit: r276776 - head/sys/mips/conf

[Bjoern A. Zeeb]

Author: bz
Date: Wed Jan  7 12:12:36 2015
New Revision: 276776
URL: https://svnweb.freebsd.org/changeset/base/276776

Log:
  Move MALTA_COMMON to std.MALTA (as we have for XLP and SWARM).
  This avoids universe trying to build MALTA_COMMON and fail due to
  the problem addressed in r276773.
  Include std.MALTA from the MALTA mipsel and MALTA64 mips64el config files,
  where the machine lines exist.

Added:
  head/sys/mips/conf/std.MALTA
     - copied unchanged from r276775, head/sys/mips/conf/MALTA_COMMON
Deleted:
  head/sys/mips/conf/MALTA_COMMON
Modified:
  head/sys/mips/conf/MALTA
  head/sys/mips/conf/MALTA64

Modified: head/sys/mips/conf/MALTA
==============================================================================
--- head/sys/mips/conf/MALTA	Wed Jan  7 06:20:33 2015	(r276775)
+++ head/sys/mips/conf/MALTA	Wed Jan  7 12:12:36 2015	(r276776)
@@ -4,7 +4,7 @@
  
 ident		MALTA
 
-include		"MALTA_COMMON"
+include		"std.MALTA"
  
 machine		mips mipsel	# Malta supports both, so it isn't in std.malta
  

Modified: head/sys/mips/conf/MALTA64
==============================================================================
--- head/sys/mips/conf/MALTA64	Wed Jan  7 06:20:33 2015	(r276775)
+++ head/sys/mips/conf/MALTA64	Wed Jan  7 12:12:36 2015	(r276776)
@@ -4,7 +4,7 @@
  
 ident		MALTA64
 
-include		"MALTA_COMMON"
+include		"std.MALTA"
  
 machine		mips mips64el	# Malta supports both, so it isn't in std.malta
  

Copied: head/sys/mips/conf/std.MALTA (from r276775, head/sys/mips/conf/MALTA_COMMON)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/mips/conf/std.MALTA	Wed Jan  7 12:12:36 2015	(r276776, copy of r276775, head/sys/mips/conf/MALTA_COMMON)
@@ -0,0 +1,53 @@
+# MALTA_COMMON -- Common kernel config options for MALTA boards
+#
+# $FreeBSD$
+
+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\"
+
+options 	GEOM_LABEL		# Provides labelization
+options 	GEOM_PART_GPT		# GUID Partition Tables.
+options 	GEOM_RAID		# Soft RAID functionality.
+
+# 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