diff options
| author | Anatolij Gustschin <agust@denx.de> | 2017-08-28 17:46:33 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2017-08-29 09:48:37 +0200 |
| commit | f9d42d821c49e0a12c77c100857b914717b9bc0a (patch) | |
| tree | 91258011c9de7d9f4d7306ef6e72f51589a0bbb7 /common | |
| parent | ae64226dbec2a50a2d88027018c9bd25b20c4ae0 (diff) | |
| download | u-boot-f9d42d821c49e0a12c77c100857b914717b9bc0a.tar.gz | |
spl: do not repeat timer init on i.MX6
The GPT timer was already initialised in board_init_f() as
it is needed in dram init. Do not repeat timer init in
board_init_r().
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index d245cfc0d1..8b219ba690 100644 --- 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(); } -#ifndef 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. |