diff options
| author | Simon Glass <sjg@chromium.org> | 2017-03-28 10:27:19 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-05 13:52:49 -0400 |
| commit | c252c06857b8ed73284ea526f5b1260f32ea166a (patch) | |
| tree | 67c1ae93201c5cc12363d9be38c7f0d7f29e91b9 /common/board_f.c | |
| parent | 671549e5b0f51ad015746f0dcbe05332dfe370b1 (diff) | |
| download | u-boot-c252c06857b8ed73284ea526f5b1260f32ea166a.tar.gz u-boot-c252c06857b8ed73284ea526f5b1260f32ea166a.tar.bz2 u-boot-c252c06857b8ed73284ea526f5b1260f32ea166a.zip | |
board_f: powerpc: Join the two CONFIG_8xx_CPUCLK_DEFAULT sections
We have two chunks of code which depend on this CONFIG options. There is
likely no need to keep them apart, so join them.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'common/board_f.c')
| -rw-r--r-- | common/board_f.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/common/board_f.c b/common/board_f.c index b8c0514b0d..326faef105 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -829,7 +829,13 @@ static const init_fnc_t init_sequence_f[] = { board_early_init_f, #endif /* TODO: can any of this go into arch_cpu_init()? */ -#if defined(CONFIG_PPC) && !defined(CONFIG_8xx_CPUCLK_DEFAULT) +#if defined(CONFIG_8xx_CPUCLK_DEFAULT) + /* get CPU and bus clocks according to the environment variable */ + get_clocks_866, + /* adjust sdram refresh rate according to the new clock */ + sdram_adjust_866, + init_timebase, +#elif defined(CONFIG_PPC) get_clocks, /* get CPU and bus clocks (etc.) */ #if defined(CONFIG_TQM8xxL) && !defined(CONFIG_TQM866M) \ && !defined(CONFIG_TQM885D) @@ -837,7 +843,7 @@ static const init_fnc_t init_sequence_f[] = { #endif /* TODO: can we rename this to timer_init()? */ init_timebase, -#endif +#endif /* CONFIG_8xx_CPUCLK_DEFAULT */ #if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \ defined(CONFIG_NDS32) || defined(CONFIG_SH) timer_init, /* initialize timer */ @@ -849,13 +855,6 @@ static const init_fnc_t init_sequence_f[] = { get_clocks, #endif env_init, /* initialize environment */ -#if defined(CONFIG_8xx_CPUCLK_DEFAULT) - /* get CPU and bus clocks according to the environment variable */ - get_clocks_866, - /* adjust sdram refresh rate according to the new clock */ - sdram_adjust_866, - init_timebase, -#endif init_baud_rate, /* initialze baudrate settings */ serial_init, /* serial communications setup */ console_init_f, /* stage 1 init of console */ |