From owner-svn-src-head@FreeBSD.ORG  Thu Feb 20 13:09:09 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 014A9B92;
 Thu, 20 Feb 2014 13:09:09 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DD5E21DFA;
 Thu, 20 Feb 2014 13:09:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1KD988p057494;
 Thu, 20 Feb 2014 13:09:08 GMT (envelope-from loos@svn.freebsd.org)
Received: (from loos@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1KD98KM057492;
 Thu, 20 Feb 2014 13:09:08 GMT (envelope-from loos@svn.freebsd.org)
Message-Id: <201402201309.s1KD98KM057492@svn.freebsd.org>
From: Luiz Otavio O Souza <loos@FreeBSD.org>
Date: Thu, 20 Feb 2014 13:09:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262242 - head/sys/boot/fdt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Feb 2014 13:09:09 -0000

Author: loos
Date: Thu Feb 20 13:09:08 2014
New Revision: 262242
URL: http://svnweb.freebsd.org/changeset/base/262242

Log:
  Fix the boot on FDT-enabled systems after r261819.
  
  While here, don't overwrite the error message on interactive use and add
  the missing '\n' at end of error message for the non interactive use.
  
  Tested by:	ian, myself
  Approved by:	adrian (mentor, implicit)

Modified:
  head/sys/boot/fdt/fdt_loader_cmd.c

Modified: head/sys/boot/fdt/fdt_loader_cmd.c
==============================================================================
--- head/sys/boot/fdt/fdt_loader_cmd.c	Thu Feb 20 09:00:13 2014	(r262241)
+++ head/sys/boot/fdt/fdt_loader_cmd.c	Thu Feb 20 13:09:08 2014	(r262242)
@@ -230,7 +230,7 @@ fdt_load_dtb_addr(struct fdt_header *hea
 	int err;
 
 	fdtp_size = fdt_totalsize(header);
-	err = fdt_check_header(&header);
+	err = fdt_check_header(header);
 	if (err < 0) {
 		sprintf(command_errbuf, "error validating blob: %s",
 		    fdt_strerror(err));
@@ -667,7 +667,7 @@ fdt_fixup(void)
 {
 	const char *env;
 	char *ethstr;
-	int chosen, err, eth_no, len;
+	int chosen, eth_no, len;
 	struct sys_info *si;
 
 	env = NULL;
@@ -675,13 +675,8 @@ fdt_fixup(void)
 	ethstr = NULL;
 	len = 0;
 
-	if (fdtp == NULL) {
-		err = fdt_setup_fdtp();
-		if (err) {
-			sprintf(command_errbuf, "No valid device tree blob found!");
-			return (0);
-		}
-	}
+	if (fdtp == NULL && fdt_setup_fdtp() != 0)
+		return (0);
 
 	/* Create /chosen node (if not exists) */
 	if ((chosen = fdt_subnode_offset(fdtp, 0, "chosen")) ==
@@ -747,7 +742,7 @@ fdt_copy(vm_offset_t va)
 	if (fdtp == NULL) {
 		err = fdt_setup_fdtp();
 		if (err) {
-			printf("No valid device tree blob found!");
+			printf("No valid device tree blob found!\n");
 			return (0);
 		}
 	}