Message ID | 20200420073146.29787-3-ovpanait@gmail.com |
---|---|
State | Accepted |
Commit | 1a4c077b751475cc3a6e77d2216990feccc068dd |
Headers | show |
Series | [v2,1/3] common/board_r: arm: Merge initr_enable_interrupts into interrupts_init | expand |
On Mon, Apr 20, 2020 at 10:31:46AM +0300, Ovidiu Panait wrote: > Drop initr_bedbug wrapper and call bedbug_init directly during the init > sequence. > > Signed-off-by: Ovidiu Panait <ovpanait at gmail.com> > Reviewed-by: Simon Glass <sjg at chromium.org> Applied to u-boot/master, thanks!
diff --git a/common/board_r.c b/common/board_r.c index bdb0389e31..d9015cd057 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -637,15 +637,6 @@ int initr_mem(void) } #endif -#ifdef CONFIG_CMD_BEDBUG -static int initr_bedbug(void) -{ - bedbug_init(); - - return 0; -} -#endif - static int run_main_loop(void) { #ifdef CONFIG_SANDBOX @@ -848,7 +839,7 @@ static init_fnc_t init_sequence_r[] = { #endif #ifdef CONFIG_CMD_BEDBUG INIT_FUNC_WATCHDOG_RESET - initr_bedbug, + bedbug_init, #endif #if defined(CONFIG_PRAM) initr_mem,