diff options
| -rw-r--r-- | arch/arm/lib/reset.c | 4 | ||||
| -rw-r--r-- | lib/panic.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c index 95169bae1c1..3e051e36f12 100644 --- a/arch/arm/lib/reset.c +++ b/arch/arm/lib/reset.c @@ -25,6 +25,7 @@ #include <cpu_func.h> #include <irq_func.h> #include <linux/delay.h> +#include <stdio.h> __weak void reset_misc(void) { @@ -33,8 +34,7 @@ __weak void reset_misc(void) int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { puts ("resetting ...\n"); - - mdelay(50); /* wait 50 ms */ + flush(); disable_interrupts(); diff --git a/lib/panic.c b/lib/panic.c index 58382ac4f4c..66ae17f3df9 100644 --- a/lib/panic.c +++ b/lib/panic.c @@ -15,6 +15,7 @@ #include <command.h> #endif #include <linux/delay.h> +#include <stdio.h> static void panic_finish(void) __attribute__ ((noreturn)); @@ -24,7 +25,8 @@ static void panic_finish(void) #if defined(CONFIG_PANIC_HANG) hang(); #else - udelay(100000); /* allow messages to go out */ + flush(); /* flush the panic message before reset */ + do_reset(NULL, 0, 0, NULL); #endif while (1) |