Add a return value to post_output_backlog and use it directly in the post-relocation init sequence, rather than using a wrapper stub.
Signed-off-by: Ovidiu Panait ovidiu.panait@windriver.com --- common/board_r.c | 10 +--------- include/post.h | 2 +- post/post.c | 4 +++- 3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/common/board_r.c b/common/board_r.c index a291543d74..7a06627ba9 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -206,14 +206,6 @@ static int initr_addr_map(void) } #endif
-#ifdef CONFIG_POST -static int initr_post_backlog(void) -{ - post_output_backlog(); - return 0; -} -#endif - #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500) static int initr_unlock_ram_in_cache(void) { @@ -746,7 +738,7 @@ static init_fnc_t init_sequence_r[] = { #endif INIT_FUNC_WATCHDOG_RESET #ifdef CONFIG_POST - initr_post_backlog, + post_output_backlog, #endif INIT_FUNC_WATCHDOG_RESET #if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT) diff --git a/include/post.h b/include/post.h index eb218acde5..3dd68a6d9f 100644 --- a/include/post.h +++ b/include/post.h @@ -107,7 +107,7 @@ int post_init_f (void); void post_bootmode_init (void); int post_bootmode_get (unsigned int * last_test); void post_bootmode_clear (void); -void post_output_backlog ( void ); +int post_output_backlog(void); int post_run (char *name, int flags); int post_info (char *name); int post_log (char *format, ...); diff --git a/post/post.c b/post/post.c index 0f1fe8d905..7d6a647312 100644 --- a/post/post.c +++ b/post/post.c @@ -128,7 +128,7 @@ static void post_log_mark_succ(unsigned long testid) }
/* ... and the messages are output once we are relocated */ -void post_output_backlog(void) +int post_output_backlog(void) { int j;
@@ -143,6 +143,8 @@ void post_output_backlog(void) } } } + + return 0; }
static void post_bootmode_test_on(unsigned int last_test)