]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Do not call board_early_init_f() twice
authorVadim Bendebury <vbendeb@chromium.org>
Tue, 9 Apr 2013 14:06:51 +0000 (14:06 +0000)
committerTom Rini <trini@ti.com>
Thu, 11 Apr 2013 19:40:23 +0000 (15:40 -0400)
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

index 29b49c3ab69b2f07865eaa037e5ae4a3f34c2b7c..769889123b48216df5f5f89d6e18b5ffcf5668f5 100644 (file)
@@ -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