[2/2] rockchip: Explicitely set CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN

Message ID 1448176864-6878-3-git-send-email-sjoerd.simons@collabora.co.uk
State Accepted
Commit 00ea76e8004e8582798123f3698f91b32514810f
Headers show

Commit Message

Sjoerd Simons Nov. 22, 2015, 7:21 a.m.
Now that u-boot relocates the malloc area in SPL to SDRAM, with the
malloc area sitting below the SPL_STACK_R_ADDR the
SPL_STACK_R_MALLOC_SIMPLE_LEN needs to be set explicitely for
rockchip as its SPL_STACK_R_ADDR (512kb) is smaller then
STACK_R_MALLOC_SIMPLE_LEN (1Mb).

Using the same value as SYS_MALLOC_F_LEN (8kb) is enough to load u-boot
from SD card.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>


---

 configs/chromebook_jerry_defconfig | 1 +
 configs/firefly-rk3288_defconfig   | 1 +
 2 files changed, 2 insertions(+)

-- 
2.6.2

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Comments

Sjoerd Simons Nov. 23, 2015, 9:50 a.m. | #1
On Sun, 2015-11-22 at 09:11 -0700, Simon Glass wrote:
> On 22 November 2015 at 00:21, Sjoerd Simons
> <sjoerd.simons@collabora.co.uk> wrote:
> > Now that u-boot relocates the malloc area in SPL to SDRAM, with the
> > malloc area sitting below the SPL_STACK_R_ADDR the
> > SPL_STACK_R_MALLOC_SIMPLE_LEN needs to be set explicitely for
> > rockchip as its SPL_STACK_R_ADDR (512kb) is smaller then
> > STACK_R_MALLOC_SIMPLE_LEN (1Mb).
> > 
> > Using the same value as SYS_MALLOC_F_LEN (8kb) is enough to load u-
> > boot
> > from SD card.
> > 
> > Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
> > 
> > ---
> > 
> >  configs/chromebook_jerry_defconfig | 1 +
> >  configs/firefly-rk3288_defconfig   | 1 +
> >  2 files changed, 2 insertions(+)
> 
> Explicitly (I can fix when applying if you like)
> 
> Acked-by: Simon Glass <sjg@chromium.org>

Yes please, saves doing another round :) Thanks!

Patch

diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index e07a6e4..7424e09 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -4,6 +4,7 @@  CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK3288=y
 CONFIG_TARGET_CHROMEBOOK_JERRY=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-jerry"
 CONFIG_SPL_STACK_R=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index 6f42377..09e48b9 100644
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -4,6 +4,7 @@  CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK3288=y
 CONFIG_TARGET_FIREFLY_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-firefly"
 CONFIG_SPL_STACK_R=y
 # CONFIG_CMD_IMLS is not set