]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
ARM: SPL: Only call mem_malloc_init if configured
authorTom Rini <trini@ti.com>
Mon, 13 Aug 2012 21:13:07 +0000 (14:13 -0700)
committerTom Rini <trini@ti.com>
Thu, 27 Sep 2012 16:48:39 +0000 (09:48 -0700)
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>
arch/arm/cpu/armv7/omap-common/spl.c

index 4d33f998c6305f8af99d66ec7a3049d44511d5bd..71a467e52f7068b51398e28f6e58c8988be51e24 100644 (file)
@@ -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();