summaryrefslogtreecommitdiff
path: root/nuttx/mm/Makefile
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-03-09 21:12:20 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-03-09 21:12:20 +0000
commitdda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5 (patch)
tree0af32db840a032a50312791977b7d129def1d5b3 /nuttx/mm/Makefile
parent2ac33dcffabd9422659c3b013ed8624c09ae90e4 (diff)
downloadnuttx-dda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5.tar.gz
nuttx-dda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5.tar.bz2
nuttx-dda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5.zip
More changes for a kernel-mode allocator (more to be done)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5724 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/mm/Makefile')
-rw-r--r--nuttx/mm/Makefile13
1 files changed, 10 insertions, 3 deletions
diff --git a/nuttx/mm/Makefile b/nuttx/mm/Makefile
index 12a237bb7..baae6b4df 100644
--- a/nuttx/mm/Makefile
+++ b/nuttx/mm/Makefile
@@ -35,17 +35,24 @@
-include $(TOPDIR)/Make.defs
+# Core allocator logic
+
ASRCS =
CSRCS = mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c
CSRCS += mm_shrinkchunk.c mm_malloc.c mm_zalloc.c mm_calloc.c mm_realloc.c
CSRCS += mm_memalign.c mm_free.c mm_mallinfo.c
-CSRCS += umm_initialize.c umm_addregion.c umm_semaphore.c
+# Allocator instances
+CSRCS += mm_user.c
+ifeq ($(CONFIG_NUTTX_KERNEL),y)
+CSRCS += mm_kerneluser.c
ifeq ($(CONFIG_NUTTX_KERNEL),y)
-CSRCS += kmm_initialize.c kmm_addregion.c kmm_semaphore.c
-CSRCS += kmm_kmalloc.c kmm_kzalloc.c kmm_krealloc.c kmm_kfree.c
+CSRCS += mm_kernel.c
endif
+endif
+
+# An optional granule allocator
ifeq ($(CONFIG_GRAN),y)
CSRCS += mm_graninit.c mm_granalloc.c mm_granfree.c mm_grancritical.c