svn commit: r285682 - head/sys/boot/arm/ixp425/boot2
John-Mark Gurney
jmg at FreeBSD.org
Sat Jul 18 20:21:27 UTC 2015
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)
{
More information about the svn-src-head
mailing list