Commit b8521b740bdecfb18d43dda62d72cbf7e167f1d0
Committed by
Tom Rini
1 parent
67cd4a6348
Exists in
master
and in
53 other branches
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>
Showing 1 changed file with 3 additions and 6 deletions Side-by-side Diff
common/board_f.c
... | ... | @@ -851,12 +851,6 @@ |
851 | 851 | #ifdef CONFIG_ARM |
852 | 852 | timer_init, /* initialize timer */ |
853 | 853 | #endif |
854 | -#ifdef CONFIG_BOARD_POSTCLK_INIT | |
855 | - board_postclk_init, | |
856 | -#endif | |
857 | -#ifdef CONFIG_FSL_ESDHC | |
858 | - get_clocks, | |
859 | -#endif | |
860 | 854 | #ifdef CONFIG_SYS_ALLOC_DPRAM |
861 | 855 | #if !defined(CONFIG_CPM2) |
862 | 856 | dpram_init, |
... | ... | @@ -864,6 +858,9 @@ |
864 | 858 | #endif |
865 | 859 | #if defined(CONFIG_BOARD_POSTCLK_INIT) |
866 | 860 | board_postclk_init, |
861 | +#endif | |
862 | +#ifdef CONFIG_FSL_ESDHC | |
863 | + get_clocks, | |
867 | 864 | #endif |
868 | 865 | env_init, /* initialize environment */ |
869 | 866 | #if defined(CONFIG_8xx_CPUCLK_DEFAULT) |