summaryrefslogtreecommitdiff
path: root/nuttx/mm/Makefile
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-01 10:46:51 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-01 10:46:51 -0600
commitf23b744ac0c3750a0a1742b8ff7e18c63e45253c (patch)
treea9231d215cdb9bdb6cbb2932f877297f7c5f8874 /nuttx/mm/Makefile
parent83c30d32a3c84c9c7e992c8d1b29bf03e9fa8a3a (diff)
downloadpx4-nuttx-f23b744ac0c3750a0a1742b8ff7e18c63e45253c.tar.gz
px4-nuttx-f23b744ac0c3750a0a1742b8ff7e18c63e45253c.tar.bz2
px4-nuttx-f23b744ac0c3750a0a1742b8ff7e18c63e45253c.zip
Completes the implementation of sbrk() (untested)
Diffstat (limited to 'nuttx/mm/Makefile')
-rw-r--r--nuttx/mm/Makefile12
1 files changed, 3 insertions, 9 deletions
diff --git a/nuttx/mm/Makefile b/nuttx/mm/Makefile
index a62a1de93..4c5fe0e19 100644
--- a/nuttx/mm/Makefile
+++ b/nuttx/mm/Makefile
@@ -56,11 +56,9 @@ CSRCS += mm_shrinkchunk.c
CSRCS += mm_brkaddr.c mm_calloc.c mm_extend.c mm_free.c mm_mallinfo.c
CSRCS += mm_malloc.c mm_memalign.c mm_realloc.c mm_zalloc.c
-ifeq ($(CONFIG_MM_PGALLOC),y)
-ifeq ($(CONFIG_ARCH_USE_MMU),y)
+ifeq ($(CONFIG_ARCH_ADDRENV),y)
CSRCS += mm_sbrk.c
endif
-endif
# User allocator
@@ -68,11 +66,9 @@ CSRCS += umm_initialize.c umm_addregion.c umm_sem.c
CSRCS += umm_brkaddr.c umm_calloc.c umm_extend.c umm_free.c umm_mallinfo.c
CSRCS += umm_malloc.c umm_memalign.c umm_realloc.c umm_zalloc.c
-ifeq ($(CONFIG_MM_PGALLOC),y)
-ifeq ($(CONFIG_ARCH_USE_MMU),y)
+ifeq ($(CONFIG_ARCH_ADDRENV),y)
CSRCS += umm_sbrk.c
endif
-endif
# Kernel allocator
@@ -81,11 +77,9 @@ CSRCS += kmm_initialize.c kmm_addregion.c kmm_sem.c
CSRCS += kmm_brkaddr.c kmm_calloc.c kmm_extend.c kmm_free.c kmm_mallinfo.c
CSRCS += kmm_malloc.c kmm_memalign.c kmm_realloc.c kmm_zalloc.c
-ifeq ($(CONFIG_MM_PGALLOC),y)
-ifeq ($(CONFIG_ARCH_USE_MMU),y)
+ifeq ($(CONFIG_ARCH_ADDRENV),y)
CSRCS += kmm_sbrk.c
endif
-endif
ifeq ($(CONFIG_DEBUG),y)
CSRCS += kmm_heapmember.c