]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
board_f: powerpc: Unified get_clocks() portion of init sequence
authorSimon Glass <sjg@chromium.org>
Tue, 28 Mar 2017 16:27:23 +0000 (10:27 -0600)
committerTom Rini <trini@konsulko.com>
Wed, 5 Apr 2017 17:53:02 +0000 (13:53 -0400)
Now that both branches of the #if do the same thing, we can unify them.

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 0c19742214e4aa38ee9c2cc27cb8bc93edad1241..a4b5df7835cf75f2f95a84ccc0a99722ed38bfb5 100644 (file)
@@ -828,16 +828,12 @@ static const init_fnc_t init_sequence_f[] = {
 #if defined(CONFIG_BOARD_EARLY_INIT_F)
        board_early_init_f,
 #endif
-       /* TODO: can any of this go into arch_cpu_init()? */
-#if defined(CONFIG_8xx_CPUCLK_DEFAULT)
+#ifdef CONFIG_PPC
        /* get CPU and bus clocks according to the environment variable */
-       get_clocks,
-       init_timebase,
-#elif defined(CONFIG_PPC)
        get_clocks,             /* get CPU and bus clocks (etc.) */
        /* TODO: can we rename this to timer_init()? */
        init_timebase,
-#endif /* CONFIG_8xx_CPUCLK_DEFAULT */
+#endif
 #if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \
                defined(CONFIG_NDS32) || defined(CONFIG_SH)
        timer_init,             /* initialize timer */