svn commit: r266313 - in stable/10: sys/arm/conf usr.bin/dtc

[Ian Lepore]

Author: ian
Date: Sat May 17 14:03:46 2014
New Revision: 266313
URL: http://svnweb.freebsd.org/changeset/base/266313

Log:
  MFC 263199, 263207
  
    Fix error mesasge in dtc.
  
    Add tmpfs, mbr, and bsdlabel options back to wandboard kernel config.

Modified:
  stable/10/sys/arm/conf/WANDBOARD.common
  stable/10/usr.bin/dtc/fdt.cc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/conf/WANDBOARD.common
==============================================================================
--- stable/10/sys/arm/conf/WANDBOARD.common	Sat May 17 13:59:11 2014	(r266312)
+++ stable/10/sys/arm/conf/WANDBOARD.common	Sat May 17 14:03:46 2014	(r266313)
@@ -35,10 +35,13 @@ options  	NFSCL			# New Network Filesyst
 #options  	NFSD			# New Network Filesystem Server
 options  	NFSLOCKD		# Network Lock Manager
 options  	NFS_ROOT		# NFS usable as /, requires NFSCL
+options		TMPFS			# Efficient memory filesystem
 options  	MSDOSFS			# MSDOS Filesystem
 options  	CD9660			# ISO 9660 Filesystem
 #options  	PROCFS			# Process filesystem (requires PSEUDOFS)
 options  	PSEUDOFS		# Pseudo-filesystem framework
+options 	GEOM_PART_BSD		# BSD partition scheme
+options 	GEOM_PART_MBR		# MBR partition scheme
 options  	GEOM_PART_GPT		# GUID Partition Tables.
 options  	GEOM_LABEL		# Provides labelization
 options  	KTRACE			# ktrace(1) support

Modified: stable/10/usr.bin/dtc/fdt.cc
==============================================================================
--- stable/10/usr.bin/dtc/fdt.cc	Sat May 17 13:59:11 2014	(r266312)
+++ stable/10/usr.bin/dtc/fdt.cc	Sat May 17 14:03:46 2014	(r266313)
@@ -1374,7 +1374,7 @@ device_tree::parse_dts(const char *fn, F
 		    (input.next_token(),
 		    input.consume_integer(len))))
 		{
-			input.parse_error("Expected /dts-v1/; version string");
+			input.parse_error("Expected size on /memreserve/ node.");
 		}
 		input.next_token();
 		input.consume(';');