rtc: Fix merging problem

[u-boot] / post / post.c

diff --git a/post/post.c b/post/post.c
index 89ad6f0d58e3d94f8fa248e234523107fc81ac84..4ff75ee4b12abe44157e4d807516e63c12d2b5c9 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,7 +62,6 @@ int post_init_f (void)
 
 void post_bootmode_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        int bootmode = post_bootmode_get (0);
        int newword;
 
@@ -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,10 @@ 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");
+                               show_boot_progress (-31);
+                       }
                }
        }
 }
@@ -239,8 +237,10 @@ 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");
+                       show_boot_progress (-32);
+               }
                else
                        post_log ("PASSED\n");
                }
@@ -371,8 +371,6 @@ int post_log (char *format, ...)
 
 void post_reloc (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        unsigned int i;
 
        /*
@@ -426,8 +424,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 () / CFG_HZ)) - base;
 #else
+#warning "Not implemented yet"
        return 0; /* Not implemented yet */
 #endif
 }