From: Simon Glass <sjg@chromium.org>
Date: Tue, 28 Mar 2017 16:27:26 +0000 (-0600)
Subject: powerpc: freescale: Unify the two get_clocks() calls
X-Git-Tag: v2017.05-rc2~106
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=727e94a4ac9662d2e9e7ae8b4136013d6cd0832b;p=u-boot

powerpc: freescale: Unify the two get_clocks() calls

Combine the conditions so this appears in the init list only once.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: York Sun <york.sun@nxp.com>
Reviewed-by: Stefan Roese <sr@denx.de>
---

diff --git a/common/board_f.c b/common/board_f.c
index f64cfc41f8..b53f1b663a 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -828,16 +828,13 @@ static const init_fnc_t init_sequence_f[] = {
 #if defined(CONFIG_BOARD_EARLY_INIT_F)
 	board_early_init_f,
 #endif
-#ifdef CONFIG_PPC
+#if defined(CONFIG_PPC) || defined(CONFIG_SYS_FSL_CLK) || defined(CONFIG_M68K)
 	/* get CPU and bus clocks according to the environment variable */
 	get_clocks,		/* get CPU and bus clocks (etc.) */
 #endif
 	timer_init,		/* initialize timer */
 #if defined(CONFIG_BOARD_POSTCLK_INIT)
 	board_postclk_init,
-#endif
-#if defined(CONFIG_SYS_FSL_CLK) || defined(CONFIG_M68K)
-	get_clocks,
 #endif
 	env_init,		/* initialize environment */
 	init_baud_rate,		/* initialze baudrate settings */