svn commit: r285365 - stable/10/sys/arm/conf

[Glen Barber]

Author: gjb
Date: Fri Jul 10 22:10:00 2015
New Revision: 285365
URL: https://svnweb.freebsd.org/changeset/base/285365

Log:
  Fix two remaining issues with the arm UFS mount issue:
  
  - Add the GEOM_PART_GPT option and enable MSDOSFS in the GUMSTIX
    kernel. [1]
  
  - Add GEOM_LABEL to the PANDABOARD kernel, that should have been
    included included in r285132.  I confused the kernel configuration
    used for the WANDBOARD and PANDABOARD, which the former uses the
    IMX6 kernel configuration, along with the CUBOX-HUMMINGBOARD.
  
  This is a direct commit to stable/10, as was r285132.
  
  [1] I do not actually have the GUMSTIX board, but I suspect it will
      fail to boot in the same way as the others have been.
  
  Approved by:	re (kib)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/arm/conf/GUMSTIX
  stable/10/sys/arm/conf/PANDABOARD

Modified: stable/10/sys/arm/conf/GUMSTIX
==============================================================================
--- stable/10/sys/arm/conf/GUMSTIX	Fri Jul 10 21:17:49 2015	(r285364)
+++ stable/10/sys/arm/conf/GUMSTIX	Fri Jul 10 22:10:00 2015	(r285365)
@@ -47,11 +47,12 @@ options 	UFS_DIRHASH		# Improve performa
 options 	NFSCL			# New Network Filesystem Client
 #options 	NFSD			# New Network Filesystem Server
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
+options		GEOM_PART_GPT		# GUID Partition Tables
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 options 	GEOM_LABEL		# Provides labelization 
 options 	TMPFS			# Efficient memory filesystem
-#options 	MSDOSFS			# MSDOS Filesystem
+options 	MSDOSFS			# MSDOS Filesystem
 #options 	CD9660			# ISO 9660 Filesystem
 #options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework

Modified: stable/10/sys/arm/conf/PANDABOARD
==============================================================================
--- stable/10/sys/arm/conf/PANDABOARD	Fri Jul 10 21:17:49 2015	(r285364)
+++ stable/10/sys/arm/conf/PANDABOARD	Fri Jul 10 22:10:00 2015	(r285365)
@@ -52,6 +52,7 @@ options 	TMPFS			# Efficient memory file
 options 	GEOM_PART_GPT		# GUID Partition Tables
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
+options 	GEOM_LABEL		# Provides labelization 
 options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support