summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorPeng Fan <Peng.Fan@freescale.com>2015-10-30 17:30:02 +0800
committerTom Rini <trini@konsulko.com>2015-11-12 18:13:19 -0500
commit7664846bbbccee0d5fa6b5f9d4a8ad0f07ff29d7 (patch)
tree762798d8218a64c5aff27161eb60060a0b0d9b62 /common
parent755324c432f62306487786f89efce96398291a03 (diff)
downloadu-boot-imx-7664846bbbccee0d5fa6b5f9d4a8ad0f07ff29d7.zip
u-boot-imx-7664846bbbccee0d5fa6b5f9d4a8ad0f07ff29d7.tar.gz
u-boot-imx-7664846bbbccee0d5fa6b5f9d4a8ad0f07ff29d7.tar.bz2
common: Simplify get_clocks() #ifdef
get_clocks is wrapped by CONFIG_FSL_CLK and CONFIG_M68K in seperate piece code. They can be merged into one snippet. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Tom Rini <trini@konsulko.com> Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Cc: Alexey Brodkin <abrodkin@synopsys.com> Cc: "angelo@sysam.it" <angelo@sysam.it> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Cc: Stephen Warren <swarren@nvidia.com> Cc: "Andreas Bießmann" <andreas.devel@googlemail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Angelo Dureghello <angelo@sysam.it>
Diffstat (limited to 'common')
-rw-r--r--common/board_f.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/common/board_f.c b/common/board_f.c
index 725eb18..ed51305 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -808,10 +808,7 @@ static init_fnc_t init_sequence_f[] = {
#if defined(CONFIG_BOARD_POSTCLK_INIT)
board_postclk_init,
#endif
-#ifdef CONFIG_SYS_FSL_CLK
- get_clocks,
-#endif
-#ifdef CONFIG_M68K
+#if defined(CONFIG_SYS_FSL_CLK) || defined(CONFIG_M68K)
get_clocks,
#endif
env_init, /* initialize environment */