summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-12-08 17:31:40 -0800
committerBin Meng <bmeng.cn@gmail.com>2015-12-09 17:44:49 +0800
commit2317cf0970318a7f992acf968540dfcd6ff90f7b (patch)
tree3d5f4dad9b0477c35ff7a3ad8b27d376d96c7a1c /common
parent4932443d260d23c882e48eefcc66a83dfca7ee5a (diff)
downloadblackbird-obmc-uboot-2317cf0970318a7f992acf968540dfcd6ff90f7b.tar.gz
blackbird-obmc-uboot-2317cf0970318a7f992acf968540dfcd6ff90f7b.zip
common: Remove timer_init() call for x86
With driver model timer support, there should not be an explict call to timer_init(). Remove this call for x86. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/board_f.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_f.c b/common/board_f.c
index eac7c5e4c5..b40735438b 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -825,7 +825,7 @@ static init_fnc_t init_sequence_f[] = {
/* TODO: can we rename this to timer_init()? */
init_timebase,
#endif
-#if defined(CONFIG_X86) || defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \
+#if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \
defined(CONFIG_BLACKFIN) || defined(CONFIG_NDS32) || \
defined(CONFIG_SPARC)
timer_init, /* initialize timer */
OpenPOWER on IntegriCloud