rockchip: rk3188: Fix back to BROM boot
Subsystems (3)
PATCH 1/1 rockchip: rk3188: Fix back to BROM boot
Move the setting for noc remap out of SPL code. Changing noc remap inside SPL results in breaking back to BROM boot.
Fixes commit c14fe2a8e192 ("rockchip: rk3188: Move SoC one time setting into arch_cpu_init()").
--- arch/arm/mach-rockchip/rk3188/rk3188.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
arch/arm/mach-rockchip/rk3188/rk3188.c +19 -2
@@ -73,15 +73,32 @@ int arch_cpu_init(void)BYPASSSEL_MASK |BYPASSDMEN_MASK , 1 << BYPASSSEL_SHIFT | 1 << BYPASSDMEN_SHIFT);#endif + return 0; +} +#endif + +__weak int rk3188_board_late_init (void ) +{ +return 0 ; +} + +int rk_board_late_init (void ) +{ +struct rk3188_grf *grf; + + grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); +if (IS_ERR (grf)) { +pr_err ("grf syscon returned %ld\n" ,PTR_ERR (grf)); +return 0 ; + }/* enable noc remap to mimic legacy loaders */ rk_clrsetreg (&grf->soc_con0,NOC_REMAP_MASK <<NOC_REMAP_SHIFT ,NOC_REMAP_MASK <<NOC_REMAP_SHIFT ); - return 0; +return rk3188_board_late_init (); } -#endif #ifdef CONFIG_SPL_BUILD static int setup_led (void )
Signature · 1 line
2.17.1
PATCH 1/1 rockchip: rk3188: Fix back to BROM boot
Quoted 8 lines · Alexander Kochetkov
Move the setting for noc remap out of SPL code. Changing noc remap inside SPL results in breaking back to BROM boot.
Fixes commit
c14fe2a8e192("rockchip: rk3188: Move SoC one time setting intoarch_cpu_init()").Signed-off-by Alexander Kochetkov <[email protected]>
Thanks,
- Kever
Quoted 43 lines
--- arch/arm/mach-rockchip/rk3188/rk3188.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)arch/arm/mach-rockchip/rk3188/rk3188.c +19
-2@@ -73,15 +73,32 @@ int arch_cpu_init(void)BYPASSSEL_MASK |BYPASSDMEN_MASK , 1 << BYPASSSEL_SHIFT | 1 << BYPASSDMEN_SHIFT);#endif + return 0; +} +#endif + +__weak int rk3188_board_late_init (void ) +{ +return 0 ; +} + +int rk_board_late_init (void ) +{ +struct rk3188_grf *grf; + + grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); +if (IS_ERR (grf)) { +pr_err ("grf syscon returned %ld\n" ,PTR_ERR (grf)); +return 0 ; + }/* enable noc remap to mimic legacy loaders */ rk_clrsetreg (&grf->soc_con0,NOC_REMAP_MASK <<NOC_REMAP_SHIFT ,NOC_REMAP_MASK <<NOC_REMAP_SHIFT ); - return 0; +return rk3188_board_late_init (); } -#endif #ifdef CONFIG_SPL_BUILD static int setup_led (void )
PATCH 1/1 rockchip: rk3188: Fix back to BROM boot
In reply to Alexander KochetkovQuoted 8 lines · Alexander Kochetkov
Move the setting for noc remap out of SPL code. Changing noc remap inside SPL results in breaking back to BROM boot.
Fixes commit
c14fe2a8e192("rockchip: rk3188: Move SoC one time setting intoarch_cpu_init()").Signed-off-by Alexander Kochetkov <[email protected]>
Applied to u-boot-rockchip master branch.
Quoted 43 lines
--- arch/arm/mach-rockchip/rk3188/rk3188.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)arch/arm/mach-rockchip/rk3188/rk3188.c +19
-2@@ -73,15 +73,32 @@ int arch_cpu_init(void)BYPASSSEL_MASK |BYPASSDMEN_MASK , 1 << BYPASSSEL_SHIFT | 1 << BYPASSDMEN_SHIFT);#endif + return 0; +} +#endif + +__weak int rk3188_board_late_init (void ) +{ +return 0 ; +} + +int rk_board_late_init (void ) +{ +struct rk3188_grf *grf; + + grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); +if (IS_ERR (grf)) { +pr_err ("grf syscon returned %ld\n" ,PTR_ERR (grf)); +return 0 ; + }/* enable noc remap to mimic legacy loaders */ rk_clrsetreg (&grf->soc_con0,NOC_REMAP_MASK <<NOC_REMAP_SHIFT ,NOC_REMAP_MASK <<NOC_REMAP_SHIFT ); - return 0; +return rk3188_board_late_init (); } -#endif #ifdef CONFIG_SPL_BUILD static int setup_led (void )