From: Anatolij Gustschin <agust@denx.de>
Date: Mon, 28 Aug 2017 15:46:33 +0000 (+0200)
Subject: spl: do not repeat timer init on i.MX6
X-Git-Tag: v2017.09-rc4~39^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f9d42d821c49e0a12c77c100857b914717b9bc0a;p=oweals%2Fu-boot.git

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>
---

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.