From owner-svn-src-all@FreeBSD.ORG Sat May 17 14:03:47 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B64816A; Sat, 17 May 2014 14:03:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0814F24A2; Sat, 17 May 2014 14:03:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HE3kuh032562; Sat, 17 May 2014 14:03:46 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4HE3kap032560; Sat, 17 May 2014 14:03:46 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201405171403.s4HE3kap032560@svn.freebsd.org> From: Ian Lepore Date: Sat, 17 May 2014 14:03:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r266313 - in stable/10: sys/arm/conf usr.bin/dtc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 14:03:47 -0000 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(';');