git.openpandora.org
/
pandora-u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
spl: do not repeat timer init on i.MX6
[pandora-u-boot.git]
/
common
/
spl
/
spl.c
diff --git
a/common/spl/spl.c
b/common/spl/spl.c
index
d245cfc
..
8b219ba
100644
(file)
--- a/
common/spl/spl.c
+++ b/
common/spl/spl.c
@@
-379,7
+379,7
@@
void board_init_r(gd_t *dummy1, ulong dummy2)
if (spl_init())
hang();
}
-#if
ndef CONFIG_PPC
+#if
!defined(CONFIG_PPC) && !defined(CONFIG_ARCH_MX6)
/*
* timer_init() does not exist on PPC systems. The timer is initialized
* and enabled (decrementer) in interrupt_init() here.