summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-05-21 21:08:09 +0000
committerTom Rini <trini@ti.com>2013-06-04 16:06:32 -0400
commitb8521b740bdecfb18d43dda62d72cbf7e167f1d0 (patch)
treeeb1c095a89c4224da81661e4c10534ab8e5530d6
parent67cd4a63487400317f1586b130bc2475767a5315 (diff)
downloadu-boot-imx-b8521b740bdecfb18d43dda62d72cbf7e167f1d0.zip
u-boot-imx-b8521b740bdecfb18d43dda62d72cbf7e167f1d0.tar.gz
u-boot-imx-b8521b740bdecfb18d43dda62d72cbf7e167f1d0.tar.bz2
common: board_f: Do not call board_postclk_init twice
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>
-rw-r--r--common/board_f.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/common/board_f.c b/common/board_f.c
index 81edbdf..9fa7363 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -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,
@@ -865,6 +859,9 @@ static init_fnc_t init_sequence_f[] = {
#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)
/* get CPU and bus clocks according to the environment variable */