summaryrefslogtreecommitdiff
path: root/include/common.h
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2013-04-11 09:35:53 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-04-12 07:55:07 +0200
commit5c6db120fc184bae7a344a4e5da83b21164b59a6 (patch)
tree7dd8c5c9434937e915cf4428b1ce2beaea7554a4 /include/common.h
parentac415a5720aa3c2b2ca95498b68e2062a185c1d1 (diff)
downloadu-boot-imx-5c6db120fc184bae7a344a4e5da83b21164b59a6.zip
u-boot-imx-5c6db120fc184bae7a344a4e5da83b21164b59a6.tar.gz
u-boot-imx-5c6db120fc184bae7a344a4e5da83b21164b59a6.tar.bz2
arm: Remove unused relocate_code() parameters
Commit e05e5de7fae5bec79617e113916dac6631251156 made the 2 1st parameters of ARM's relocate_code() useless since it moved the code handling them to crt0.S. So, drop these parameters. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/common.h b/include/common.h
index 52df70c..604176c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -530,11 +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)
-#if !defined(CONFIG_ARM)
-__attribute__ ((noreturn))
+#if defined(CONFIG_ARM)
+void relocate_code(ulong);
+#else
+void relocate_code(ulong, gd_t *, ulong) __attribute__ ((noreturn));
#endif
-;
ulong get_endaddr (void);
void trap_init (ulong);
#if defined (CONFIG_4xx) || \