From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Tue, 28 Mar 2017 10:27:26 -0600 Subject: [U-Boot] [PATCH 11/17] powerpc: freescale: Unify the two get_clocks() calls In-Reply-To: <20170328162733.20905-1-sjg@chromium.org> References: <20170328162733.20905-1-sjg@chromium.org> Message-ID: <20170328162733.20905-11-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Combine the conditions so this appears in the init list only once. Signed-off-by: Simon Glass --- common/board_f.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 9ba3163e0f..cbd9f67709 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -843,7 +843,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 @@ -851,9 +851,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 */ -- 2.12.2.564.g063fe858b8-goog