Merge branch 'i2c'

[u-boot] / post / post.c

diff --git a/post/post.c b/post/post.c
index 28dd5f79a5968ea774acd83e95c63e384b38fb6d..e1066da6bd1e9b5ec7237e7f3e2eeb2f7346e2d8 100644 (file)
--- a/post/post.c
+++ b/post/post.c
@@ -32,14 +32,14 @@
 
 #ifdef CONFIG_POST
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define POST_MAX_NUMBER                32
 
 #define BOOTMODE_MAGIC 0xDEAD0000
 
 int post_init_f (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        int res = 0;
        unsigned int i;
 
@@ -62,10 +62,9 @@ int post_init_f (void)
 
 void post_bootmode_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        int bootmode = post_bootmode_get (0);
        int newword;
-       
+
        if (post_hotkeys_pressed() && !(bootmode & POST_POWERTEST)) {
                newword = BOOTMODE_MAGIC | POST_SLOWTEST;
        } else if (bootmode == 0) {
@@ -110,20 +109,17 @@ int post_bootmode_get (unsigned int *last_test)
 /* 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++) {
@@ -131,8 +127,12 @@ void post_output_backlog ( void )
                        post_log ("POST %s ", post_list[j].cmd);
                        if (gd->post_log_word & post_list[j].testid)
                                post_log ("PASSED\n");
-                       else
+                       else {
                                post_log ("FAILED\n");
+#ifdef CONFIG_SHOW_BOOT_PROGRESS
+                               show_boot_progress(-31);
+#endif
+                       }
                }
        }
 }
@@ -239,8 +239,12 @@ static int post_run_single (struct post_test *test,
                        if ((*test->test) (flags) == 0)
                                post_log_mark_succ ( test->testid );
                } else {
-               if ((*test->test) (flags) != 0)
+               if ((*test->test) (flags) != 0) {
                        post_log ("FAILED\n");
+#ifdef CONFIG_SHOW_BOOT_PROGRESS
+                       show_boot_progress(-32);
+#endif
+               }
                else
                        post_log ("PASSED\n");
                }
@@ -371,8 +375,6 @@ int post_log (char *format, ...)
 
 void post_reloc (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        unsigned int i;
 
        /*