From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 19 18:52:28 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0E177BB6;
 Thu, 19 Dec 2013 18:52:28 +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 EE3281D47;
 Thu, 19 Dec 2013 18:52:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJIqRcq057725;
 Thu, 19 Dec 2013 18:52:27 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJIqRJO057724;
 Thu, 19 Dec 2013 18:52:27 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201312191852.rBJIqRJO057724@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Thu, 19 Dec 2013 18:52:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r259620 - projects/specific_leg/sys/arm/arm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Dec 2013 18:52:28 -0000

Author: andrew
Date: Thu Dec 19 18:52:27 2013
New Revision: 259620
URL: http://svnweb.freebsd.org/changeset/base/259620

Log:
  Re-enable the FreeBSD boot ABI, it works as expected.

Modified:
  projects/specific_leg/sys/arm/arm/machdep.c

Modified: projects/specific_leg/sys/arm/arm/machdep.c
==============================================================================
--- projects/specific_leg/sys/arm/arm/machdep.c	Thu Dec 19 18:27:32 2013	(r259619)
+++ projects/specific_leg/sys/arm/arm/machdep.c	Thu Dec 19 18:52:27 2013	(r259620)
@@ -994,11 +994,11 @@ default_parse_boot_param(struct arm_boot
 	if ((lastaddr = linux_parse_boot_param(abp)) != 0)
 		return lastaddr;
 #endif
+#endif
 #if defined(FREEBSD_BOOT_LOADER)
 	if ((lastaddr = freebsd_parse_boot_param(abp)) != 0)
 		return lastaddr;
 #endif
-#endif
 	/* Fall back to hardcoded metadata. */
 	lastaddr = fake_preload_metadata(abp);