From 1793e78225f619e78b1c3ee9735948869ec7d6ec Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 28 Mar 2017 10:27:23 -0600 Subject: [PATCH] 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 Reviewed-by: York Sun Reviewed-by: Stefan Roese --- common/board_f.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 0c19742214..a4b5df7835 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 */ -- 2.30.2