X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=post%2Fpost.c;h=7c2bdf07803514d202bb30c1842ed23f02a33d53;hb=94f0003f654fb490ee4be2e2aef1811835f1fb8d;hp=ab8e959b7a314645d66a79dd01f42de323e72a95;hpb=50da8376630fb140067d8544293324f4f170c928;p=karo-tx-uboot.git

diff --git a/post/post.c b/post/post.c
index ab8e959b7a..7c2bdf0780 100644
--- 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);
+				bootstage_error(BOOTSTAGE_ID_POST_FAIL_R);
 			}
 		}
 	}
@@ -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);
+				bootstage_error(BOOTSTAGE_ID_POST_FAIL_R);
 				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"