diff options
| author | Simon Glass <sjg@chromium.org> | 2017-03-28 10:27:26 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-05 13:55:05 -0400 |
| commit | 727e94a4ac9662d2e9e7ae8b4136013d6cd0832b (patch) | |
| tree | 330af82d5781d578956817a6ca448bddc3110474 /common | |
| parent | 11b33e64dd79df122f91199ce20841e48d59d877 (diff) | |
powerpc: freescale: Unify the two get_clocks() calls
Combine the conditions so this appears in the init list only once.
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')
| -rw-r--r-- | common/board_f.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/common/board_f.c b/common/board_f.c index f64cfc41f8..b53f1b663a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -828,7 +828,7 @@ static const init_fnc_t init_sequence_f[] = { #if defined(CONFIG_BOARD_EARLY_INIT_F) board_early_init_f, #endif -#ifdef CONFIG_PPC +#if defined(CONFIG_PPC) || defined(CONFIG_SYS_FSL_CLK) || defined(CONFIG_M68K) /* get CPU and bus clocks according to the environment variable */ get_clocks, /* get CPU and bus clocks (etc.) */ #endif @@ -836,9 +836,6 @@ static const init_fnc_t init_sequence_f[] = { #if defined(CONFIG_BOARD_POSTCLK_INIT) board_postclk_init, #endif -#if defined(CONFIG_SYS_FSL_CLK) || defined(CONFIG_M68K) - get_clocks, -#endif env_init, /* initialize environment */ init_baud_rate, /* initialze baudrate settings */ serial_init, /* serial communications setup */ |