Make compile clean

[platform/kernel/u-boot.git] / post / post.c

diff --git a/post/post.c b/post/post.c
index 4f4b72f..eab3f11 100644 (file)
--- a/post/post.c
+++ b/post/post.c
@@ -26,6 +26,10 @@
 #include <watchdog.h>
 #include <post.h>
 
+#ifdef CONFIG_LOGBUFFER
+#include <logbuff.h>
+#endif
+
 #ifdef CONFIG_POST
 
 #define POST_MAX_NUMBER                32
@@ -34,6 +38,7 @@
 
 void post_bootmode_init (void)
 {
+       DECLARE_GLOBAL_DATA_PTR;
        int bootmode = post_bootmode_get (0);
 
        if (bootmode == 0) {
@@ -45,6 +50,8 @@ void post_bootmode_init (void)
        }
 
        post_word_store (BOOTMODE_MAGIC | bootmode);
+       /* Reset activity record */
+       gd->post_log_word = 0;
 }
 
 int post_bootmode_get (unsigned int *last_test)
@@ -70,6 +77,36 @@ void post_bootmode_clear (void)
        post_word_store (0);
 }
 
+/* POST tests run before relocation only mark status bits .... */
+static void post_log_mark_start ( unsigned long testid )
+{
+       DECLARE_GLOBAL_DATA_PTR;
+       gd->post_log_word |= (testid)<<16;
+}
+
+static void post_log_mark_succ ( unsigned long testid )
+{
+       DECLARE_GLOBAL_DATA_PTR;
+       gd->post_log_word |= testid;
+}
+
+/* ... and the messages are output once we are relocated */
+void post_output_backlog ( void )
+{
+       DECLARE_GLOBAL_DATA_PTR;
+       int j;
+
+       for (j = 0; j < post_list_size; j++) {
+               if (gd->post_log_word & (post_list[j].testid<<16)) {
+                       post_log ("POST %s ", post_list[j].cmd);
+                       if (gd->post_log_word & post_list[j].testid)
+                               post_log ("PASSED\n");
+                       else
+                               post_log ("FAILED\n");
+               }
+       }
+}
+
 static void post_bootmode_test_on (unsigned int last_test)
 {
        unsigned long word = post_word_load ();
@@ -156,13 +193,21 @@ static int post_run_single (struct post_test *test,
                                post_bootmode_test_on (i);
                        }
 
-                       post_log ("START %s\n", test->cmd);
+                       if (test_flags & POST_PREREL)
+                               post_log_mark_start ( test->testid );
+                       else
+                       post_log ("POST %s ", test->cmd);
                }
 
+               if (test_flags & POST_PREREL) {
+                       if ((*test->test) (flags) == 0)
+                               post_log_mark_succ ( test->testid );
+               } else {
                if ((*test->test) (flags) != 0)
                        post_log ("FAILED\n");
                else
                        post_log ("PASSED\n");
+               }
 
                if ((test_flags & POST_REBOOT) && !(flags & POST_MANUAL)) {
                        post_bootmode_test_off ();
@@ -189,18 +234,21 @@ int post_run (char *name, int flags)
                                (flags & test_flags[last] & POST_ALWAYS) &&
                                (flags & test_flags[last] & POST_MEM)) {
 
-                               post_run_single (post_list + last, test_flags[last],
-                                                                flags | POST_REBOOT, last);
+                               post_run_single (post_list + last,
+                                                test_flags[last],
+                                                flags | POST_REBOOT, last);
 
                                for (i = last + 1; i < post_list_size; i++) {
-                                       post_run_single (post_list + i, test_flags[i],
-                                                                        flags, i);
+                                       post_run_single (post_list + i,
+                                                        test_flags[i],
+                                                        flags, i);
                                }
                        }
                } else {
                        for (i = 0; i < post_list_size; i++) {
-                               post_run_single (post_list + i, test_flags[i], flags,
-                                                                i);
+                               post_run_single (post_list + i,
+                                                test_flags[i],
+                                                flags, i);
                        }
                }
 
@@ -274,8 +322,13 @@ int post_log (char *format, ...)
        i = vsprintf (printbuffer, format, args);
        va_end (args);
 
+#ifdef CONFIG_LOGBUFFER
+       /* Send to the logbuffer */
+       logbuff_log (printbuffer);
+#else
        /* Send to the stdout file */
        puts (printbuffer);
+#endif
 
        return 0;
 }