diff options
| author | Benoît Thébaudeau <benoit.thebaudeau@advansee.com> | 2013-04-11 09:35:43 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 07:55:05 +0200 |
| commit | 959eaa74b83e4d18be5829a5a7c8deaa11aac7e0 (patch) | |
| tree | 7605b7a903f93b92626b86306c21ebace166b3b8 /include/common.h | |
| parent | 508611bcb7d2a0fd5e7ead35c45f68b6e6c101ac (diff) | |
| download | u-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 'include/common.h')
| -rw-r--r-- | include/common.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index d41aeb4..52df70c 100644 --- a/include/common.h +++ b/include/common.h @@ -530,7 +530,11 @@ int dcache_status (void); void dcache_enable (void); void dcache_disable(void); void mmu_disable(void); -void relocate_code (ulong, gd_t *, ulong) __attribute__ ((noreturn)); +void relocate_code(ulong, gd_t *, ulong) +#if !defined(CONFIG_ARM) +__attribute__ ((noreturn)) +#endif +; ulong get_endaddr (void); void trap_init (ulong); #if defined (CONFIG_4xx) || \ |