From: Simon Glass <sjg@chromium.org>
Date: Tue, 11 Nov 2014 00:16:45 +0000 (-0700)
Subject: dm: spl: Make simple malloc() available when enabled
X-Git-Tag: v2015.01-rc2~4^2~20
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fb4f5e7c911745de1a6c7d0051abca9d2a4cd920;p=u-boot

dm: spl: Make simple malloc() available when enabled

Set up the simple malloc() implementation when requested, in preference to
the full malloc().

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/spl/spl.c b/common/spl/spl.c
index f01a21c83a..6b90ad8841 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -139,9 +139,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 	u32 boot_device;
 	debug(">>spl:board_init_r()\n");
 
-#ifdef CONFIG_SYS_SPL_MALLOC_START
+#if defined(CONFIG_SYS_SPL_MALLOC_START)
 	mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
 			CONFIG_SYS_SPL_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
+#elif defined(CONFIG_SYS_MALLOC_F_LEN)
+	gd->malloc_limit = gd->malloc_base + CONFIG_SYS_MALLOC_F_LEN;
+	gd->malloc_ptr = 0;
 #endif
 
 #ifndef CONFIG_PPC
@@ -238,6 +242,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 	default:
 		debug("Unsupported OS image.. Jumping nevertheless..\n");
 	}
+#if defined(CONFIG_SYS_MALLOC_F_LEN) && !defined(CONFIG_SYS_SPL_MALLOC_SIZE)
+	debug("SPL malloc() used %#lx bytes (%ld KB)\n", gd->malloc_ptr,
+	      gd->malloc_ptr / 1024);
+#endif
+
 	jump_to_image_no_args(&spl_image);
 }