aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-03-27 15:19:57 -0400
committerTom Rini <trini@konsulko.com>2023-03-27 15:19:57 -0400
commit605bc145f91d2a28ba2e517cae4e53e255e34b6f (patch)
treea8df36d6569d441bc013399ff7dafff07cd36657 /lib
parentfde439219ff53a46bdd5dff69e049ccd4be57310 (diff)
parent41a88ad529b3943b1e465846eb24fe2c29203e35 (diff)
Merge branch 'master' into next
Diffstat (limited to 'lib')
-rw-r--r--lib/panic.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/panic.c b/lib/panic.c
index 58382ac4f4cc..66ae17f3df99 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)