X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=lib_blackfin%2Fpost.c;h=faf6b96ba2745dd31c2755ed0842293edb943ea6;hb=52cb4d4fb3487313f5a72ea740f527a4aefaa365;hp=7c9478def5cb76903c70d5da95a2e05e001dfcfc;hpb=fad63407154f46246ce80d53a9c669a44362ac67;p=u-boot diff --git a/lib_blackfin/post.c b/lib_blackfin/post.c index 7c9478def5..faf6b96ba2 100644 --- a/lib_blackfin/post.c +++ b/lib_blackfin/post.c @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include @@ -30,7 +30,7 @@ #include #endif -#ifdef CONFIG_POST +DECLARE_GLOBAL_DATA_PTR; #define POST_MAX_NUMBER 32 @@ -38,8 +38,6 @@ int post_init_f(void) { - DECLARE_GLOBAL_DATA_PTR; - int res = 0; unsigned int i; @@ -62,7 +60,6 @@ int post_init_f(void) void post_bootmode_init(void) { - DECLARE_GLOBAL_DATA_PTR; int bootmode = post_bootmode_get(0); int newword; @@ -109,20 +106,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++) { @@ -349,7 +343,7 @@ int post_log(char *format, ...) { va_list args; uint i; - char printbuffer[CFG_PBSIZE]; + char printbuffer[CONFIG_SYS_PBSIZE]; va_start(args, format); @@ -372,8 +366,6 @@ int post_log(char *format, ...) void post_reloc(void) { - DECLARE_GLOBAL_DATA_PTR; - unsigned int i; /* @@ -425,7 +417,5 @@ void post_reloc(void) */ unsigned long post_time_ms(unsigned long base) { - return (unsigned long)get_ticks() / (get_tbclk() / CFG_HZ) - base; + return (unsigned long)get_ticks() / (get_tbclk() / CONFIG_SYS_HZ) - base; } - -#endif /* CONFIG_POST */