From: Tom Rini <trini@ti.com>
Date: Mon, 13 Aug 2012 21:13:07 +0000 (-0700)
Subject: ARM: SPL: Only call mem_malloc_init if configured
X-Git-Tag: v2012.10-rc2~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24dafad5c42018ea11c0d12f747a7eb337229f5a;p=platform%2Fkernel%2Fu-boot.git

ARM: SPL: Only call mem_malloc_init if configured

We can only attempt to setup a malloc pool if
CONFIG_SYS_SPL_MALLOC_START is defined, and not all boards require it.
Make the call depend on the define.

Signed-off-by: Tom Rini <trini@ti.com>
---

diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 4d33f99..71a467e 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -149,8 +149,10 @@ void board_init_r(gd_t *id, ulong dummy)
 	u32 boot_device;
 	debug(">>spl:board_init_r()\n");
 
+#ifdef CONFIG_SYS_SPL_MALLOC_START
 	mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
 			CONFIG_SYS_SPL_MALLOC_SIZE);
+#endif
 
 #ifdef CONFIG_SPL_BOARD_INIT
 	spl_board_init();