imported U-Boot Release 2009.08 from Freescale BSP L2.6.31_10.08.01

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

diff --git a/post/post.c b/post/post.c
index e1066da6bd1e9b5ec7237e7f3e2eeb2f7346e2d8..bc8114e511357c18c45c072564d7303d511d69c5 100755 (executable)
--- 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>
 
@@ -30,8 +30,6 @@
 #include <logbuff.h>
 #endif
 
-#ifdef CONFIG_POST
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #define POST_MAX_NUMBER                32
@@ -129,9 +127,7 @@ void post_output_backlog ( void )
                                post_log ("PASSED\n");
                        else {
                                post_log ("FAILED\n");
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-                               show_boot_progress(-31);
-#endif
+                               show_boot_progress (-31);
                        }
                }
        }
@@ -159,8 +155,10 @@ static void post_bootmode_test_off (void)
 
 static void post_get_flags (int *test_flags)
 {
-       int  flag[] = {  POST_POWERON,   POST_NORMAL,   POST_SLOWTEST };
-       char *var[] = { "post_poweron", "post_normal", "post_slowtest" };
+       int  flag[] = {  POST_POWERON,   POST_NORMAL,   POST_SLOWTEST,
+                        POST_CRITICAL };
+       char *var[] = { "post_poweron", "post_normal", "post_slowtest",
+                       "post_critical" };
        int varnum = sizeof (var) / sizeof (var[0]);
        char list[128];                 /* long enough for POST list */
        char *name;
@@ -226,7 +224,9 @@ static int post_run_single (struct post_test *test,
 
                if (!(flags & POST_REBOOT)) {
                        if ((test_flags & POST_REBOOT) && !(flags & POST_MANUAL)) {
-                               post_bootmode_test_on (i);
+                               post_bootmode_test_on (
+                                       (gd->flags & GD_FLG_POSTFAIL) ?
+                                               POST_FAIL_SAVE | i : i);
                        }
 
                        if (test_flags & POST_PREREL)
@@ -238,12 +238,20 @@ static int post_run_single (struct post_test *test,
                if (test_flags & POST_PREREL) {
                        if ((*test->test) (flags) == 0)
                                post_log_mark_succ ( test->testid );
+                       else {
+                               if (test_flags & POST_CRITICAL)
+                                       gd->flags |= GD_FLG_POSTFAIL;
+                               if (test_flags & POST_STOP)
+                                       gd->flags |= GD_FLG_POSTSTOP;
+                       }
                } else {
                if ((*test->test) (flags) != 0) {
                        post_log ("FAILED\n");
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-                       show_boot_progress(-32);
-#endif
+                       show_boot_progress (-32);
+                       if (test_flags & POST_CRITICAL)
+                               gd->flags |= GD_FLG_POSTFAIL;
+                       if (test_flags & POST_STOP)
+                               gd->flags |= GD_FLG_POSTSTOP;
                }
                else
                        post_log ("PASSED\n");
@@ -269,7 +277,14 @@ int post_run (char *name, int flags)
        if (name == NULL) {
                unsigned int last;
 
+               if (gd->flags & GD_FLG_POSTSTOP)
+                       return 0;
+
                if (post_bootmode_get (&last) & POST_POWERTEST) {
+                       if (last & POST_FAIL_SAVE) {
+                               last &= ~POST_FAIL_SAVE;
+                               gd->flags |= GD_FLG_POSTFAIL;
+                       }
                        if (last < post_list_size &&
                                (flags & test_flags[last] & POST_ALWAYS) &&
                                (flags & test_flags[last] & POST_MEM)) {
@@ -279,6 +294,8 @@ int post_run (char *name, int flags)
                                                 flags | POST_REBOOT, last);
 
                                for (i = last + 1; i < post_list_size; i++) {
+                                       if (gd->flags & GD_FLG_POSTSTOP)
+                                               break;
                                        post_run_single (post_list + i,
                                                         test_flags[i],
                                                         flags, i);
@@ -286,6 +303,8 @@ int post_run (char *name, int flags)
                        }
                } else {
                        for (i = 0; i < post_list_size; i++) {
+                               if (gd->flags & GD_FLG_POSTSTOP)
+                                       break;
                                post_run_single (post_list + i,
                                                 test_flags[i],
                                                 flags, i);
@@ -300,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);
@@ -352,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);
 
@@ -428,10 +448,9 @@ 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 */
 #endif
 }
-
-#endif /* CONFIG_POST */