summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/arm946es
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2013-04-11 09:35:43 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-04-12 07:55:05 +0200
commit959eaa74b83e4d18be5829a5a7c8deaa11aac7e0 (patch)
tree7605b7a903f93b92626b86306c21ebace166b3b8 /arch/arm/cpu/arm946es
parent508611bcb7d2a0fd5e7ead35c45f68b6e6c101ac (diff)
downloadu-boot-imx-959eaa74b83e4d18be5829a5a7c8deaa11aac7e0.zip
u-boot-imx-959eaa74b83e4d18be5829a5a7c8deaa11aac7e0.tar.gz
u-boot-imx-959eaa74b83e4d18be5829a5a7c8deaa11aac7e0.tar.bz2
arm: relocate_code() is no longer noreturn
Commit e05e5de7fae5bec79617e113916dac6631251156 made ARM's relocate_code() return to its caller, but it did not update its declaration accordingly. Fixing this function declaration fixes dropped C code following calls to relocate_code(). Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Diffstat (limited to 'arch/arm/cpu/arm946es')
-rw-r--r--arch/arm/cpu/arm946es/start.S4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S
index 85adc62..84fabf4 100644
--- a/arch/arm/cpu/arm946es/start.S
+++ b/arch/arm/cpu/arm946es/start.S
@@ -158,9 +158,7 @@ reset:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
- * This "function" does not return, instead it continues in RAM
- * after relocating the monitor code.
- *
+ * This function relocates the monitor code.
*/
.globl relocate_code
relocate_code: