summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/Kconfig16
-rw-r--r--common/Makefile3
-rw-r--r--common/dummy_malloc.c26
3 files changed, 44 insertions, 1 deletions
diff --git a/common/Kconfig b/common/Kconfig
index c3449a9c2d..7d2367b0c3 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -148,6 +148,22 @@ config EXPERIMENTAL
bool
prompt "Prompt for experimental code"
+choice
+ prompt "malloc implementation"
+
+config MALLOC_DLMALLOC
+ bool "dlmalloc"
+
+config MALLOC_DUMMY
+ bool "dummy malloc"
+ depends on SHELL_NONE
+ help
+ select this option to use a dummy malloc implementation. With this
+ memory is never freed. This is suitable for well tested noninteractive
+ environments only.
+
+endchoice
+
config MODULES
depends on HAS_MODULES
depends on EXPERIMENTAL
diff --git a/common/Makefile b/common/Makefile
index aa2c2220a6..9fed2ae521 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -9,7 +9,8 @@ obj-$(CONFIG_POLLER) += poller.o
obj-$(CONFIG_BLOCK) += block.o
obj-y += memory.o
-obj-y += dlmalloc.o
+obj-$(CONFIG_MALLOC_DLMALLOC) += dlmalloc.o
+obj-$(CONFIG_MALLOC_DUMMY) += dummy_malloc.o
obj-y += clock.o
obj-y += version.o
obj-$(CONFIG_COMMAND_SUPPORT) += command.o
diff --git a/common/dummy_malloc.c b/common/dummy_malloc.c
new file mode 100644
index 0000000000..213e51d851
--- /dev/null
+++ b/common/dummy_malloc.c
@@ -0,0 +1,26 @@
+#include <common.h>
+#include <malloc.h>
+
+void *memalign(size_t alignment, size_t bytes)
+{
+ unsigned long mem = (unsigned long)sbrk(bytes + alignment);
+
+ mem = (mem + alignment) & ~(alignment - 1);
+
+ return (void *)mem;
+}
+
+void *malloc(size_t size)
+{
+ return memalign(8, size);
+}
+
+void free(void *ptr)
+{
+}
+
+void *realloc(void *ptr, size_t size)
+{
+ BUG();
+}
+