diff options
| author | jmg <jmg@FreeBSD.org> | 2015-07-18 20:21:25 +0000 |
|---|---|---|
| committer | jmg <jmg@FreeBSD.org> | 2015-07-18 20:21:25 +0000 |
| commit | 1c6ba1ec44b5763a9dbc2ae9029edaea578ff595 (patch) | |
| tree | d7e5ea884bb64134a73f82c51cb7db34d29db22a /sys/boot | |
| parent | 237a65ef480bc18c1e519f706025f9542e504b19 (diff) | |
| download | FreeBSD-src-1c6ba1ec44b5763a9dbc2ae9029edaea578ff595.zip FreeBSD-src-1c6ba1ec44b5763a9dbc2ae9029edaea578ff595.tar.gz | |
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
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/arm/ixp425/boot2/arm_init.S | 2 | ||||
| -rw-r--r-- | sys/boot/arm/ixp425/boot2/boot2.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sys/boot/arm/ixp425/boot2/arm_init.S b/sys/boot/arm/ixp425/boot2/arm_init.S index 9ede9fc..15e1e6c 100644 --- a/sys/boot/arm/ixp425/boot2/arm_init.S +++ b/sys/boot/arm/ixp425/boot2/arm_init.S @@ -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 */ diff --git a/sys/boot/arm/ixp425/boot2/boot2.c b/sys/boot/arm/ixp425/boot2/boot2.c index e5f4982..aa187fd 100644 --- a/sys/boot/arm/ixp425/boot2/boot2.c +++ b/sys/boot/arm/ixp425/boot2/boot2.c @@ -152,6 +152,8 @@ getstr(int c) } } +int main(void); + int main(void) { |
