mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
common: board_r: Drop initr_jumptable wrapper
Add a return value to jumptable_init 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:
parent
eb2825b79d
commit
0154858039
3 changed files with 12 additions and 10 deletions
|
@ -490,12 +490,6 @@ static int initr_malloc_bootparams(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
static int initr_jumptable(void)
|
||||
{
|
||||
jumptable_init();
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_API)
|
||||
static int initr_api(void)
|
||||
{
|
||||
|
@ -757,7 +751,7 @@ static init_fnc_t init_sequence_r[] = {
|
|||
pci_init,
|
||||
#endif
|
||||
stdio_add_devices,
|
||||
initr_jumptable,
|
||||
jumptable_init,
|
||||
#ifdef CONFIG_API
|
||||
initr_api,
|
||||
#endif
|
||||
|
|
|
@ -25,8 +25,10 @@ unsigned long get_version(void)
|
|||
# define miiphy_set_current_dev dummy
|
||||
#endif
|
||||
|
||||
void jumptable_init(void)
|
||||
int jumptable_init(void)
|
||||
{
|
||||
gd->jt = malloc(sizeof(struct jt_funcs));
|
||||
#include <_exports.h>
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -15,8 +15,14 @@
|
|||
struct cmd_tbl;
|
||||
struct spi_slave;
|
||||
|
||||
/* Set up the jump table for use by the API */
|
||||
void jumptable_init(void);
|
||||
/**
|
||||
* jumptable_init() - Set up the jump table for use by the API
|
||||
*
|
||||
* It is called during the generic post-relocation init sequence.
|
||||
*
|
||||
* Return: 0 if OK
|
||||
*/
|
||||
int jumptable_init(void);
|
||||
|
||||
/* These are declarations of exported functions available in C code */
|
||||
unsigned long get_version(void);
|
||||
|
|
Loading…
Reference in a new issue