Merge branch 'reloc'

[karo-tx-uboot.git] / post / post.c

diff --git a/post/post.c b/post/post.c
index d31829ba162b41c30d5e0672cf5104cd725e3dfc..b74e7623169d562c3e69ece9c99790ff7302df7f 100644 (file)
--- a/post/post.c
+++ b/post/post.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <console.h>
+#include <stdio_dev.h>
 #include <watchdog.h>
 #include <post.h>
 
@@ -319,6 +319,7 @@ int post_run (char *name, int flags)
                }
 
                if (i < post_list_size) {
+                       WATCHDOG_RESET();
                        return post_run_single (post_list + i,
                                                test_flags[i],
                                                flags, i);
@@ -371,7 +372,7 @@ int post_log (char *format, ...)
 {
        va_list args;
        uint i;
-       char printbuffer[CFG_PBSIZE];
+       char printbuffer[CONFIG_SYS_PBSIZE];
 
        va_start (args, format);
 
@@ -392,6 +393,7 @@ int post_log (char *format, ...)
        return 0;
 }
 
+#ifndef CONFIG_RELOC_FIXUP_WORKS
 void post_reloc (void)
 {
        unsigned int i;
@@ -436,6 +438,7 @@ void post_reloc (void)
                }
        }
 }
+#endif
 
 
 /*
@@ -447,7 +450,7 @@ void post_reloc (void)
 unsigned long post_time_ms (unsigned long base)
 {
 #ifdef CONFIG_PPC
-       return (unsigned long)(get_ticks () / (get_tbclk () / CFG_HZ)) - base;
+       return (unsigned long)(get_ticks () / (get_tbclk () / CONFIG_SYS_HZ)) - base;
 #else
 #warning "Not implemented yet"
        return 0; /* Not implemented yet */