]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
common: board_f: Do not call board_postclk_init twice
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Tue, 21 May 2013 21:08:09 +0000 (21:08 +0000)
committerTom Rini <trini@ti.com>
Tue, 4 Jun 2013 20:06:32 +0000 (16:06 -0400)
The generic-board board_init_f function called board_postclk_init twice.

The first one came from arch/arm/lib/board.c, while the second one
from arch/powerpc/lib/board.c.

This commit deletes the first occurrence.
In addition, the second get_clocks call is moved after
board_postclk_init in order to keep the function call order
both for ARM and PowerPC.
ARM board calles get_clocks function after board_postclk_init.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
common/board_f.c

index 81edbdf8e45b5899cab64d798d4c9f510afa3809..9fa7363afda758a1d98d86698bd1e4aed09ed235 100644 (file)
@@ -851,12 +851,6 @@ static init_fnc_t init_sequence_f[] = {
 #ifdef CONFIG_ARM
        timer_init,             /* initialize timer */
 #endif
-#ifdef CONFIG_BOARD_POSTCLK_INIT
-       board_postclk_init,
-#endif
-#ifdef CONFIG_FSL_ESDHC
-       get_clocks,
-#endif
 #ifdef CONFIG_SYS_ALLOC_DPRAM
 #if !defined(CONFIG_CPM2)
        dpram_init,
@@ -864,6 +858,9 @@ static init_fnc_t init_sequence_f[] = {
 #endif
 #if defined(CONFIG_BOARD_POSTCLK_INIT)
        board_postclk_init,
+#endif
+#ifdef CONFIG_FSL_ESDHC
+       get_clocks,
 #endif
        env_init,               /* initialize environment */
 #if defined(CONFIG_8xx_CPUCLK_DEFAULT)