diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index fddd3d2b472..fbae9b06c41 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -25,7 +25,7 @@ CONFIG_BUILD_2PASS=y
 CONFIG_PASS1_TARGET="all"
 CONFIG_PASS1_BUILDIR="configs/ea3131/locked"
 CONFIG_PASS1_OBJECT="locked.r"
-# CONFIG_NUTTX_KERNEL is not set
+# CONFIG_BUILD_PROTECTED is not set
 
 #
 # Binary Output Formats
diff --git a/configs/mikroe-stm32f4/kernel/up_userspace.c b/configs/mikroe-stm32f4/kernel/up_userspace.c
index 77092457c71..614ae3b8992 100644
--- a/configs/mikroe-stm32f4/kernel/up_userspace.c
+++ b/configs/mikroe-stm32f4/kernel/up_userspace.c
@@ -45,7 +45,7 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/mm.h>
 
-#if defined(CONFIG_NUTTX_KERNEL) && !defined(__KERNEL__)
+#if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -139,4 +139,4 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
  * Public Functions
  ****************************************************************************/
 
-#endif /* CONFIG_NUTTX_KERNEL && !__KERNEL__ */
+#endif /* CONFIG_BUILD_PROTECTED && !__KERNEL__ */
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index 1f2e7c592cb..75123cc7dc0 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -21,7 +21,7 @@ CONFIG_BUILD_2PASS=y
 CONFIG_PASS1_TARGET="all"
 CONFIG_PASS1_BUILDIR="configs/mikroe-stm32f4/kernel"
 CONFIG_PASS1_OBJECT=""
-CONFIG_NUTTX_KERNEL=y
+CONFIG_BUILD_PROTECTED=y
 CONFIG_NUTTX_USERSPACE=0x08020000
 
 #
@@ -107,6 +107,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_FPU is not set
 CONFIG_ARCH_HAVE_MPU=y
+CONFIG_ARCH_USE_MPU=y
 CONFIG_ARMV7M_MPU=y
 CONFIG_ARMV7M_MPU_NREGIONS=8
 
diff --git a/configs/open1788/kernel/up_userspace.c b/configs/open1788/kernel/up_userspace.c
index 59e21849203..ffcd8db480a 100644
--- a/configs/open1788/kernel/up_userspace.c
+++ b/configs/open1788/kernel/up_userspace.c
@@ -45,7 +45,7 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/mm.h>
 
-#if defined(CONFIG_NUTTX_KERNEL) && !defined(__KERNEL__)
+#if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -139,4 +139,4 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
  * Public Functions
  ****************************************************************************/
 
-#endif /* CONFIG_NUTTX_KERNEL && !__KERNEL__ */
+#endif /* CONFIG_BUILD_PROTECTED && !__KERNEL__ */
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index b83c1a38732..dc4203c75c8 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -20,7 +20,7 @@ CONFIG_BUILD_2PASS=y
 CONFIG_PASS1_TARGET="all"
 CONFIG_PASS1_BUILDIR="configs/open1788/kernel"
 CONFIG_PASS1_OBJECT=""
-CONFIG_NUTTX_KERNEL=y
+CONFIG_BUILD_PROTECTED=y
 CONFIG_NUTTX_USERSPACE=0x00010000
 
 #
@@ -86,6 +86,7 @@ CONFIG_ARCH_CHIP="lpc17xx"
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 CONFIG_ARCH_HAVE_MPU=y
+CONFIG_ARCH_USE_MPU=y
 CONFIG_ARMV7M_MPU=y
 CONFIG_ARMV7M_MPU_NREGIONS=8
 
diff --git a/configs/pcduino-a10/nsh/pcduino-140107.patch b/configs/pcduino-a10/nsh/pcduino-140107.patch
index b5df28eb800..e6a1b9c18cc 100644
--- a/configs/pcduino-a10/nsh/pcduino-140107.patch
+++ b/configs/pcduino-a10/nsh/pcduino-140107.patch
@@ -48,7 +48,7 @@ index 3cc6323..ad42790 100644
 @@ -353,6 +359,7 @@ void up_boot(void)
     */
  
- #ifdef CONFIG_NUTTX_KERNEL
+ #ifdef CONFIG_BUILD_PROTECTED
 +lowsyslog("Calling a1x_userspace\n"); // REMOVE ME
    a1x_userspace();
  #endif
diff --git a/configs/sam3u-ek/kernel/up_userspace.c b/configs/sam3u-ek/kernel/up_userspace.c
index 50a45838f35..51ed83b6fe1 100644
--- a/configs/sam3u-ek/kernel/up_userspace.c
+++ b/configs/sam3u-ek/kernel/up_userspace.c
@@ -45,7 +45,7 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/mm.h>
 
-#if defined(CONFIG_NUTTX_KERNEL) && !defined(__KERNEL__)
+#if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -139,4 +139,4 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
  * Public Functions
  ****************************************************************************/
 
-#endif /* CONFIG_NUTTX_KERNEL && !__KERNEL__ */
+#endif /* CONFIG_BUILD_PROTECTED && !__KERNEL__ */
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index 6183909dec7..41a6a65deda 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -21,7 +21,7 @@ CONFIG_BUILD_2PASS=y
 CONFIG_PASS1_TARGET="all"
 CONFIG_PASS1_BUILDIR="configs/sam3u-ek/kernel"
 CONFIG_PASS1_OBJECT=""
-CONFIG_NUTTX_KERNEL=y
+CONFIG_BUILD_PROTECTED=y
 CONFIG_NUTTX_USERSPACE=0x00090000
 
 #
@@ -104,6 +104,7 @@ CONFIG_ARCH_CHIP="sam34"
 # CONFIG_ARMV7M_USEBASEPRI is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 CONFIG_ARCH_HAVE_MPU=y
+CONFIG_ARCH_USE_MPU=y
 CONFIG_ARMV7M_MPU=y
 CONFIG_ARMV7M_MPU_NREGIONS=8
 
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index 30888281fd5..f01103652ad 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -101,6 +101,7 @@ CONFIG_ARCH_CHIP="sam34"
 CONFIG_ARMV7M_USEBASEPRI=y
 # CONFIG_ARCH_HAVE_FPU is not set
 CONFIG_ARCH_HAVE_MPU=y
+CONFIG_ARCH_USE_MPU=y
 CONFIG_ARMV7M_MPU=y
 CONFIG_ARMV7M_MPU_NREGIONS=8
 
diff --git a/configs/stm3240g-eval/kernel/up_userspace.c b/configs/stm3240g-eval/kernel/up_userspace.c
index 0f57b34383b..c5aecd02e50 100644
--- a/configs/stm3240g-eval/kernel/up_userspace.c
+++ b/configs/stm3240g-eval/kernel/up_userspace.c
@@ -45,7 +45,7 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/mm.h>
 
-#if defined(CONFIG_NUTTX_KERNEL) && !defined(__KERNEL__)
+#if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -139,4 +139,4 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
  * Public Functions
  ****************************************************************************/
 
-#endif /* CONFIG_NUTTX_KERNEL && !__KERNEL__ */
+#endif /* CONFIG_BUILD_PROTECTED && !__KERNEL__ */
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index 2844b7b6c82..7de3b478c2c 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -25,7 +25,7 @@ CONFIG_BUILD_2PASS=y
 CONFIG_PASS1_TARGET="all"
 CONFIG_PASS1_BUILDIR="configs/stm3240g-eval/kernel"
 CONFIG_PASS1_OBJECT=""
-CONFIG_NUTTX_KERNEL=y
+CONFIG_BUILD_PROTECTED=y
 CONFIG_NUTTX_USERSPACE=0x08040000
 
 #
@@ -111,6 +111,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_FPU is not set
 CONFIG_ARCH_HAVE_MPU=y
+CONFIG_ARCH_USE_MPU=y
 CONFIG_ARMV7M_MPU=y
 CONFIG_ARMV7M_MPU_NREGIONS=8
 
diff --git a/configs/stm3240g-eval/src/up_boot.c b/configs/stm3240g-eval/src/up_boot.c
index 35989f90fe9..eff7a36d38e 100644
--- a/configs/stm3240g-eval/src/up_boot.c
+++ b/configs/stm3240g-eval/src/up_boot.c
@@ -51,7 +51,7 @@
  * if nx_start() is available (CONFIG_NX_NXSTART=y) and if the NxWidget::CNxServer
  * class expects the RTOS to do the NX initialization (CONFIG_NXWIDGET_SERVERINIT=n).
  * This combination of settings is normally only used in the kernel build mode
- * (CONFIG_NUTTX_KERNEL) when NxWidgets is unable to initialize NX from user-space.
+ * (CONFIG_BUILD_PROTECTED) when NxWidgets is unable to initialize NX from user-space.
  */
 
 #undef HAVE_NXSTART
@@ -67,7 +67,7 @@
 #      include <nuttx/nx/nx.h>
 #    endif
 #  else
-#    if !defined(CONFIG_NXWIDGET_SERVERINIT) && defined(CONFIG_NUTTX_KERNEL)
+#    if !defined(CONFIG_NXWIDGET_SERVERINIT) && defined(CONFIG_BUILD_PROTECTED)
 #      error CONFIG_NX_NXSTART=y is needed
 #    endif
 #  endif
@@ -78,7 +78,7 @@
  * touchscreen (CONFIG_NXWM_TOUCHSCREEN=y), and if we were asked to
  * initialize the touchscreen for NxWM (NXWM_TOUCHSCREEN_DEVINIT=n). This
  * combination of settings is normally only used in the kernel build mode
- * (CONFIG_NUTTX_KERNEL) when NxWidgets is unable to initialize NX from
+ * (CONFIG_BUILD_PROTECTED) when NxWidgets is unable to initialize NX from
  * user-space.
  */
 
@@ -93,7 +93,7 @@
 #      include <nuttx/input/touchscreen.h>
 #    endif
 #  else
-#    if !defined(CONFIG_NXWM_TOUCHSCREEN_DEVINIT) && defined(CONFIG_NUTTX_KERNEL)
+#    if !defined(CONFIG_NXWM_TOUCHSCREEN_DEVINIT) && defined(CONFIG_BUILD_PROTECTED)
 #      error CONFIG_INPUT_STMPE811=y is needed
 #    endif
 #  endif
diff --git a/configs/stm32f4discovery/kernel/up_userspace.c b/configs/stm32f4discovery/kernel/up_userspace.c
index 6dd84cbe33e..047fd7647a9 100644
--- a/configs/stm32f4discovery/kernel/up_userspace.c
+++ b/configs/stm32f4discovery/kernel/up_userspace.c
@@ -45,7 +45,7 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/mm.h>
 
-#if defined(CONFIG_NUTTX_KERNEL) && !defined(__KERNEL__)
+#if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -139,4 +139,4 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
  * Public Functions
  ****************************************************************************/
 
-#endif /* CONFIG_NUTTX_KERNEL && !__KERNEL__ */
+#endif /* CONFIG_BUILD_PROTECTED && !__KERNEL__ */
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index 3e210d62fe5..74358591874 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -25,7 +25,7 @@ CONFIG_BUILD_2PASS=y
 CONFIG_PASS1_TARGET="all"
 CONFIG_PASS1_BUILDIR="configs/stm32f4discovery/kernel"
 CONFIG_PASS1_OBJECT=""
-CONFIG_NUTTX_KERNEL=y
+CONFIG_BUILD_PROTECTED=y
 CONFIG_NUTTX_USERSPACE=0x08020000
 
 #
@@ -111,6 +111,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_FPU is not set
 CONFIG_ARCH_HAVE_MPU=y
+CONFIG_ARCH_USE_MPU=y
 CONFIG_ARMV7M_MPU=y
 CONFIG_ARMV7M_MPU_NREGIONS=8