Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL

2 files changed, 15 insertions, 13 deletions

diff --git a/nuttx/binfmt/Kconfig b/nuttx/binfmt/Kconfig
index 0575cd369..14bd4364f 100644
--- a/nuttx/binfmt/Kconfig
+++ b/nuttx/binfmt/Kconfig
@@ -52,7 +52,7 @@ endif
 config BUILTIN
 	bool "Support Builtin Applications"
 	default n
-	depends on !NUTTX_KERNEL || EXPERIMENTAL
+	depends on (!BUILD_PROTECTED && !BUILD_KERNEL) || EXPERIMENTAL
 	---help---
 		Enable support for builtin applications.  This features assigns a string
 		name to an application and in addition if FS_BINFS is defined, retaining
@@ -60,10 +60,10 @@ config BUILTIN
 		is also the underlying requirement to support built-in applications in the
 		NuttShell (NSH).
 
-		ISSUES:  This feature is highly coupled with logic in the apps/subdirectory
-		and, as a consequence, cannot be used in environments that do not
-		include the standard NuttX apps/ nor in build configurations using
-		NUTTX_KERNEL.
+		ISSUES:  This feature is highly coupled with logic in the apps/
+		sub-directory and, as a consequence, cannot be used in environments
+		that do not include the standard NuttX apps/ nor in build
+		configurations using BUILD_PROTECTED or BUILD_KERNEL.
 
 if BUILTIN
 source binfmt/libbuiltin/Kconfig
@@ -72,7 +72,7 @@ endif
 config PCODE
 	bool "Support P-Code Applications"
 	default n
-	depends on INTERPRETERS_PCODE && SYSTEM_PRUN && (!NUTTX_KERNEL || EXPERIMENTAL)
+	depends on INTERPRETERS_PCODE && SYSTEM_PRUN && ((!BUILD_PROTECTED && !BUILD_KERNEL) || EXPERIMENTAL)
 	---help---
 		Enable support for interpreted P-Code binaries.  P-Code binaries are
 		generated by the NuttX Pascal compiler.
@@ -87,7 +87,7 @@ config PCODE
 		ISSUES:  This feature is highly coupled with logic in the apps/subdirectory
 		and, as a consequence, cannot be used in environments that do not
 		include the standard NuttX apps/ nor in build configurations using
-		NUTTX_KERNEL.
+		UILD_PROTECTED or BUILD_KERNEL..
 
 if PCODE
 source binfmt/libpcode/Kconfig
diff --git a/nuttx/binfmt/pcode.c b/nuttx/binfmt/pcode.c
index ce244a269..b2a243cb0 100644
--- a/nuttx/binfmt/pcode.c
+++ b/nuttx/binfmt/pcode.c
@@ -218,7 +218,7 @@ static int pcode_mount_testfs(void)
  *
  ****************************************************************************/
 
-#ifndef CONFIG_NUTTX_KERNEL
+#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
 static void pcode_onexit(int exitcode, FAR void *arg)
 {
   FAR struct binary_s *binp = (FAR struct binary_s *)arg;
@@ -236,12 +236,13 @@ static void pcode_onexit(int exitcode, FAR void *arg)
  * Description:
  *   This is the proxy program that runs and starts the P-Code interpreter.
  *
- * REVISIT:  There are issues here when CONFIG_NUTTX_KERNEL is selected.  Also
- * This implementation is too highly couple to logic in the apps/ directory.
+ * REVISIT:  There are issues here when CONFIG_BUILD_PROTECTED or
+ * CONFIG_BUILD_KERNEL are selected.  Also this implementation is too highly
+ * couple to logic in the apps/ directory.
  *
  ****************************************************************************/
 
-#ifndef CONFIG_NUTTX_KERNEL
+#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
 static int pcode_proxy(int argc, char **argv)
 {
   FAR struct binary_s *binp;
@@ -289,7 +290,7 @@ static int pcode_proxy(int argc, char **argv)
   return EXIT_SUCCESS;
 }
 #else
-#  error Missing logic for the case of CONFIG_NUTTX_KERNEL
+#  error Missing logic for the case of CONFIG_BUILD_PROTECTED/KERNEL
 #endif
 
 /****************************************************************************
@@ -371,7 +372,8 @@ static int pcode_load(struct binary_s *binp)
     }
 
   /* Return the load information.
-   * REVISIT:  There are issues here when CONFIG_NUTTX_KERNEL is selected.
+   * REVISIT:  There are issues here when CONFIG_BUILD_PROTECTED or
+   * CONFIG_BUILD_KERNEL are selected.
    */
 
   binp->entrypt   = pcode_proxy;