bootstage: Use show_boot_error() for -ve progress numbers

[oweals/u-boot.git] / post / post.c

diff --git a/post/post.c b/post/post.c
index ab8e959b7a314645d66a79dd01f42de323e72a95..f3830be678e161879b3c51d9bf01b50f4b3f487d 100644 (file)
--- a/post/post.c
+++ b/post/post.c
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <stdio_dev.h>
 #include <watchdog.h>
+#include <div64.h>
 #include <post.h>
 
 #ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
@@ -157,7 +158,7 @@ void post_output_backlog(void)
                                post_log("PASSED\n");
                        else {
                                post_log("FAILED\n");
-                               show_boot_progress(-31);
+                               show_boot_error(31);
                        }
                }
        }
@@ -294,7 +295,7 @@ static int post_run_single(struct post_test *test,
                } else {
                        if ((*test->test)(flags) != 0) {
                                post_log("FAILED\n");
-                               show_boot_progress(-32);
+                               show_boot_error(32);
                                show_post_progress(i, POST_AFTER, POST_FAILED);
                                if (test_flags & POST_CRITICAL)
                                        gd->flags |= GD_FLG_POSTFAIL;
@@ -417,7 +418,6 @@ int post_info(char *name)
 int post_log(char *format, ...)
 {
        va_list args;
-       uint i;
        char printbuffer[CONFIG_SYS_PBSIZE];
 
        va_start(args, format);
@@ -425,7 +425,7 @@ int post_log(char *format, ...)
        /* For this to work, printbuffer must be larger than
         * anything we ever want to print.
         */
-       i = vsprintf(printbuffer, format, args);
+       vsprintf(printbuffer, format, args);
        va_end(args);
 
 #ifdef CONFIG_LOGBUFFER
@@ -495,8 +495,9 @@ void post_reloc(void)
  */
 unsigned long post_time_ms(unsigned long base)
 {
-#if defined(CONFIG_PPC) || defined(CONFIG_ARM)
-       return (unsigned long)(get_ticks() / (get_tbclk() / CONFIG_SYS_HZ))
+#if defined(CONFIG_PPC) || defined(CONFIG_BLACKFIN) || \
+    (defined(CONFIG_ARM) && !defined(CONFIG_KIRKWOOD))
+       return (unsigned long)lldiv(get_ticks(), get_tbclk() / CONFIG_SYS_HZ)
                - base;
 #else
 #warning "Not implemented yet"