spl_init on some boards is called after stack and heap relocation, on
some platforms spl_relocate_stack_gd is called to handle setting the
limit to its value CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN when simple
SPL malloc is enabled during relocation. spl_init should then not
re-assign the old pre-relocation limit when this is defined.
Signed-off-by: Andrew F. Davis <a...@ti.com>
---
common/spl/spl.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 462c3a2b97..abff85a725 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -187,7 +187,9 @@ int spl_init(void)
#ifdef CONFIG_MALLOC_F_ADDR
gd->malloc_base = CONFIG_MALLOC_F_ADDR;
#endif
+#ifndef CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN
gd->malloc_limit = CONFIG_SYS_MALLOC_F_LEN;
+#endif
gd->malloc_ptr = 0;
#endif
if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) {
--
2.11.0
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
