[U-Boot] [PATCH] microblaze: Do not call timer init that early

Timer needs to be converted to DM but as of now it can't be called so early because intc controller is not ready. Call it later in board_r.c. Before this patch timer_init is called twice which is wrong.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
common/board_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/board_f.c b/common/board_f.c index e943347ce3df..ccca794fc82b 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -775,7 +775,7 @@ static const init_fnc_t init_sequence_f[] = { /* get CPU and bus clocks according to the environment variable */ get_clocks, /* get CPU and bus clocks (etc.) */ #endif -#if !defined(CONFIG_M68K) +#if !defined(CONFIG_MICROBLAZE) && !defined(CONFIG_M68K) timer_init, /* initialize timer */ #endif #if defined(CONFIG_BOARD_POSTCLK_INIT)

Hi Michal,
On 11 July 2018 at 08:32, Michal Simek michal.simek@xilinx.com wrote:
Timer needs to be converted to DM but as of now it can't be called so early because intc controller is not ready. Call it later in board_r.c. Before this patch timer_init is called twice which is wrong.
Signed-off-by: Michal Simek michal.simek@xilinx.com
common/board_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Instead of this, can you change your timer_init() function to check GD_FLG_RELOC in gd->flags and decide whether to init now or later?
We want to get rid of all arch-specific #ifdefs in board_f/r.c
Regards, Simon

Hi Simon,
On 11.7.2018 22:13, Simon Glass wrote:
Hi Michal,
On 11 July 2018 at 08:32, Michal Simek michal.simek@xilinx.com wrote:
Timer needs to be converted to DM but as of now it can't be called so early because intc controller is not ready. Call it later in board_r.c. Before this patch timer_init is called twice which is wrong.
Signed-off-by: Michal Simek michal.simek@xilinx.com
common/board_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Instead of this, can you change your timer_init() function to check GD_FLG_RELOC in gd->flags and decide whether to init now or later?
We want to get rid of all arch-specific #ifdefs in board_f/r.c
Sure not a problem. v2 sent.
Thanks, Michal
participants (2)
-
Michal Simek
-
Simon Glass