svn commit: r283127 - head/sys/arm/conf

[Warner Losh]

Author: imp
Date: Tue May 19 21:16:51 2015
New Revision: 283127
URL: https://svnweb.freebsd.org/changeset/base/283127

Log:
  Add NFS server to mix (for easier, in-place updates). Move to
  partition 2 for root (since partition 1 is reserved for FAT
  files the Atmel ROMs can load).

Modified:
  head/sys/arm/conf/SAM9G20EK

Modified: head/sys/arm/conf/SAM9G20EK
==============================================================================
--- head/sys/arm/conf/SAM9G20EK	Tue May 19 21:16:37 2015	(r283126)
+++ head/sys/arm/conf/SAM9G20EK	Tue May 19 21:16:51 2015	(r283127)
@@ -1,4 +1,5 @@
 # Kernel configuration for Atmel AT91SAM9G20EK Rev B. development card
+# Many after-market boards follow its conventions.
 #
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
@@ -40,8 +41,8 @@ options 	FFS			# Berkeley Fast Filesyste
 #options 	MD_ROOT_SIZE=4096	# 4MB ram disk
 options 	NANDFS			# NAND file system
 options 	NFSCL			# Network Filesystem Client
-#options 	NFSD			# Network Filesystem Server
-#options 	NFSLOCKD		# Network Lock Manager
+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
@@ -59,6 +60,7 @@ options 	_KPOSIX_PRIORITY_SCHEDULING # P
 # Debugging support.  Always need this:
 options 	KDB			# Enable kernel debugger support
 options 	DDB			# Enable the kernel debugger
+# Always turn these off, even in -current builds, they are too slow.
 #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
@@ -72,7 +74,9 @@ options 	DDB			# Enable the kernel debug
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ate0
 
-options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
+# s2 because s1 is reserved for the DOS parittions sometimes needed to
+# boot off SD cards on the G20 and newer chips.
+options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s2a\"
 
 # kernel/memory size reduction
 options 	MUTEX_NOINLINE