Skip to content

Commit

Permalink
common: board_r: Drop initr_post_backlog wrapper
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Simon Glass <sjg@chromium.org>
  • Loading branch information
opanait-wr authored and trini committed Jan 15, 2021
1 parent fb504b2 commit 7addd3c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
10 changes: 1 addition & 9 deletions common/board_r.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
Expand Down
11 changes: 10 additions & 1 deletion include/post.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ 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_run (char *name, int flags);
int post_info (char *name);
int post_log (char *format, ...);
Expand All @@ -116,6 +115,16 @@ void post_reloc (void);
#endif
unsigned long post_time_ms (unsigned long base);

/**
* post_output_backlog() - Print POST results
*
* Print POST results during the generic board init sequence, after
* relocation.
*
* Return: 0 if OK
*/
int post_output_backlog(void);

extern struct post_test post_list[];
extern unsigned int post_list_size;
extern int post_hotkeys_pressed(void);
Expand Down
4 changes: 3 additions & 1 deletion post/post.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -143,6 +143,8 @@ void post_output_backlog(void)
}
}
}

return 0;
}

static void post_bootmode_test_on(unsigned int last_test)
Expand Down

0 comments on commit 7addd3c

Please sign in to comment.