Patchwork [U-Boot] Do not call board_early_init_f() twice

login
register
mail settings
Submitter Vadim Bendebury
Date April 10, 2013, 12:06 a.m.
Message ID <1365552411-11231-1-git-send-email-vbendeb@chromium.org>
Download mbox | patch
Permalink /patch/235272/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Vadim Bendebury - April 10, 2013, 12:06 a.m.
Apparently due to a missed rebase conflict resolution
board_early_init_f() is included twice in the list of initialization
functions.

Leave only the first occurrence.
   . built and boot an Exynos 5250 target

Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
---
 common/board_f.c | 3 ---
 1 file changed, 3 deletions(-)
Tom Rini - April 11, 2013, 7:43 p.m.
On Tue, Apr 09, 2013 at 05:06:51PM -0700, Vadim Bendebury wrote:

> Apparently due to a missed rebase conflict resolution
> board_early_init_f() is included twice in the list of initialization
> functions.
> 
> Leave only the first occurrence.
>    . built and boot an Exynos 5250 target
> 
> Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>

Applied to u-boot/master, thanks!

Patch

diff --git a/common/board_f.c b/common/board_f.c
index 29b49c3..7698891 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -788,9 +788,6 @@  static init_fnc_t init_sequence_f[] = {
 	/* TODO: can we rename this to timer_init()? */
 	init_timebase,
 #endif
-#if defined(CONFIG_BOARD_EARLY_INIT_F)
-	board_early_init_f,
-#endif
 #ifdef CONFIG_ARM
 	timer_init,		/* initialize timer */
 #endif