Skip to content
Snippets Groups Projects
Commit b8521b74 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Tom Rini
Browse files

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: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
parent 67cd4a63
No related branches found
No related tags found
No related merge requests found
...@@ -851,12 +851,6 @@ static init_fnc_t init_sequence_f[] = { ...@@ -851,12 +851,6 @@ static init_fnc_t init_sequence_f[] = {
#ifdef CONFIG_ARM #ifdef CONFIG_ARM
timer_init, /* initialize timer */ timer_init, /* initialize timer */
#endif #endif
#ifdef CONFIG_BOARD_POSTCLK_INIT
board_postclk_init,
#endif
#ifdef CONFIG_FSL_ESDHC
get_clocks,
#endif
#ifdef CONFIG_SYS_ALLOC_DPRAM #ifdef CONFIG_SYS_ALLOC_DPRAM
#if !defined(CONFIG_CPM2) #if !defined(CONFIG_CPM2)
dpram_init, dpram_init,
...@@ -864,6 +858,9 @@ static init_fnc_t init_sequence_f[] = { ...@@ -864,6 +858,9 @@ static init_fnc_t init_sequence_f[] = {
#endif #endif
#if defined(CONFIG_BOARD_POSTCLK_INIT) #if defined(CONFIG_BOARD_POSTCLK_INIT)
board_postclk_init, board_postclk_init,
#endif
#ifdef CONFIG_FSL_ESDHC
get_clocks,
#endif #endif
env_init, /* initialize environment */ env_init, /* initialize environment */
#if defined(CONFIG_8xx_CPUCLK_DEFAULT) #if defined(CONFIG_8xx_CPUCLK_DEFAULT)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment