From: Vadim Bendebury <vbendeb@chromium.org>
Date: Tue, 9 Apr 2013 14:06:51 +0000 (+0000)
Subject: Do not call board_early_init_f() twice
X-Git-Tag: v2013.04-rc3~12
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=3d38910151e3d069a164190763c7b03d11f1eec4

Do not call board_early_init_f() twice

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>
---

diff --git a/common/board_f.c b/common/board_f.c
index 29b49c3ab6..769889123b 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