Patchwork [U-Boot] common: board_f: Do not call board_postclk_init twice

login
register
mail settings
Submitter Masahiro Yamada
Date May 22, 2013, 7:08 a.m.
Message ID <1369206489-13849-1-git-send-email-yamada.m@jp.panasonic.com>
Download mbox | patch
Permalink /patch/245562/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Masahiro Yamada - May 22, 2013, 7:08 a.m.
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 |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
Tom Rini - June 5, 2013, 12:34 p.m.
On Tue, May 21, 2013 at 09:08:09PM -0000, Masahiro Yamada wrote:

> 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>

Applied to u-boot/master, thanks!

Patch

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 */