| Message ID | f56c8eab96655c00f3cf65ee061ded78cb17ccf5.1573836495.git.tommyhebb@gmail.com |
|---|---|
| State | Accepted |
| Commit | 220697a3174c080dd45c0435f5c9e78fb2de8299 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | [U-Boot,v2,1/3] rockchip: fix ordering of DRAM init | expand |
On 2019/11/16 上午12:48, Thomas Hebb wrote: > b7abef2ecbcc ("rockchip: rk3399: Migrate to use common spl board file") > removed SoC-specific code for RK3399's SPL and in the process reordered > the DRAM initialization before rockchip_stimer_init(), which as far as I > can tell causes the RK3399 to lock up completely. > > Fix this issue in the common code by putting the DRAM init back after > timer init. I have only tested this on the RK3399, but it wouldn't make > any sense for the timer init to require DRAM be set up on any system. > > Signed-off-by: Thomas Hebb <tommyhebb@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/mach-rockchip/spl.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c > index 92102b39e7..5570bb1339 100644 > --- a/arch/arm/mach-rockchip/spl.c > +++ b/arch/arm/mach-rockchip/spl.c > @@ -128,6 +128,13 @@ void board_init_f(ulong dummy) > hang(); > } > arch_cpu_init(); > +#if !defined(CONFIG_ROCKCHIP_RK3188) > + rockchip_stimer_init(); > +#endif > +#ifdef CONFIG_SYS_ARCH_TIMER > + /* Init ARM arch timer in arch/arm/cpu/armv7/arch_timer.c */ > + timer_init(); > +#endif > #if !defined(CONFIG_SUPPORT_TPL) || defined(CONFIG_SPL_OS_BOOT) > debug("\nspl:init dram\n"); > ret = uclass_get_device(UCLASS_RAM, 0, &dev); > @@ -135,13 +142,6 @@ void board_init_f(ulong dummy) > printf("DRAM init failed: %d\n", ret); > return; > } > -#endif > -#if !defined(CONFIG_ROCKCHIP_RK3188) > - rockchip_stimer_init(); > -#endif > -#ifdef CONFIG_SYS_ARCH_TIMER > - /* Init ARM arch timer in arch/arm/cpu/armv7/arch_timer.c */ > - timer_init(); > #endif > preloader_console_init(); > }
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index 92102b39e7..5570bb1339 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -128,6 +128,13 @@ void board_init_f(ulong dummy) hang(); } arch_cpu_init(); +#if !defined(CONFIG_ROCKCHIP_RK3188) + rockchip_stimer_init(); +#endif +#ifdef CONFIG_SYS_ARCH_TIMER + /* Init ARM arch timer in arch/arm/cpu/armv7/arch_timer.c */ + timer_init(); +#endif #if !defined(CONFIG_SUPPORT_TPL) || defined(CONFIG_SPL_OS_BOOT) debug("\nspl:init dram\n"); ret = uclass_get_device(UCLASS_RAM, 0, &dev); @@ -135,13 +142,6 @@ void board_init_f(ulong dummy) printf("DRAM init failed: %d\n", ret); return; } -#endif -#if !defined(CONFIG_ROCKCHIP_RK3188) - rockchip_stimer_init(); -#endif -#ifdef CONFIG_SYS_ARCH_TIMER - /* Init ARM arch timer in arch/arm/cpu/armv7/arch_timer.c */ - timer_init(); #endif preloader_console_init(); }
b7abef2ecbcc ("rockchip: rk3399: Migrate to use common spl board file") removed SoC-specific code for RK3399's SPL and in the process reordered the DRAM initialization before rockchip_stimer_init(), which as far as I can tell causes the RK3399 to lock up completely. Fix this issue in the common code by putting the DRAM init back after timer init. I have only tested this on the RK3399, but it wouldn't make any sense for the timer init to require DRAM be set up on any system. Signed-off-by: Thomas Hebb <tommyhebb@gmail.com> --- arch/arm/mach-rockchip/spl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)