mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-28 23:23:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

board_f: powerpc: Join the two CONFIG_8xx_CPUCLK_DEFAULT sections

Browse Source 
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>
This commit is contained in:
Simon Glass 2017-03-28 10:27:19 -06:00 committed by Tom Rini
parent 671549e5b0
commit c252c06857
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/board_f.c
View File

@ -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 */