| Message ID | 1503935193-28474-2-git-send-email-agust@denx.de |
|---|---|
| State | Accepted |
| Commit | f9d42d821c49e0a12c77c100857b914717b9bc0a |
| Headers | show |
| Series | [U-Boot,1/2] imx: timer: don't clear the GPT control register multiple times | expand |
On 28/08/2017 17:46, Anatolij Gustschin wrote: > 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> > --- > common/spl/spl.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/common/spl/spl.c b/common/spl/spl.c > index d245cfc..8b219ba 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. > Acked-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 28/08/2017 17:46, Anatolij Gustschin wrote: > 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> > --- > common/spl/spl.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/common/spl/spl.c b/common/spl/spl.c > index d245cfc..8b219ba 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. > Applied to u-boot-imx, -master, thanks ! Best regards, Stefano Babic
diff --git a/common/spl/spl.c b/common/spl/spl.c index d245cfc..8b219ba 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.
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> --- common/spl/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)