Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL

7 files changed, 11 insertions, 11 deletions

diff --git a/nuttx/arch/arm/src/lpc43xx/Make.defs b/nuttx/arch/arm/src/lpc43xx/Make.defs
index 9b4053b3b..04793d7b1 100644
--- a/nuttx/arch/arm/src/lpc43xx/Make.defs
+++ b/nuttx/arch/arm/src/lpc43xx/Make.defs
@@ -59,7 +59,7 @@ ifeq ($(CONFIG_ARCH_MEMCPY),y)
 CMN_ASRCS += up_memcpy.S
 endif
 
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += up_mpu.c up_task_start.c up_pthread_start.c up_stackframe.c
 ifneq ($(CONFIG_DISABLE_SIGNALS),y)
 CMN_CSRCS += up_signal_dispatch.c
@@ -91,7 +91,7 @@ ifneq ($(CONFIG_SCHED_TICKLESS),y)
 CHIP_CSRCS += lpc43_timerisr.c
 endif
 
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CHIP_CSRCS += lpc43_userspace.c lpc43_mpuinit.c
 endif
 
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_allocateheap.c b/nuttx/arch/arm/src/lpc43xx/lpc43_allocateheap.c
index 0dd84e1ae..93cbe2acc 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_allocateheap.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_allocateheap.c
@@ -234,7 +234,7 @@ const uint32_t g_idle_topstack = (uint32_t)&_ebss + CONFIG_IDLETHREAD_STACKSIZE;
  * Description:
  *   This function will be called to dynamically set aside the heap region.
  *
- *   For the kernel build (CONFIG_NUTTX_KERNEL=y) with both kernel- and
+ *   For the kernel build (CONFIG_BUILD_PROTECTED=y) with both kernel- and
  *   user-space heaps (CONFIG_MM_KERNEL_HEAP=y), this function provides the
  *   size of the unprotected, user-space heap.
  *
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_mpuinit.c b/nuttx/arch/arm/src/lpc43xx/lpc43_mpuinit.c
index 02e8fb04e..c9a20b55a 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_mpuinit.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_mpuinit.c
@@ -46,7 +46,7 @@
 #include "mpu.h"
 #include "lpc43_mpuinit.h"
 
-#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_ARMV7M_MPU)
+#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARMV7M_MPU)
 
 /****************************************************************************
  * Private Definitions
@@ -120,5 +120,5 @@ void lpc43_mpu_uheap(uintptr_t start, size_t size)
   mpu_userintsram(start, size);
 }
 
-#endif /* CONFIG_NUTTX_KERNEL && CONFIG_ARMV7M_MPU */
+#endif /* CONFIG_BUILD_PROTECTED && CONFIG_ARMV7M_MPU */
 
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_mpuinit.h b/nuttx/arch/arm/src/lpc43xx/lpc43_mpuinit.h
index 1759e0dcd..f4c6c59ca 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_mpuinit.h
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_mpuinit.h
@@ -67,7 +67,7 @@
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NUTTX_KERNEL
+#ifdef CONFIG_BUILD_PROTECTED
 void lpc43_mpuinitialize(void);
 #else
 #  define lpc43_mpuinitialize()
@@ -81,7 +81,7 @@ void lpc43_mpuinitialize(void);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NUTTX_KERNEL
+#ifdef CONFIG_BUILD_PROTECTED
 void lpc43_mpu_uheap(uintptr_t start, size_t size);
 #else
 #  define lpc43_mpu_uheap(start,size)
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_start.c b/nuttx/arch/arm/src/lpc43xx/lpc43_start.c
index 19756c754..f07811eb5 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_start.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_start.c
@@ -339,7 +339,7 @@ void __start(void)
    * segments.
    */
 
-#ifdef CONFIG_NUTTX_KERNEL
+#ifdef CONFIG_BUILD_PROTECTED
   lpc43_userspace();
   showprogress('F');
 #endif
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.c b/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.c
index 7bc7f1c25..822381b24 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.c
@@ -47,7 +47,7 @@
 #include "lpc43_mpuinit.h"
 #include "lpc43_userspace.h"
 
-#ifdef CONFIG_NUTTX_KERNEL
+#ifdef CONFIG_BUILD_PROTECTED
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -115,5 +115,5 @@ void lpc43_userspace(void)
   lpc43_mpuinitialize();
 }
 
-#endif /* CONFIG_NUTTX_KERNEL */
+#endif /* CONFIG_BUILD_PROTECTED */
 
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.h b/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.h
index f7632388f..77b6d1e60 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.h
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.h
@@ -69,7 +69,7 @@
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NUTTX_KERNEL
+#ifdef CONFIG_BUILD_PROTECTED
 void lpc43_userspace(void);
 #endif