aboutsummaryrefslogtreecommitdiff
path: root/common/board_f.c
diff options
context:
space:
mode:
authorSimon Glass2017-03-28 10:27:23 -0600
committerTom Rini2017-04-05 13:53:02 -0400
commit1793e78225f619e78b1c3ee9735948869ec7d6ec (patch)
tree463588dbfa0987bbdc82a1b7867f88e4d2738c7f /common/board_f.c
parent75efc34bfa80dff27f98d8ce13237fba4c54ea8f (diff)
board_f: powerpc: Unified get_clocks() portion of init sequence
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>
Diffstat (limited to 'common/board_f.c')
-rw-r--r--common/board_f.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/common/board_f.c b/common/board_f.c
index 0c19742214e..a4b5df7835c 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -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 */