]> git.sur5r.net Git - u-boot/commitdiff
powerpc: freescale: Unify the two get_clocks() calls
authorSimon Glass <sjg@chromium.org>
Tue, 28 Mar 2017 16:27:26 +0000 (10:27 -0600)
committerTom Rini <trini@konsulko.com>
Wed, 5 Apr 2017 17:55:05 +0000 (13:55 -0400)
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>
common/board_f.c

index f64cfc41f8982779c2af338e4326a394193ef6e7..b53f1b663aa22a6eb83d997e2bab005510e8c10a 100644 (file)
@@ -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 */