| Message ID | 1489992436-24085-1-git-send-email-kever.yang@rock-chips.com |
|---|---|
| State | Accepted |
| Commit | 232cf962227c609b5788bddd08e2bf58366d9483 |
| Delegated to: | Simon Glass |
| Headers | show |
Am Montag, 20. März 2017, 14:47:16 CET schrieb Kever Yang: > Rockchip spl driver needs using spl_early_init(). > > Fixes: b3d2861e (spl: Remove overwrite of relocated malloc limit) > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> on rk3188-radxarock Tested-by: Heiko Stuebner <heiko@sntech.de> > --- > > arch/arm/mach-rockchip/rk3188-board-spl.c | 4 ++-- > arch/arm/mach-rockchip/rk3399-board-spl.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-rockchip/rk3188-board-spl.c > b/arch/arm/mach-rockchip/rk3188-board-spl.c index f93feae..117f6b8 100644 > --- a/arch/arm/mach-rockchip/rk3188-board-spl.c > +++ b/arch/arm/mach-rockchip/rk3188-board-spl.c > @@ -109,9 +109,9 @@ void board_init_f(ulong dummy) > printch('\n'); > #endif > > - ret = spl_init(); > + ret = spl_early_init(); > if (ret) { > - debug("spl_init() failed: %d\n", ret); > + debug("spl_early_init() failed: %d\n", ret); > hang(); > } > > diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c > b/arch/arm/mach-rockchip/rk3399-board-spl.c index 8ae3055..08aa0cb 100644 > --- a/arch/arm/mach-rockchip/rk3399-board-spl.c > +++ b/arch/arm/mach-rockchip/rk3399-board-spl.c > @@ -96,9 +96,9 @@ void board_init_f(ulong dummy) > /* Emmc clock generator: disable the clock multipilier */ > rk_clrreg(GRF_EMMCCORE_CON11, 0x0ff); > > - ret = spl_init(); > + ret = spl_early_init(); > if (ret) { > - debug("spl_init() failed: %d\n", ret); > + debug("spl_early_init() failed: %d\n", ret); > hang(); > }
On 20 March 2017 at 00:47, Kever Yang <kever.yang@rock-chips.com> wrote: > Rockchip spl driver needs using spl_early_init(). > > Fixes: b3d2861e (spl: Remove overwrite of relocated malloc limit) > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > --- > > arch/arm/mach-rockchip/rk3188-board-spl.c | 4 ++-- > arch/arm/mach-rockchip/rk3399-board-spl.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On 22 March 2017 at 07:06, Simon Glass <sjg@chromium.org> wrote: > On 20 March 2017 at 00:47, Kever Yang <kever.yang@rock-chips.com> wrote: >> Rockchip spl driver needs using spl_early_init(). >> >> Fixes: b3d2861e (spl: Remove overwrite of relocated malloc limit) >> Signed-off-by: Kever Yang <kever.yang@rock-chips.com> >> --- >> >> arch/arm/mach-rockchip/rk3188-board-spl.c | 4 ++-- >> arch/arm/mach-rockchip/rk3399-board-spl.c | 4 ++-- >> 2 files changed, 4 insertions(+), 4 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip, thanks!
diff --git a/arch/arm/mach-rockchip/rk3188-board-spl.c b/arch/arm/mach-rockchip/rk3188-board-spl.c index f93feae..117f6b8 100644 --- a/arch/arm/mach-rockchip/rk3188-board-spl.c +++ b/arch/arm/mach-rockchip/rk3188-board-spl.c @@ -109,9 +109,9 @@ void board_init_f(ulong dummy) printch('\n'); #endif - ret = spl_init(); + ret = spl_early_init(); if (ret) { - debug("spl_init() failed: %d\n", ret); + debug("spl_early_init() failed: %d\n", ret); hang(); } diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c b/arch/arm/mach-rockchip/rk3399-board-spl.c index 8ae3055..08aa0cb 100644 --- a/arch/arm/mach-rockchip/rk3399-board-spl.c +++ b/arch/arm/mach-rockchip/rk3399-board-spl.c @@ -96,9 +96,9 @@ void board_init_f(ulong dummy) /* Emmc clock generator: disable the clock multipilier */ rk_clrreg(GRF_EMMCCORE_CON11, 0x0ff); - ret = spl_init(); + ret = spl_early_init(); if (ret) { - debug("spl_init() failed: %d\n", ret); + debug("spl_early_init() failed: %d\n", ret); hang(); }
Rockchip spl driver needs using spl_early_init(). Fixes: b3d2861e (spl: Remove overwrite of relocated malloc limit) Signed-off-by: Kever Yang <kever.yang@rock-chips.com> --- arch/arm/mach-rockchip/rk3188-board-spl.c | 4 ++-- arch/arm/mach-rockchip/rk3399-board-spl.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)