From owner-svn-src-stable-10@FreeBSD.ORG  Tue Apr 29 00:38:47 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@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 82B4F640;
 Tue, 29 Apr 2014 00:38: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 6E45A1663;
 Tue, 29 Apr 2014 00:38: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 s3T0clbx029229;
 Tue, 29 Apr 2014 00:38:47 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3T0clCP029228;
 Tue, 29 Apr 2014 00:38:47 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201404290038.s3T0clCP029228@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 29 Apr 2014 00:38:47 +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: r265070 - stable/10/sys/boot/uboot/common
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Apr 2014 00:38:47 -0000

Author: ian
Date: Tue Apr 29 00:38:46 2014
New Revision: 265070
URL: http://svnweb.freebsd.org/changeset/base/265070

Log:
  MFC r262666: exit with code 0xbadab1 if the u-boot API support is missing.

Modified:
  stable/10/sys/boot/uboot/common/main.c

Modified: stable/10/sys/boot/uboot/common/main.c
==============================================================================
--- stable/10/sys/boot/uboot/common/main.c	Tue Apr 29 00:36:51 2014	(r265069)
+++ stable/10/sys/boot/uboot/common/main.c	Tue Apr 29 00:38:46 2014	(r265070)
@@ -124,15 +124,21 @@ main(void)
 	struct open_file f;
 	const char * loaderdev;
 
+	/*
+	 * If we can't find the magic signature and related info, exit with a
+	 * unique error code that U-Boot reports as "## Application terminated,
+	 * rc = 0xnnbadab1". Hopefully 'badab1' looks enough like "bad api" to
+	 * provide a clue. It's better than 0xffffffff anyway.
+	 */
 	if (!api_search_sig(&sig))
-		return (-1);
+		return (0x01badab1);
 
 	syscall_ptr = sig->syscall;
 	if (syscall_ptr == NULL)
-		return (-2);
+		return (0x02badab1);
 
 	if (sig->version > API_SIG_VERSION)
-		return (-3);
+		return (0x03badab1);
 
         /* Clear BSS sections */
 	bzero(__sbss_start, __sbss_end - __sbss_start);