From 63c3772888d1703a41366ad73149369bfee5fb53 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Thu, 3 Oct 2019 14:10:32 -0600
Subject: [PATCH] CONFIG_BUILD_LOADABLE:  Check the kernel function callable by
 BUILD_KERNEL instead of BUILD_LOADABLE since BUILD_LOADABLE could be turned
 on even with BUILD_FLAT.

---
 examples/README.txt          | 4 ++--
 examples/flash_test/Kconfig  | 2 +-
 examples/i2schar/Kconfig     | 2 +-
 examples/module/Kconfig      | 4 ++--
 examples/mtdpart/Kconfig     | 2 +-
 examples/mtdrwb/Kconfig      | 2 +-
 examples/nettest/Kconfig     | 2 +-
 examples/nxflat/Kconfig      | 2 +-
 examples/sotest/Kconfig      | 4 ++--
 examples/tcpblaster/Kconfig  | 2 +-
 examples/udpblaster/Kconfig  | 2 +-
 fsutils/passwd/passwd_lock.c | 8 ++++----
 nshlib/nsh.h                 | 2 +-
 system/lzf/lzf_main.c        | 6 +++---
 system/nsh/nsh_main.c        | 5 ++---
 system/popen/Kconfig         | 2 +-
 system/popen/popen.c         | 2 +-
 system/system/Kconfig        | 2 +-
 system/system/system.c       | 2 +-
 system/usbmsc/README.txt     | 2 +-
 20 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/examples/README.txt b/examples/README.txt
index f4d53df10..6f77375d2 100644
--- a/examples/README.txt
+++ b/examples/README.txt
@@ -398,7 +398,7 @@ examples/flash_test
     * CONFIG_MTD_SMART=y - SMART block driver support
     * CONFIG_NSH_BUILTIN_APPS=y - This example can only be built as an NSH
       command
-    * CONFIG_BUILD_PROTECTED=n and CONFIG_BUILD_LOADABLE=n- This test uses
+    * CONFIG_BUILD_PROTECTED=n and CONFIG_BUILD_KERNEL=n - This test uses
       internal OS interfaces and so is not available in the NUTTX kernel
       builds
 
@@ -1496,7 +1496,7 @@ examples/relays
   relies on internal OS interfaces that are not normally available to a
   user-space program.  As a result, this example cannot be used if a
   NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
-  or CONFIG_BUILD_LOADABLE).
+  or CONFIG_BUILD_KERNEL).
 
 examples/rfid_readuid
 ^^^^^^^^^^^^^^^^^^^^^
diff --git a/examples/flash_test/Kconfig b/examples/flash_test/Kconfig
index 4dd0a3794..d981cb218 100644
--- a/examples/flash_test/Kconfig
+++ b/examples/flash_test/Kconfig
@@ -6,7 +6,7 @@
 config EXAMPLES_FLASH_TEST
 	tristate "SMART FLASH block device test"
 	default n
-	depends on (!BUILD_PROTECTED && !BUILD_LOADABLE) && MTD_SMART && NSH_BUILTIN_APPS
+	depends on (!BUILD_PROTECTED && !BUILD_KERNEL) && MTD_SMART && NSH_BUILTIN_APPS
 	---help---
 		This logic performs a SMART flash block device test.  This test
 		performs a sector allocate, read, write, free and garbage collection
diff --git a/examples/i2schar/Kconfig b/examples/i2schar/Kconfig
index f36a21c68..890b3783f 100644
--- a/examples/i2schar/Kconfig
+++ b/examples/i2schar/Kconfig
@@ -78,7 +78,7 @@ config EXAMPLES_I2SCHAR_BUFSIZE
 config EXAMPLES_I2SCHAR_DEVINIT
 	bool "Architecture-specific device initialization"
 	default 256
-	depends on !BUILD_PROTECTED && !BUILD_LOADABLE
+	depends on !BUILD_PROTECTED && !BUILD_KERNEL
 	---help---
 		Define if architecture-specific I2S device initialize is available.
 		If defined, the platform specific code must provide a function
diff --git a/examples/module/Kconfig b/examples/module/Kconfig
index 59c01a2de..3feee8fe7 100644
--- a/examples/module/Kconfig
+++ b/examples/module/Kconfig
@@ -128,7 +128,7 @@ config EXAMPLES_MODULE_NOSTRIP
 config EXAMPLES_MODULE_LIBC
 	bool "Link with LIBC"
 	default n
-	depends on !BUILD_LOADABLE && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	---help---
 		Link with the C library (and also math library if it was built).
 		By default, all undefined symbols must be provided via a symbol
@@ -147,6 +147,6 @@ config EXAMPLES_MODULE_LIBC
 config EXAMPLES_MODULE_LIBGCC
 	bool "Link with LIBGCC"
 	default n
-	depends on !BUILD_LOADABLE && EXPERIMENTAL
+	depends on EXPERIMENTAL
 
 endif
diff --git a/examples/mtdpart/Kconfig b/examples/mtdpart/Kconfig
index b996e14d9..4395083f7 100644
--- a/examples/mtdpart/Kconfig
+++ b/examples/mtdpart/Kconfig
@@ -6,7 +6,7 @@
 config EXAMPLES_MTDPART
 	tristate "MTD partition test"
 	default n
-	depends on MTD_PARTITION && !BUILD_PROTECTED && !BUILD_LOADABLE
+	depends on MTD_PARTITION && !BUILD_PROTECTED && !BUILD_KERNEL
 	---help---
 		Enable the MTD partition test example.
 
diff --git a/examples/mtdrwb/Kconfig b/examples/mtdrwb/Kconfig
index 5b7f812bc..952676635 100644
--- a/examples/mtdrwb/Kconfig
+++ b/examples/mtdrwb/Kconfig
@@ -6,7 +6,7 @@
 config EXAMPLES_MTDRWB
 	tristate "MTD R/W buffer test"
 	default n
-	depends on (MTD_WRBUFFER || MTD_READAHEAD) && !BUILD_PROTECTED && !BUILD_LOADABLE
+	depends on (MTD_WRBUFFER || MTD_READAHEAD) && !BUILD_PROTECTED && !BUILD_KERNEL
 	---help---
 		Enable the MTD R/W buffer test example.
 
diff --git a/examples/nettest/Kconfig b/examples/nettest/Kconfig
index 9aa585141..2ef5e81ac 100644
--- a/examples/nettest/Kconfig
+++ b/examples/nettest/Kconfig
@@ -133,7 +133,7 @@ config EXAMPLES_NETTEST_INIT
 	bool "Initialize network"
 	default n if NSH_BUILTIN_APPS
 	default y if !NSH_BUILTIN_APPS
-	depends on !BUILD_LOADABLE && !EXAMPLES_NETTEST_LOOPBACK
+	depends on !EXAMPLES_NETTEST_LOOPBACK
 	---help---
 		Include logic to initialize the network.  This should not be done if
 		the network is already initialized when nettest runs.  This is
diff --git a/examples/nxflat/Kconfig b/examples/nxflat/Kconfig
index f1e48c825..d4fab63c5 100644
--- a/examples/nxflat/Kconfig
+++ b/examples/nxflat/Kconfig
@@ -7,7 +7,7 @@ config EXAMPLES_NXFLAT
 	bool "NXFLAT example"
 	default n
 	select LIBC_EXECFUNCS
-	depends on NXFLAT && !BUILD_LOADABLE
+	depends on NXFLAT
 	---help---
 		Enable the NXFLAT example
 
diff --git a/examples/sotest/Kconfig b/examples/sotest/Kconfig
index 18b7b3a8c..a3298927e 100644
--- a/examples/sotest/Kconfig
+++ b/examples/sotest/Kconfig
@@ -67,7 +67,7 @@ endif # !EXAMPLES_SOTEST_BUILTINFS
 config EXAMPLES_SOTEST_LIBC
 	bool "Link with LIBC"
 	default n
-	depends on !BUILD_LOADABLE && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	---help---
 		Link with the C library (and also math library if it was built).
 		By default, all undefined symbols must be provided via a symbol
@@ -86,6 +86,6 @@ config EXAMPLES_SOTEST_LIBC
 config EXAMPLES_SOTEST_LIBGCC
 	bool "Link with LIBGCC"
 	default n
-	depends on !BUILD_LOADABLE && EXPERIMENTAL
+	depends on EXPERIMENTAL
 
 endif
diff --git a/examples/tcpblaster/Kconfig b/examples/tcpblaster/Kconfig
index b4600afb5..14b443c07 100644
--- a/examples/tcpblaster/Kconfig
+++ b/examples/tcpblaster/Kconfig
@@ -143,7 +143,7 @@ config EXAMPLES_TCPBLASTER_INIT
 	bool "Initialize network"
 	default n if NSH_BUILTIN_APPS
 	default y if !NSH_BUILTIN_APPS
-	depends on !BUILD_LOADABLE && !EXAMPLES_TCPBLASTER_LOOPBACK
+	depends on !EXAMPLES_TCPBLASTER_LOOPBACK
 	---help---
 		Include logic to initialize the network.  This should not be done if
 		the network is already initialized when tcpblaster runs.  This is
diff --git a/examples/udpblaster/Kconfig b/examples/udpblaster/Kconfig
index b406167c3..969a8c6ad 100644
--- a/examples/udpblaster/Kconfig
+++ b/examples/udpblaster/Kconfig
@@ -60,7 +60,7 @@ config EXAMPLES_UDPBLASTER_INIT
 	bool "Initialize network"
 	default n if NSH_BUILTIN_APPS
 	default y if !NSH_BUILTIN_APPS
-	depends on !BUILD_LOADABLE && !EXAMPLES_UDPBLASTER_LOOPBACK
+	depends on !EXAMPLES_UDPBLASTER_LOOPBACK
 	---help---
 		Include logic to initialize the network.  This should not be done if
 		the network is already initialized when udpblaster runs.  This is
diff --git a/fsutils/passwd/passwd_lock.c b/fsutils/passwd/passwd_lock.c
index 54f588873..c92f7f04e 100644
--- a/fsutils/passwd/passwd_lock.c
+++ b/fsutils/passwd/passwd_lock.c
@@ -47,7 +47,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifdef CONFIG_BUILD_LOADABLE
+#ifdef CONFIG_BUILD_KERNEL
 /* In the kernel build mode, we need to use a named semaphore so that all
  * processes will share the same, named semaphore instance.
  */
@@ -59,7 +59,7 @@
  * Private Data
  ****************************************************************************/
 
-#ifndef CONFIG_BUILD_LOADABLE
+#ifndef CONFIG_BUILD_KERNEL
 /* In the FLAT and PROTECTED build modes, we do not need to bother with a
  * named semaphore.  We use a single global semaphore in theses cases.
  */
@@ -92,7 +92,7 @@ int passwd_lock(FAR sem_t **semp)
 {
   FAR sem_t *sem;
 
-#ifdef CONFIG_BUILD_LOADABLE
+#ifdef CONFIG_BUILD_KERNEL
   /* Open the shared, named semaphore */
 
   sem = sem_open(PASSWD_SEMNAME, O_CREAT, 0644, 1);
@@ -127,7 +127,7 @@ int passwd_unlock(FAR sem_t *sem)
 
   sem_post(sem);
 
-#ifdef CONFIG_BUILD_LOADABLE
+#ifdef CONFIG_BUILD_KERNEL
   /* Close the named semaphore */
 
   (void)sem_close(sem);
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 3147dd6cd..e6cbc4329 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -561,7 +561,7 @@
  *   library where they will become accessible to application code.
  */
 
-#if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_LOADABLE)
+#if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)
 #  undef  CONFIG_NSH_DISABLE_MKRD        /* 'mkrd' depends on ramdisk_register */
 #  define CONFIG_NSH_DISABLE_MKRD 1
 #endif
diff --git a/system/lzf/lzf_main.c b/system/lzf/lzf_main.c
index 47bdf5756..e937e8063 100644
--- a/system/lzf/lzf_main.c
+++ b/system/lzf/lzf_main.c
@@ -58,7 +58,7 @@
  * Private Data
  ****************************************************************************/
 
-#ifndef CONFIG_BUILD_LOADABLE
+#ifndef CONFIG_BUILD_KERNEL
 static sem_t g_exclsem = SEM_INITIALIZER(1);
 #endif
 
@@ -78,7 +78,7 @@ static uint8_t g_buf2[MAX_BLOCKSIZE + LZF_MAX_HDR_SIZE + 16];
  * Private Functions
  ****************************************************************************/
 
-#ifndef CONFIG_BUILD_LOADABLE
+#ifndef CONFIG_BUILD_KERNEL
 static void lzf_exit(int exitcode) noreturn_function;
 static void lzf_exit(int exitcode)
 {
@@ -443,7 +443,7 @@ int lzf_main(int argc, FAR char *argv[])
   int optc;
   int ret = 0;
 
-#ifndef CONFIG_BUILD_LOADABLE
+#ifndef CONFIG_BUILD_KERNEL
   /* Get exclusive access to the global variables.  Global variables are
    * used because the hash table and buffers are too large to allocate on
    * the embedded stack.  But the use of global variables has the downside
diff --git a/system/nsh/nsh_main.c b/system/nsh/nsh_main.c
index 4ceac10df..8a64b4760 100644
--- a/system/nsh/nsh_main.c
+++ b/system/nsh/nsh_main.c
@@ -106,8 +106,7 @@
  */
 
 #undef HAVE_NSH_COMMAND
-#if (defined(CONFIG_SYSTEM_SYSTEM) || defined(CONFIG_SYSTEM_POPEN)) && \
-     defined(CONFIG_BUILD_LOADABLE)
+#if defined(CONFIG_SYSTEM_SYSTEM) || defined(CONFIG_SYSTEM_POPEN)
 #  define HAVE_NSH_COMMAND 1
 #endif
 
@@ -285,7 +284,7 @@ int nsh_main(int argc, char *argv[])
    * 2) As a single command processor.  In this case, the single command is
    *    is provided in argv[1].
    *
-   * NOTE:  The latter mode is only available if CONFIG_BUILD_LOADABLE=y.
+   * NOTE:  The latter mode is only available if CONFIG_SYSTEM_NSH=m.
    * In that case, this main() function will be built as a process.  The
    * process will be started with a command by the implementations of the
    * system() and popen() interfaces.
diff --git a/system/popen/Kconfig b/system/popen/Kconfig
index 4e8ee15bd..9d4814bbb 100644
--- a/system/popen/Kconfig
+++ b/system/popen/Kconfig
@@ -18,7 +18,7 @@ if SYSTEM_POPEN
 config SYSTEM_POPEN_SHPATH
 	string "Path to shell command"
 	default "/bin/nsh"
-	depends on BUILD_LOADABLE
+	depends on SYSTEM_NSH=m
 	---help---
 		This is the full path to the program in a mounted file system that
 		implements the system() command.  That is, a program that starts the
diff --git a/system/popen/popen.c b/system/popen/popen.c
index a8789eb14..e70064b0e 100644
--- a/system/popen/popen.c
+++ b/system/popen/popen.c
@@ -261,7 +261,7 @@ FILE *popen(FAR const char *command, FAR const char *mode)
   argv[0] = (FAR char *)command;
   argv[1] = NULL;
 
-#ifdef CONFIG_BUILD_LOADABLE
+#ifdef CONFIG_SYSTEM_POPEN_SHPATH
   errcode = posix_spawn(&container->shell, CONFIG_SYSTEM_POPEN_SHPATH,
                         &file_actions, &attr, argv,
                         (FAR char * const *)NULL);
diff --git a/system/system/Kconfig b/system/system/Kconfig
index d4099b6f3..246119716 100644
--- a/system/system/Kconfig
+++ b/system/system/Kconfig
@@ -17,7 +17,7 @@ if SYSTEM_SYSTEM
 config SYSTEM_SYSTEM_SHPATH
 	string "Path to shell command"
 	default "/bin/nsh"
-	depends on BUILD_LOADABLE
+	depends on SYSTEM_NSH=m
 	---help---
 		This is the full path to the program in a mounted file system that
 		implements the system() command.  That is, a program that starts the
diff --git a/system/system/system.c b/system/system/system.c
index 044382612..82dbdde7a 100644
--- a/system/system/system.c
+++ b/system/system/system.c
@@ -144,7 +144,7 @@ int system(FAR const char *cmd)
   argv[0] = (FAR char *)cmd;
   argv[1] = NULL;
 
-#ifdef CONFIG_BUILD_LOADABLE
+#ifdef CONFIG_SYSTEM_SYSTEM_SHPATH
   errcode = posix_spawn(&pid, CONFIG_SYSTEM_SYSTEM_SHPATH,  NULL, &attr,
                         argv, (FAR char * const *)NULL);
 #else
diff --git a/system/usbmsc/README.txt b/system/usbmsc/README.txt
index 6cd5647d3..04c68fdda 100644
--- a/system/usbmsc/README.txt
+++ b/system/usbmsc/README.txt
@@ -79,4 +79,4 @@ system/usbmsc
   it relies on internal OS interfaces that are not normally available to a
   user-space program.  As a result, this add-on cannot be used if a
   NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
-  or CONFIG_BUILD_LOADABLE).
+  or CONFIG_BUILD_KERNEL).