sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

Blackfin: replace "bfin_reset_or_hang()" with "panic()" 

The bfin_reset_or_hang function unnecessarily duplicates the panic()
logic based on CONFIG_PANIC_HANG.

This patch deletes 20 lines of code and just calls panic() instead.
This also makes the following generic-restart conversion patch simpler.

Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Kyle Moffett 2011-03-07 12:37:30 -05:00 committed by Mike Frysinger
parent a91eb2c56a
commit eed1a7b1cf
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/blackfin/cpu/cpu.h
View File

@ -28,7 +28,6 @@
#include <command.h>
void board_reset(void) __attribute__((__weak__));
void bfin_reset_or_hang(void) __attribute__((__noreturn__));
void bfin_dump(struct pt_regs *reg);
void bfin_panic(struct pt_regs *reg);
void dump(struct pt_regs *regs);

18
arch/blackfin/cpu/reset.c
View File

@ -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.
*/
__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));
}
__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 * const argv[])
{
bfin_reset_trampoline();
return 0;
}

2
arch/blackfin/cpu/traps.c
View File

@ -426,5 +426,5 @@ void bfin_panic(struct pt_regs *regs)
unsigned long tflags;
trace_buffer_save(tflags);
bfin_dump(regs);
bfin_reset_or_hang();
panic("PANIC: Blackfin internal error");
}