From: Simon Glass <sjg@chromium.org>
Date: Sat, 17 Sep 2011 06:48:49 +0000 (+0000)
Subject: sandbox: Disable built-in malloc
X-Git-Tag: v2011.12-rc1~512^2~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fe34107e38c6337c90e6f072954bdf50d9e09228;p=u-boot

sandbox: Disable built-in malloc

We prefer to U-Boot's malloc but for now it is easier to use the C library's
version.

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

diff --git a/common/Makefile b/common/Makefile
index e53c125e0d..ae795e0d55 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -29,7 +29,9 @@ LIB	= $(obj)libcommon.o
 ifndef CONFIG_SPL_BUILD
 COBJS-y += main.o
 COBJS-y += command.o
+ifndef CONFIG_SANDBOX
 COBJS-y += dlmalloc.o
+endif
 COBJS-y += exports.o
 COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o
 COBJS-y += image.o