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 --- common/board_r.c | 8 +------- common/exports.c | 4 +++- include/exports.h | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/common/board_r.c b/common/board_r.c index 1cb9f13dc2..cb9b2424d1 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -481,12 +481,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) { @@ -748,7 +742,7 @@ static init_fnc_t init_sequence_r[] = { pci_init, #endif stdio_add_devices, - initr_jumptable, + jumptable_init, #ifdef CONFIG_API initr_api, #endif diff --git a/common/exports.c b/common/exports.c index 6253b55694..4578f07021 100644 --- a/common/exports.c +++ b/common/exports.c @@ -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; } diff --git a/include/exports.h b/include/exports.h index b300554091..be13c771a4 100644 --- a/include/exports.h +++ b/include/exports.h @@ -16,7 +16,7 @@ struct cmd_tbl; struct spi_slave;
/* Set up the jump table for use by the API */ -void jumptable_init(void); +int jumptable_init(void);
/* These are declarations of exported functions available in C code */ unsigned long get_version(void);