aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-09-17 06:48:49 +0000
committerWolfgang Denk <wd@denx.de>2011-10-17 23:56:57 +0200
commitfe34107e38c6337c90e6f072954bdf50d9e09228 (patch)
treebc1a1ef7cdc9612f71b19f35b5a23287116d21ab
parent6d6f1236321827e2fcbb1a3b27e61f7c4c4a6814 (diff)
downloadu-boot-linaro-stable-fe34107e38c6337c90e6f072954bdf50d9e09228.tar.gz
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>
-rw-r--r--common/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile
index e53c125e0..ae795e0d5 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