Merge branch 'i2c'

[u-boot] / post / post.c

diff --git a/post/post.c b/post/post.c
index 0474f1f75b11e735f6aa6607e0525207583323c6..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,20 +62,28 @@ 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(gd) && !(bootmode & POST_POWERTEST)) {
-               bootmode = POST_SLOWTEST;
+       if (post_hotkeys_pressed() && !(bootmode & POST_POWERTEST)) {
+               newword = BOOTMODE_MAGIC | POST_SLOWTEST;
        } else if (bootmode == 0) {
-               bootmode = POST_POWERON;
+               newword = BOOTMODE_MAGIC | POST_POWERON;
        } else if (bootmode == POST_POWERON || bootmode == POST_SLOWTEST) {
-               bootmode = POST_NORMAL;
+               newword = BOOTMODE_MAGIC | POST_NORMAL;
        } else {
-               return;
+               /* Use old value */
+               newword = post_word_load () & ~POST_COLDBOOT;
+       }
+
+       if (bootmode == 0)
+       {
+               /* We are booting after power-on */
+               newword |= POST_COLDBOOT;
        }
 
-       post_word_store (BOOTMODE_MAGIC | bootmode);
+       post_word_store (newword);
+
        /* Reset activity record */
        gd->post_log_word = 0;
 }
@@ -89,7 +97,7 @@ int post_bootmode_get (unsigned int *last_test)
                return 0;
        }
 
-       bootmode = word & 0xFF;
+       bootmode = word & 0x7F;
 
        if (last_test && (bootmode & POST_POWERTEST)) {
                *last_test = (word >> 8) & 0xFF;
@@ -101,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++) {
@@ -122,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
+                       }
                }
        }
 }
@@ -230,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");
                }
@@ -362,8 +375,6 @@ int post_log (char *format, ...)
 
 void post_reloc (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        unsigned int i;
 
        /*