From owner-svn-src-head@freebsd.org  Sat Jul 18 20:21:27 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 088A79A5E8B;
 Sat, 18 Jul 2015 20:21:27 +0000 (UTC) (envelope-from jmg@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 ED0961E3D;
 Sat, 18 Jul 2015 20:21:26 +0000 (UTC) (envelope-from jmg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6IKLQk0058092;
 Sat, 18 Jul 2015 20:21:26 GMT (envelope-from jmg@FreeBSD.org)
Received: (from jmg@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6IKLQYS058090;
 Sat, 18 Jul 2015 20:21:26 GMT (envelope-from jmg@FreeBSD.org)
Message-Id: <201507182021.t6IKLQYS058090@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jmg set sender to jmg@FreeBSD.org
 using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
Date: Sat, 18 Jul 2015 20:21:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285682 - head/sys/boot/arm/ixp425/boot2
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.20
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: Sat, 18 Jul 2015 20:21:27 -0000

Author: jmg
Date: Sat Jul 18 20:21:25 2015
New Revision: 285682
URL: https://svnweb.freebsd.org/changeset/base/285682

Log:
  other fixes to make boot2 compile for IXP...  Properly end the asm
  sections, and for some reason, main needs a prototype... If someone
  has a better fix, I'm all ears...
  
  Pointed out by:	Berislav Purgar

Modified:
  head/sys/boot/arm/ixp425/boot2/arm_init.S
  head/sys/boot/arm/ixp425/boot2/boot2.c

Modified: head/sys/boot/arm/ixp425/boot2/arm_init.S
==============================================================================
--- head/sys/boot/arm/ixp425/boot2/arm_init.S	Sat Jul 18 20:19:51 2015	(r285681)
+++ head/sys/boot/arm/ixp425/boot2/arm_init.S	Sat Jul 18 20:21:25 2015	(r285682)
@@ -43,6 +43,7 @@ ASENTRY_NP(start)
 /* main should not return.  If it does, spin forever		*/
 infiniteLoop:
 	b	infiniteLoop
+END(start)
 
 .Lstart:
 	.word	_edata
@@ -52,5 +53,6 @@ infiniteLoop:
 ENTRY(cpu_id)
 	mrc	p15, 0, r0, c0, c0, 0
 	RET
+END(cpu_id)
 
 /* End */

Modified: head/sys/boot/arm/ixp425/boot2/boot2.c
==============================================================================
--- head/sys/boot/arm/ixp425/boot2/boot2.c	Sat Jul 18 20:19:51 2015	(r285681)
+++ head/sys/boot/arm/ixp425/boot2/boot2.c	Sat Jul 18 20:21:25 2015	(r285682)
@@ -152,6 +152,8 @@ getstr(int c)
 	}
 }
 
+int main(void);
+
 int
 main(void)
 {