Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-22 12:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

common: board_r: Drop initr_post_backlog wrapper

Browse source 
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>
This commit is contained in:
Ovidiu Panait 2020-11-28 10:43:10 +02:00 • committed by Tom Rini
parent fb504b2c08
commit 7addd3c6df
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/board_r.c
View file

@ -206,14 +206,6 @@ static int initr_addr_map(void)
} }
#endif #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) #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500)
static int initr_unlock_ram_in_cache(void) static int initr_unlock_ram_in_cache(void)
{ {
@ -746,7 +738,7 @@ static init_fnc_t init_sequence_r[] = {
#endif #endif
INIT_FUNC_WATCHDOG_RESET INIT_FUNC_WATCHDOG_RESET
#ifdef CONFIG_POST #ifdef CONFIG_POST
initr_post_backlog, post_output_backlog,
#endif #endif
INIT_FUNC_WATCHDOG_RESET INIT_FUNC_WATCHDOG_RESET
#if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT) #if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT)

11
include/post.h
View file

@ -107,7 +107,6 @@ int post_init_f (void);
void post_bootmode_init (void); void post_bootmode_init (void);
int post_bootmode_get (unsigned int * last_test); int post_bootmode_get (unsigned int * last_test);
void post_bootmode_clear (void); void post_bootmode_clear (void);
void post_output_backlog ( void );
int post_run (char *name, int flags); int post_run (char *name, int flags);
int post_info (char *name); int post_info (char *name);
int post_log (char *format, ...); int post_log (char *format, ...);
@ -116,6 +115,16 @@ void post_reloc (void);
#endif #endif
unsigned long post_time_ms (unsigned long base); 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 struct post_test post_list[];
extern unsigned int post_list_size; extern unsigned int post_list_size;
extern int post_hotkeys_pressed(void); extern int post_hotkeys_pressed(void);

4
post/post.c
View file

@ -128,7 +128,7 @@ static void post_log_mark_succ(unsigned long testid)
} }
/* ... and the messages are output once we are relocated */ /* ... and the messages are output once we are relocated */
void post_output_backlog(void) int post_output_backlog(void)
{ {
int j; int j;
@ -143,6 +143,8 @@ void post_output_backlog(void)
} }
} }
} }
return 0;
} }
static void post_bootmode_test_on(unsigned int last_test) static void post_bootmode_test_on(unsigned int last_test)