Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL

12 files changed, 25 insertions, 18 deletions

diff --git a/nuttx/mm/Kconfig b/nuttx/mm/Kconfig
index 977baeb86..3812971de 100644
--- a/nuttx/mm/Kconfig
+++ b/nuttx/mm/Kconfig
@@ -18,7 +18,7 @@ config MM_MULTIHEAP
 config MM_KERNEL_HEAP
 	bool "Support a protected, kernel heap"
 	default y
-	depends on NUTTX_KERNEL && MM_MULTIHEAP
+	depends on (BUILD_PROTECTED || BUILD_KERNEL) && MM_MULTIHEAP
 	---help---
 		Partition heap memory into two parts:  (1) a protected, kernel-mode
 		heap accessible only by the NuttX kernel, and (2) an unprotected
@@ -142,7 +142,7 @@ config DEBUG_GRAN
 config MM_PGALLOC
 	bool "Enable Page Allocator"
 	default n
-	depends on ARCH_HAVE_MMU
+	depends on ARCH_USE_MMU
 	select GRAN
 	---help---
 		Enable support for a MMU physical page allocator based on the
diff --git a/nuttx/mm/Makefile b/nuttx/mm/Makefile
index f605fc5d4..349ced9f8 100644
--- a/nuttx/mm/Makefile
+++ b/nuttx/mm/Makefile
@@ -40,7 +40,7 @@ DELIM := $(strip /)
 
 # CFLAGS
 
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   KDEFINE = ${shell $(TOPDIR)\tools\define.bat "$(CC)" __KERNEL__}
 else
@@ -58,10 +58,16 @@ CSRCS += mm_memalign.c mm_free.c mm_mallinfo.c
 # Allocator instances
 
 CSRCS += mm_user.c
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 ifeq ($(CONFIG_MM_KERNEL_HEAP),y)
 CSRCS += mm_kernel.c
 endif
+else
+ifeq ($(CONFIG_BUILD_KERNEL),y)
+ifeq ($(CONFIG_MM_KERNEL_HEAP),y)
+CSRCS += mm_kernel.c
+endif
+endif
 endif
 
 # An optional granule allocator
@@ -122,7 +128,7 @@ endif
 # Dependencies
 
 .depend: Makefile $(SRCS)
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 	$(Q) $(MKDEP) --obj-path ubin --obj-suffix $(OBJEXT) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make_ubin.dep
 	$(Q) $(MKDEP) --obj-path kbin --obj-suffix $(OBJEXT) "$(CC)" -- $(CFLAGS) $(KDEFINE) -- $(SRCS) >Make_kbin.dep
 else
diff --git a/nuttx/mm/mm_calloc.c b/nuttx/mm/mm_calloc.c
index 0a433947d..3dd501aec 100644
--- a/nuttx/mm/mm_calloc.c
+++ b/nuttx/mm/mm_calloc.c
@@ -81,7 +81,7 @@ FAR void *mm_calloc(FAR struct mm_heap_s *heap, size_t n, size_t elem_size)
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_NUTTX_KERNEL) || !defined(__KERNEL__)
+#if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__)
 FAR void *calloc(size_t n, size_t elem_size)
 {
 #ifdef CONFIG_MM_MULTIHEAP
diff --git a/nuttx/mm/mm_free.c b/nuttx/mm/mm_free.c
index 220b9bca0..9d04619b1 100644
--- a/nuttx/mm/mm_free.c
+++ b/nuttx/mm/mm_free.c
@@ -167,7 +167,7 @@ void mm_free(FAR struct mm_heap_s *heap, FAR void *mem)
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_NUTTX_KERNEL) || !defined(__KERNEL__)
+#if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__)
 void free(FAR void *mem)
 {
   mm_free(&g_mmheap, mem);
diff --git a/nuttx/mm/mm_kernel.c b/nuttx/mm/mm_kernel.c
index ee156e889..eb3c7fd7d 100644
--- a/nuttx/mm/mm_kernel.c
+++ b/nuttx/mm/mm_kernel.c
@@ -43,7 +43,8 @@
 
 #include <nuttx/kmalloc.h>
 
-#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) && defined(__KERNEL__)
+#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
+      defined(CONFIG_BUILD_KERNEL))  && defined(CONFIG_MM_KERNEL_HEAP)
 
 /************************************************************************
  * Pre-processor definition
@@ -304,4 +305,4 @@ bool kmm_heapmember(FAR void *mem)
 }
 #endif
 
-#endif /* CONFIG_NUTTX_KERNEL && CONFIG_MM_KERNEL_HEAP && __KERNEL__ */
+#endif /* ((CONFIG_BUILD_PROTECTED && __KERNEL__) || CONFIG_BUILD_KERNEL)  && CONFIG_MM_KERNEL_HEAP*/
diff --git a/nuttx/mm/mm_mallinfo.c b/nuttx/mm/mm_mallinfo.c
index e37f82266..4b152c354 100644
--- a/nuttx/mm/mm_mallinfo.c
+++ b/nuttx/mm/mm_mallinfo.c
@@ -151,7 +151,7 @@ int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info)
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_NUTTX_KERNEL) || !defined(__KERNEL__)
+#if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__)
 #  ifdef CONFIG_CAN_PASS_STRUCTS
 
 struct mallinfo mallinfo(void)
@@ -170,4 +170,4 @@ int mallinfo(struct mallinfo *info)
 }
 
 #endif
-#endif /* !CONFIG_NUTTX_KERNEL || !__KERNEL__ */
+#endif /* !CONFIG_BUILD_PROTECTED || !__KERNEL__ */
diff --git a/nuttx/mm/mm_malloc.c b/nuttx/mm/mm_malloc.c
index eee483511..354a30e02 100644
--- a/nuttx/mm/mm_malloc.c
+++ b/nuttx/mm/mm_malloc.c
@@ -228,7 +228,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_NUTTX_KERNEL) || !defined(__KERNEL__)
+#if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__)
 FAR void *malloc(size_t size)
 {
   return mm_malloc(&g_mmheap, size);
diff --git a/nuttx/mm/mm_memalign.c b/nuttx/mm/mm_memalign.c
index 9c0a29546..7fe1d0c74 100644
--- a/nuttx/mm/mm_memalign.c
+++ b/nuttx/mm/mm_memalign.c
@@ -240,7 +240,7 @@ FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment,
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_NUTTX_KERNEL) || !defined(__KERNEL__)
+#if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__)
 
 FAR void *memalign(size_t alignment, size_t size)
 {
diff --git a/nuttx/mm/mm_pgalloc.c b/nuttx/mm/mm_pgalloc.c
index bd61a4bf6..403e1fd2f 100644
--- a/nuttx/mm/mm_pgalloc.c
+++ b/nuttx/mm/mm_pgalloc.c
@@ -59,7 +59,7 @@
  * CONFIG_DEBUG_PGALLOC - Just like CONFIG_DEBUG_MM, but only generates
  *   output from the page allocation logic.
  *
- * Dependencies:  CONFIG_ARCH_HAVE_MMU and CONFIG_GRAN
+ * Dependencies:  CONFIG_ARCH_USE_MMU and CONFIG_GRAN
  */
  
 /* Debug */
diff --git a/nuttx/mm/mm_realloc.c b/nuttx/mm/mm_realloc.c
index 3bf927d9b..0c7346521 100644
--- a/nuttx/mm/mm_realloc.c
+++ b/nuttx/mm/mm_realloc.c
@@ -399,7 +399,7 @@ FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem,
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_NUTTX_KERNEL) || !defined(__KERNEL__)
+#if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__)
 
 FAR void *realloc(FAR void *oldmem, size_t size)
 {
diff --git a/nuttx/mm/mm_user.c b/nuttx/mm/mm_user.c
index d487e4264..bc99ee839 100644
--- a/nuttx/mm/mm_user.c
+++ b/nuttx/mm/mm_user.c
@@ -41,7 +41,7 @@
 #include <assert.h>
 #include <nuttx/mm.h>
 
-#if !defined(CONFIG_NUTTX_KERNEL) || !defined(__KERNEL__)
+#if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__)
 
 /************************************************************************
  * Pre-processor definition
@@ -153,4 +153,4 @@ void umm_givesemaphore(void)
   mm_givesemaphore(&g_mmheap);
 }
 
-#endif /* !CONFIG_NUTTX_KERNEL || !__KERNEL__ */
+#endif /* !CONFIG_BUILD_PROTECTED || !__KERNEL__ */
diff --git a/nuttx/mm/mm_zalloc.c b/nuttx/mm/mm_zalloc.c
index bf25aed84..2cef9f436 100644
--- a/nuttx/mm/mm_zalloc.c
+++ b/nuttx/mm/mm_zalloc.c
@@ -81,7 +81,7 @@ FAR void *mm_zalloc(FAR struct mm_heap_s *heap, size_t size)
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_NUTTX_KERNEL) || !defined(__KERNEL__)
+#if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__)
 FAR void *zalloc(size_t size)
 {
 #ifdef CONFIG_MM_MULTIHEAP