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

[Warner Losh]

Author: imp
Date: Mon Dec 21 18:27:51 2015
New Revision: 292557
URL: https://svnweb.freebsd.org/changeset/base/292557

Log:
  Configure the Atmel eval boards to boot the same way. This gives
  them the same layout as other embedded systems.

Modified:
  head/sys/arm/conf/SAM9260EK
  head/sys/arm/conf/SAM9G20EK

Modified: head/sys/arm/conf/SAM9260EK
==============================================================================
--- head/sys/arm/conf/SAM9260EK	Mon Dec 21 18:19:14 2015	(r292556)
+++ head/sys/arm/conf/SAM9260EK	Mon Dec 21 18:27:51 2015	(r292557)
@@ -103,8 +103,10 @@ options 	PRINTF_BUFR_SIZE=128	# Prevent 
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=macb0
 
-# alternatively, boot from a MMC/SD memory card
-# s1 is FAT on this platform.
+# s3 because s1 is reserved for the DOS parittions sometimes needed to
+# boot off SD cards on the G20 and newer chips. s2 is reserved for
+# nanobsd's config partition. s3 and s4 are for the ping-pong upgrade
+# path. 9260 doesn't boot off SD, but let's keep things sane.
 options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s3a\"
 
 # Alternatively, boot from a USB card.

Modified: head/sys/arm/conf/SAM9G20EK
==============================================================================
--- head/sys/arm/conf/SAM9G20EK	Mon Dec 21 18:19:14 2015	(r292556)
+++ head/sys/arm/conf/SAM9G20EK	Mon Dec 21 18:27:51 2015	(r292557)
@@ -82,9 +82,11 @@ options 	DDB			# Enable the kernel debug
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ate0
 
-# 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\"
+# s3 because s1 is reserved for the DOS parittions sometimes needed to
+# boot off SD cards on the G20 and newer chips. s2 is reserved for
+# nanobsd's config partition. s3 and s4 are for the ping-pong upgrade
+# path.
+options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s3a\"
 
 # kernel/memory size reduction
 options 	MUTEX_NOINLINE