projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'phylib' of git://git.denx.de/u-boot-mmc
[oweals/u-boot.git]
/
arch
/
blackfin
/
cpu
/
reset.c
diff --git
a/arch/blackfin/cpu/reset.c
b/arch/blackfin/cpu/reset.c
index e3be7407115a4d3de43a3d39ae7937db476944b9..9307e9f9e2005670f28549820e82215e989cf240 100644
(file)
--- a/
arch/blackfin/cpu/reset.c
+++ b/
arch/blackfin/cpu/reset.c
@@
-80,27
+80,11
@@
static void bfin_reset(void)
* PC relative call with a 25 bit immediate. This is not enough
* to get us from the top of SDRAM into L1.
*/
* PC relative call with a 25 bit immediate. This is not enough
* to get us from the top of SDRAM into L1.
*/
-__attribute__ ((__noreturn__))
-static inline void bfin_reset_trampoline(void)
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
if (board_reset)
board_reset();
while (1)
asm("jump (%0);" : : "a" (bfin_reset));
{
if (board_reset)
board_reset();
while (1)
asm("jump (%0);" : : "a" (bfin_reset));
-}
-
-__attribute__ ((__noreturn__))
-void bfin_reset_or_hang(void)
-{
-#ifdef CONFIG_PANIC_HANG
- hang();
-#else
- bfin_reset_trampoline();
-#endif
-}
-
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-{
- bfin_reset_trampoline();
return 0;
}
return 0;
}