Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL

5 files changed, 15 insertions, 8 deletions

diff --git a/nuttx/sched/sched/sched.h b/nuttx/sched/sched/sched.h
index c6a6fd800..2f5f800af 100644
--- a/nuttx/sched/sched/sched.h
+++ b/nuttx/sched/sched/sched.h
@@ -179,7 +179,8 @@ extern volatile dq_queue_t g_inactivetasks;
 
 extern volatile sq_queue_t g_delayed_kufree;
 
-#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP)
+#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \
+     defined(CONFIG_MM_KERNEL_HEAP)
 extern volatile sq_queue_t g_delayed_kfree;
 #endif
 
diff --git a/nuttx/sched/sched/sched_free.c b/nuttx/sched/sched/sched_free.c
index 93d7dea1b..97f1429f6 100644
--- a/nuttx/sched/sched/sched_free.c
+++ b/nuttx/sched/sched/sched_free.c
@@ -98,7 +98,8 @@ void sched_ufree(FAR void *address)
        */
 
       flags = irqsave();
-#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP)
+#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \
+     defined(CONFIG_MM_KERNEL_HEAP)
       DEBUGASSERT(!kmm_heapmember(address));
 #endif
 
@@ -122,7 +123,8 @@ void sched_ufree(FAR void *address)
     }
 }
 
-#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP)
+#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \
+     defined(CONFIG_MM_KERNEL_HEAP)
 void sched_kfree(FAR void *address)
 {
   irqstate_t flags;
diff --git a/nuttx/sched/sched/sched_garbage.c b/nuttx/sched/sched/sched_garbage.c
index 7a6839cb1..06de3d577 100644
--- a/nuttx/sched/sched/sched_garbage.c
+++ b/nuttx/sched/sched/sched_garbage.c
@@ -122,7 +122,8 @@ static inline void sched_kucleanup(void)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP)
+#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \
+     defined(CONFIG_MM_KERNEL_HEAP)
 static inline void sched_kcleanup(void)
 {
    irqstate_t flags;
diff --git a/nuttx/sched/sched/sched_getstreams.c b/nuttx/sched/sched/sched_getstreams.c
index f11015b57..a87c95306 100644
--- a/nuttx/sched/sched/sched_getstreams.c
+++ b/nuttx/sched/sched/sched_getstreams.c
@@ -74,7 +74,8 @@ FAR struct streamlist *sched_getstreams(void)
 
   DEBUGASSERT(group);
 
-#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP)
+#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \
+     defined(CONFIG_MM_KERNEL_HEAP)
   return group->tg_streamlist;
 #else
   return &group->tg_streamlist;
diff --git a/nuttx/sched/sched/sched_releasetcb.c b/nuttx/sched/sched/sched_releasetcb.c
index 7cf80f3d6..ecfaf72ce 100644
--- a/nuttx/sched/sched/sched_releasetcb.c
+++ b/nuttx/sched/sched/sched_releasetcb.c
@@ -111,7 +111,8 @@ static void sched_releasepid(pid_t pid)
 int sched_releasetcb(FAR struct tcb_s *tcb, uint8_t ttype)
 {
   int ret = OK;
-#if defined(CONFIG_CUSTOM_STACK) || !defined(CONFIG_NUTTX_KERNEL)
+#if defined(CONFIG_CUSTOM_STACK) || (!defined(CONFIG_BUILD_PROTECTED) && \
+   !defined(CONFIG_BUILD_KERNEL))
   int i;
 #endif
 
@@ -168,7 +169,8 @@ int sched_releasetcb(FAR struct tcb_s *tcb, uint8_t ttype)
         }
 #endif
 
-#if defined(CONFIG_CUSTOM_STACK) || !defined(CONFIG_NUTTX_KERNEL)
+#if defined(CONFIG_CUSTOM_STACK) || (!defined(CONFIG_BUILD_PROTECTED) && \
+   !defined(CONFIG_BUILD_KERNEL))
       /* Release command line arguments that were allocated for task
        * start/re-start.
        *
@@ -188,7 +190,7 @@ int sched_releasetcb(FAR struct tcb_s *tcb, uint8_t ttype)
             }
         }
 
-#endif /* CONFIG_CUSTOM_STACK || !CONFIG_NUTTX_KERNEL */
+#endif /* CONFIG_CUSTOM_STACK || (!CONFIG_BUILD_PROTECTED && !CONFIG_BUILD_KERNEL) */
 
       /* Release this thread's reference to the address environment */