Rename LIB_ to LIBC_ for all libc Kconfig

follow other libc component naming convention Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2021-08-01 15:27:08 +08:00 · 2021-08-01 15:27:08 +08:00 · 5025fbef8d
commit 5025fbef8d
parent a3986eeba3
222 changed files with 327 additions and 327 deletions
--- a/Documentation/applications/nsh/commands.rst
+++ b/Documentation/applications/nsh/commands.rst
@ -193,7 +193,7 @@ Also sets the previous working directory environment variable
 ``cd -``            sets the current working directory to the previous
                    working directory ($OLDPWD). Equivalent to cd $OLDPWD.
 ``cd`` or ``cd ~``  set the current working directory to the 'home' directory.
-                    The home directory can be configured by setting CONFIG_LIB_HOMEDIR
+                    The home directory can be configured by setting CONFIG_LIBC_HOMEDIR
                    in the configuration file. The default home directory is /.
 ``cd ..`` 	        sets the current working directory to the parent directory.
 ==================  =====================================
--- a/Documentation/components/binfmt.rst
+++ b/Documentation/components/binfmt.rst
@ -180,7 +180,7 @@ Basic module management
    The ``filename`` field will be used
    in order to locate the module to be loaded from the file system.
    The filename must be the full, absolute path to the file to be executed
-    unless ``CONFIG_LIB_ENVPATH`` is defined. In that case, filename may be
+    unless ``CONFIG_LIBC_ENVPATH`` is defined. In that case, filename may be
    a relative path; a set of candidate absolute paths will be generated using
    the ``PATH`` environment variable and ``load_module()`` will attempt to load each
    file that is found at those absolute paths.
--- a/Documentation/reference/os/wqueue.rst
+++ b/Documentation/reference/os/wqueue.rst
@ -159,11 +159,11 @@ depend on internal, kernel-space facilities.

 **Configuration Options**.

-  ``CONFIG_LIB_USRWORK``. If CONFIG_LIB_USRWORK is also defined
+-  ``CONFIG_LIBC_USRWORK``. If CONFIG_LIBC_USRWORK is also defined
   then the user-mode work queue will be enabled.
-  ``CONFIG_LIB_USRWORKPRIORITY``. The execution priority of the
+-  ``CONFIG_LIBC_USRWORKPRIORITY``. The execution priority of the
   user-mode priority worker thread. Default: 100
-  ``CONFIG_LIB_USRWORKSTACKSIZE``. The stack size allocated for
+-  ``CONFIG_LIBC_USRWORKSTACKSIZE``. The stack size allocated for
   the lower priority worker thread. Default: 2048.


--- a/Documentation/reference/user/01_task_control.rst
+++ b/Documentation/reference/user/01_task_control.rst
@ -405,7 +405,7 @@ Functions
  exits.

  :param filename: The path to the program to be executed. If
-     ``CONFIG_LIB_ENVPATH`` is defined in the configuration, then this may
+     ``CONFIG_LIBC_ENVPATH`` is defined in the configuration, then this may
     be a relative path from the current working directory. Otherwise,
     ``path`` must be the absolute path to the program.
  :param argv: A pointer to an array of string arguments. The end of the
@ -469,7 +469,7 @@ Functions
  task.

  :param path: The path to the program to be executed. If
-     ``CONFIG_LIB_ENVPATH`` is defined in the configuration, then this may
+     ``CONFIG_LIBC_ENVPATH`` is defined in the configuration, then this may
     be a relative path from the current working directory. Otherwise,
  :param path: must be the absolute path to the program.

@ -489,7 +489,7 @@ Functions
  information.

  :param path: The path to the program to be executed. If
-     ``CONFIG_LIB_ENVPATH`` is defined in the configuration, then this may
+     ``CONFIG_LIBC_ENVPATH`` is defined in the configuration, then this may
     be a relative path from the current working directory. Otherwise,
  :param path: must be the absolute path to the program.

@ -530,7 +530,7 @@ Functions
    variable PATH.

    NOTE: NuttX provides only one implementation: If
-    ``CONFIG_LIB_ENVPATH`` is defined, then only ``posix_spawnp()``
+    ``CONFIG_LIBC_ENVPATH`` is defined, then only ``posix_spawnp()``
    behavior is supported; otherwise, only ``posix_spawn`` behavior is
    supported.

@ -584,8 +584,8 @@ Functions
  **Assumptions/Limitations:**

  -  NuttX provides only ``posix_spawn()`` or ``posix_spawnp()`` behavior
-     depending upon the setting of ``CONFIG_LIB_ENVPATH``: If
-     ``CONFIG_LIB_ENVPATH`` is defined, then only ``posix_spawnp()``
+     depending upon the setting of ``CONFIG_LIBC_ENVPATH``: If
+     ``CONFIG_LIBC_ENVPATH`` is defined, then only ``posix_spawnp()``
     behavior is supported; otherwise, only ``posix_spawn()`` behavior is
     supported.
  -  The ``envp`` argument is not used and the ``environ`` variable is not
--- a/4
+++ b/4
@ -19705,7 +19705,7 @@ Additional new features and extended functionality:
        stack info is very useful to find the backtrace  From Xiang Xiao.
      - binfmt/ and libs/libc:  Make exepath_*() more common:  Move
        exepath_*() related code to libc/misc, rename exepath_ to envpath_,
-        and rename BINFMT_EXEPATH to LIB_ENVPATH.  From nchao.
+        and rename BINFMT_EXEPATH to LIBC_ENVPATH.  From nchao.
      - CLOCK:  Support CLOCK_MONOTONIC in clock_getres.c.  From Xiang Xiao.
      - Clock Timekeeping:  Use clock_basetime() to initialize
        g_clock_wall_time to get the best initial RTC value and initialize
@ -22222,7 +22222,7 @@ Additional new features and extended functionality:
      - strsep():  Add strsep BSD/Linux function.  From Xiang Xiao.
      - netdb:  Hostname support no longer depends on CONFIG_NET since the
        host name is also useful in the non-network environment.
-        CONFIG_NET_HOSTNAME changed to CONFIG_LIB_HOSTNAME.  From Xiang Xiao.
+        CONFIG_NET_HOSTNAME changed to CONFIG_LIBC_HOSTNAME.  From Xiang Xiao.
      - netdb:  Support the nameserver change notification then we can pass
        DNS info from server to client in usrsock case.  From Xiang Xiao.
      - include/fixedmath.h:  Add macros for conversion between types
--- a/binfmt/Kconfig
+++ b/binfmt/Kconfig
@ -15,7 +15,7 @@ if !BINFMT_DISABLE
 config PATH_INITIAL
 	string "Initial PATH Value"
 	default ""
-	depends on LIB_ENVPATH
+	depends on LIBC_ENVPATH
 	---help---
 		The initial value of the PATH variable.  This is the colon-separated
 		list of absolute paths.  E.g., "/bin:/usr/bin:/sbin"
--- a/binfmt/binfmt_exec.c
+++ b/binfmt/binfmt_exec.c
@ -49,7 +49,7 @@
 *
 * Input Parameters:
 *   filename - The path to the program to be executed. If
- *              CONFIG_LIB_ENVPATH is defined in the configuration, then
+ *              CONFIG_LIBC_ENVPATH is defined in the configuration, then
 *              this may be a relative path from the current working
 *              directory. Otherwise, path must be the absolute path to the
 *              program.
@ -204,7 +204,7 @@ errout:
 *
 * Input Parameters:
 *   filename - The path to the program to be executed. If
- *              CONFIG_LIB_ENVPATH is defined in the configuration, then
+ *              CONFIG_LIBC_ENVPATH is defined in the configuration, then
 *              this may be a relative path from the current working
 *              directory. Otherwise, path must be the absolute path to the
 *              program.
--- a/binfmt/binfmt_loadmodule.c
+++ b/binfmt/binfmt_loadmodule.c
@ -178,7 +178,7 @@ int load_module(FAR struct binary_s *bin, FAR const char *filename,
       * be loaded?  Absolute paths start with '/'.
       */

-#ifdef CONFIG_LIB_ENVPATH
+#ifdef CONFIG_LIBC_ENVPATH
      if (filename[0] != '/')
        {
          FAR char *fullpath;
--- a/boards/arm/cxd56xx/spresense/configs/elf/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/elf/defconfig
@ -33,8 +33,8 @@ CONFIG_FS_PROCFS=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_ROMFS=y
 CONFIG_HAVE_CXX=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIB_BOARDCTL=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=1572864
--- a/boards/arm/cxd56xx/spresense/configs/module/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/module/defconfig
@ -31,9 +31,9 @@ CONFIG_FS_PROCFS=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_ROMFS=y
 CONFIG_HAVE_CXX=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIB_BOARDCTL=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_MODULE=y
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
--- a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig
@ -35,9 +35,9 @@ CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_ROMFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIB_BOARDCTL=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=1572864
--- a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
@ -60,8 +60,8 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_I2C=y
 CONFIG_IOB_NBUFFERS=128
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_MEMCPY_VIK=y
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
--- a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
@ -62,8 +62,8 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_I2C=y
 CONFIG_IOB_NBUFFERS=128
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_MEMCPY_VIK=y
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
--- a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
@ -74,8 +74,8 @@ CONFIG_I2C=y
 CONFIG_LCD=y
 CONFIG_LCD_ILI9340=y
 CONFIG_LCD_ILI9340_IFACE0=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_MEMCPY_VIK=y
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
--- a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
@ -77,8 +77,8 @@ CONFIG_I2C=y
 CONFIG_LCD=y
 CONFIG_LCD_ILI9340=y
 CONFIG_LCD_ILI9340_IFACE0=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_MEMCPY_VIK=y
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
--- a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
@ -42,8 +42,8 @@ CONFIG_IMX6_UART1=y
 CONFIG_IMX_DDR_SIZE=1073741824
 CONFIG_IMX_ENET_NTXBUFFERS=1
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDB_DNSCLIENT_ENTRIES=4
--- a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig
@ -42,8 +42,8 @@ CONFIG_IMX6_UART1=y
 CONFIG_IMX_DDR_SIZE=1073741824
 CONFIG_IMX_ENET_NTXBUFFERS=1
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDB_DNSCLIENT_ENTRIES=4
--- a/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig
@ -39,9 +39,9 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IMX6_UART1=y
 CONFIG_IMX_DDR_SIZE=1073741824
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIB_BOARDCTL=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PL310_LOCKDOWN_BY_LINE=y
 CONFIG_PL310_LOCKDOWN_BY_MASTER=y
--- a/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig
@ -25,7 +25,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_IMXRT_ENET=y
 CONFIG_IMXRT_LPUART1=y
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_HOSTNAME="i.MXRT1050 EVK"
+CONFIG_LIBC_HOSTNAME="i.MXRT1050 EVK"
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_NET=y
 CONFIG_NETDEV_STATISTICS=y
--- a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
@ -101,7 +101,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig
@ -26,7 +26,7 @@ CONFIG_IMXRT_ENET=y
 CONFIG_IMXRT_LPUART1=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_NBUFFERS=128
-CONFIG_LIB_HOSTNAME="i.MXRT1060 EVK"
+CONFIG_LIBC_HOSTNAME="i.MXRT1060 EVK"
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
--- a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
@ -101,7 +101,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/imxrt/imxrt1064-evk/configs/netnsh/defconfig
+++ b/boards/arm/imxrt/imxrt1064-evk/configs/netnsh/defconfig
@ -26,7 +26,7 @@ CONFIG_IMXRT_ENET=y
 CONFIG_IMXRT_LPUART1=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_NBUFFERS=128
-CONFIG_LIB_HOSTNAME="i.MXRT1060 EVK"
+CONFIG_LIBC_HOSTNAME="i.MXRT1060 EVK"
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
--- a/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
@ -104,7 +104,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig
@ -28,7 +28,7 @@ CONFIG_IMXRT_ENET=y
 CONFIG_IMXRT_LPUART1=y
 CONFIG_IMXRT_USBDEV=y
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_HOSTNAME="Teensy 4.x"
+CONFIG_LIBC_HOSTNAME="Teensy 4.x"
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDEV_STATISTICS=y
--- a/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig
@ -68,10 +68,10 @@ CONFIG_LCD_FRAMEBUFFER=y
 CONFIG_LCD_PORTRAIT=y
 CONFIG_LCD_ST7789=y
 CONFIG_LIBC_DLFCN=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_HOSTNAME="Teensy 4.x"
 CONFIG_LIBC_STRERROR=y
-CONFIG_LIB_ENVPATH=y
-CONFIG_LIB_HOSTNAME="Teensy 4.x"
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
--- a/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
@ -104,7 +104,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig
+++ b/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig
@ -25,7 +25,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_KINETIS_ENET=y
 CONFIG_KINETIS_ENET_MDIOPULLUP=y
 CONFIG_KINETIS_UART0=y
-CONFIG_LIB_HOSTNAME="Freedom-K64F"
+CONFIG_LIBC_HOSTNAME="Freedom-K64F"
 CONFIG_MOTOROLA_SREC=y
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDEV_PHY_IOCTL=y
--- a/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig
+++ b/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig
@ -35,7 +35,7 @@ CONFIG_KINETIS_PORTAINTS=y
 CONFIG_KINETIS_PORTDINTS=y
 CONFIG_KINETIS_UART1=y
 CONFIG_KINETIS_UART4=y
-CONFIG_LIB_HOSTNAME="Freedom-K66F"
+CONFIG_LIBC_HOSTNAME="Freedom-K66F"
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_STATISTICS=y
--- a/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig
+++ b/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig
@ -26,7 +26,7 @@ CONFIG_KINETIS_GPIOIRQ=y
 CONFIG_KINETIS_PORTBINTS=y
 CONFIG_KINETIS_SDHC=y
 CONFIG_KINETIS_UART1=y
-CONFIG_LIB_HOSTNAME="TWRK64"
+CONFIG_LIBC_HOSTNAME="TWRK64"
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_NETINIT_DRIPADDR=0xc0a800fe
--- a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig
@ -63,8 +63,8 @@ CONFIG_LC823450_SPI_DMA=y
 CONFIG_LC823450_UART0=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
+CONFIG_LIBC_KBDCODEC=y
 CONFIG_LIBM=y
-CONFIG_LIB_KBDCODEC=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_MTD=y
--- a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
@ -70,8 +70,8 @@ CONFIG_LC823450_UART1=y
 CONFIG_LC823450_XGEVK_BTPOWER=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
+CONFIG_LIBC_KBDCODEC=y
 CONFIG_LIBM=y
-CONFIG_LIB_KBDCODEC=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_MTD=y
--- a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig
@ -31,10 +31,10 @@ CONFIG_FS_ROMFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LC823450_UART0=y
+CONFIG_LIBC_ENVPATH=y
+CONFIG_LIBC_KBDCODEC=y
 CONFIG_LIBM=y
 CONFIG_LIB_BOARDCTL=y
-CONFIG_LIB_ENVPATH=y
-CONFIG_LIB_KBDCODEC=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_NAME_MAX=765
 CONFIG_NETUTILS_CODECS=y
--- a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig
@ -45,8 +45,8 @@ CONFIG_LC823450_UART0=y
 CONFIG_LC823450_WDT=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
+CONFIG_LIBC_KBDCODEC=y
 CONFIG_LIBM=y
-CONFIG_LIB_KBDCODEC=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NAME_MAX=765
--- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
@ -74,10 +74,10 @@ CONFIG_LC823450_SPI_DMA=y
 CONFIG_LC823450_UART0=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_KBDCODEC=y
 CONFIG_LIBM=y
-CONFIG_LIB_ENVPATH=y
-CONFIG_LIB_KBDCODEC=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_MTD=y
--- a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig
@ -50,8 +50,8 @@ CONFIG_LC823450_UART0=y
 CONFIG_LC823450_WDT=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
+CONFIG_LIBC_KBDCODEC=y
 CONFIG_LIBM=y
-CONFIG_LIB_KBDCODEC=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NAME_MAX=765
--- a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig
@ -29,11 +29,11 @@ CONFIG_FS_PROCFS=y
 CONFIG_FS_ROMFS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LC823450_UART0=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_KBDCODEC=y
 CONFIG_LIBM=y
 CONFIG_LIB_BOARDCTL=y
-CONFIG_LIB_ENVPATH=y
-CONFIG_LIB_KBDCODEC=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_NAME_MAX=765
 CONFIG_NETUTILS_CODECS=y
--- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
@ -70,10 +70,10 @@ CONFIG_LC823450_SPI_DMA=y
 CONFIG_LC823450_UART0=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_KBDCODEC=y
 CONFIG_LIBM=y
-CONFIG_LIB_ENVPATH=y
-CONFIG_LIB_KBDCODEC=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_MTD=y
--- a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig
@ -59,8 +59,8 @@ CONFIG_LC823450_UART1=y
 CONFIG_LC823450_WDT=y
 CONFIG_LCD=y
 CONFIG_LCD_ST7565=y
+CONFIG_LIBC_KBDCODEC=y
 CONFIG_LIBM=y
-CONFIG_LIB_KBDCODEC=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_MTD=y
--- a/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c
+++ b/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c
@ -102,7 +102,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
@ -101,7 +101,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
@ -101,7 +101,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig
@ -65,8 +65,8 @@ CONFIG_FS_UNIONFS=y
 CONFIG_I2C=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_DLFCN=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_STRERROR=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_LPC17_40_CAN2=y
 CONFIG_LPC17_40_CAN2_BAUD=1000000
 CONFIG_LPC17_40_CAN2_DIVISOR=2
--- a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
@ -101,7 +101,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
@ -101,7 +101,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig
@ -34,9 +34,9 @@ CONFIG_FS_FAT=y
 CONFIG_FS_PROCFS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_NBUFFERS=24
+CONFIG_LIBC_HOSTNAME="c027"
 CONFIG_LIBC_STRERROR=y
 CONFIG_LIBC_STRERROR_SHORT=y
-CONFIG_LIB_HOSTNAME="c027"
 CONFIG_LPC17_40_EMACRAM_SIZE=7296
 CONFIG_LPC17_40_ETHERNET=y
 CONFIG_LPC17_40_ETH_NRXDESC=6
--- a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig
+++ b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig
@ -18,8 +18,8 @@ CONFIG_BOARD_LOOPSPERMSEC=18535
 CONFIG_BUILTIN=y
 CONFIG_DISCOVER_DESCR="BAMBINO"
 CONFIG_FS_PROCFS=y
+CONFIG_LIBC_HOSTNAME="Bambino-200E"
 CONFIG_LIBM=y
-CONFIG_LIB_HOSTNAME="Bambino-200E"
 CONFIG_LPC43_BOOT_SPIFI=y
 CONFIG_LPC43_ETHERNET=y
 CONFIG_LPC43_PHYADDR=0
--- a/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c
+++ b/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c
@ -102,7 +102,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig
@ -23,7 +23,7 @@ CONFIG_FS_PROCFS=y
 CONFIG_INPUT=y
 CONFIG_INPUT_BUTTONS=y
 CONFIG_INPUT_BUTTONS_LOWER=y
-CONFIG_LIB_HOSTNAME="LpcXpresso-Lpc54628"
+CONFIG_LIBC_HOSTNAME="LpcXpresso-Lpc54628"
 CONFIG_LPC54_EMC=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0_SIZE=0x01000000
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
@ -31,7 +31,7 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INPUT=y
 CONFIG_INPUT_FT5X06=y
-CONFIG_LIB_HOSTNAME="LPCXpresso-LPC54628"
+CONFIG_LIBC_HOSTNAME="LPCXpresso-LPC54628"
 CONFIG_LPC54_EMC=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET=0x00080000
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
@ -31,7 +31,7 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INPUT=y
 CONFIG_INPUT_FT5X06=y
-CONFIG_LIB_HOSTNAME="LPCXpresso-LPC54628"
+CONFIG_LIBC_HOSTNAME="LPCXpresso-LPC54628"
 CONFIG_LPC54_EMC=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0=y
 CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET=0x00080000
--- a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
+++ b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
@ -101,7 +101,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/sam34/sam4l-xplained/README.txt
+++ b/boards/arm/sam34/sam4l-xplained/README.txt
@ -649,7 +649,7 @@ Configuration sub-directories
         CONFIG_LCD_MAXCONTRAST=63

       Library Routines -> Non-standard Library Support
-         CONFIG_LIB_SLCDCODEC=y
+         CONFIG_LIBC_SLCDCODEC=y

       The SLCD example can be enabled to verify the SLCD:

--- a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
+++ b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
@ -59,8 +59,8 @@

 /* Configuration ************************************************************/

-#ifndef CONFIG_LIB_SLCDCODEC
-#  error This SLCD driver requires CONFIG_LIB_SLCDCODEC
+#ifndef CONFIG_LIBC_SLCDCODEC
+#  error This SLCD driver requires CONFIG_LIBC_SLCDCODEC
 #endif

 #if !defined(CONFIG_SAM34_OSC32K) && !defined(CONFIG_SAM34_RC32K)
--- a/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig
@ -26,7 +26,7 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_HEX2BIN=y
+CONFIG_LIBC_HEX2BIN=y
 CONFIG_MTD=y
 CONFIG_MTD_AT25=y
 CONFIG_PREALLOC_TIMERS=4
--- a/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig
@ -26,7 +26,7 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_HEX2BIN=y
+CONFIG_LIBC_HEX2BIN=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x00200000
--- a/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig
@ -52,7 +52,7 @@ CONFIG_I2C_RESET=y
 CONFIG_INPUT=y
 CONFIG_INPUT_MXT=y
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_HOSTNAME="SAMA5D4-EK"
+CONFIG_LIBC_HOSTNAME="SAMA5D4-EK"
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
--- a/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig
@ -50,7 +50,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_BUFSIZE=128
 CONFIG_IOB_NBUFFERS=32
 CONFIG_IOB_NCHAINS=16
-CONFIG_LIB_HOSTNAME="MRF24J40-Hub"
+CONFIG_LIBC_HOSTNAME="MRF24J40-Hub"
 CONFIG_MAC802154_NTXDESC=32
 CONFIG_MTD=y
 CONFIG_MTD_AT24XX=y
--- a/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig
@ -40,7 +40,7 @@ CONFIG_FS_PROCFS=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_I2CTOOL_MAXBUS=0
 CONFIG_IOB_NBUFFERS=24
-CONFIG_LIB_HOSTNAME="SAME70-Xplained"
+CONFIG_LIBC_HOSTNAME="SAME70-Xplained"
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MTD=y
--- a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig
@ -41,7 +41,7 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_I2C_DRIVER=y
 CONFIG_IOB_NBUFFERS=24
-CONFIG_LIB_HOSTNAME="SAME70-Xplained"
+CONFIG_LIBC_HOSTNAME="SAME70-Xplained"
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_REGIONS=2
--- a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
+++ b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
@ -101,7 +101,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
@ -50,7 +50,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_BUFSIZE=128
 CONFIG_IOB_NBUFFERS=32
 CONFIG_IOB_NCHAINS=16
-CONFIG_LIB_HOSTNAME="MRF24J40-Hub"
+CONFIG_LIBC_HOSTNAME="MRF24J40-Hub"
 CONFIG_MAC802154_NTXDESC=32
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
--- a/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig
@ -40,7 +40,7 @@ CONFIG_FS_FAT=y
 CONFIG_FS_PROCFS=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_I2CTOOL_MAXBUS=0
-CONFIG_LIB_HOSTNAME="SAMV71-XULT"
+CONFIG_LIBC_HOSTNAME="SAMV71-XULT"
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MTD=y
--- a/boards/arm/samv7/samv71-xult/configs/vnc/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig
@ -46,7 +46,7 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_I2C_DRIVER=y
 CONFIG_IOB_NBUFFERS=72
 CONFIG_IOB_THROTTLE=32
-CONFIG_LIB_HOSTNAME="SAMV71-XULT"
+CONFIG_LIBC_HOSTNAME="SAMV71-XULT"
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MQ_MAXMSGSIZE=64
--- a/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
@ -47,8 +47,8 @@ CONFIG_I2C_DRIVER=y
 CONFIG_IOB_NBUFFERS=72
 CONFIG_IOB_THROTTLE=32
 CONFIG_LIBC_FLOATINGPOINT=y
+CONFIG_LIBC_HOSTNAME="SAMV71-XULT"
 CONFIG_LIBM=y
-CONFIG_LIB_HOSTNAME="SAMV71-XULT"
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MQ_MAXMSGSIZE=64
--- a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
+++ b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
@ -101,7 +101,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
@ -59,7 +59,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_BUFSIZE=128
 CONFIG_IOB_NBUFFERS=32
 CONFIG_IOB_NCHAINS=16
-CONFIG_LIB_HOSTNAME="MRF24J40"
+CONFIG_LIBC_HOSTNAME="MRF24J40"
 CONFIG_MAC802154_NTXDESC=32
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig
@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_BUFSIZE=128
 CONFIG_IOB_NBUFFERS=32
 CONFIG_IOB_NCHAINS=16
-CONFIG_LIB_HOSTNAME="MRF24J40"
+CONFIG_LIBC_HOSTNAME="MRF24J40"
 CONFIG_MAC802154_NTXDESC=32
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
@ -59,7 +59,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_BUFSIZE=128
 CONFIG_IOB_NBUFFERS=32
 CONFIG_IOB_NCHAINS=16
-CONFIG_LIB_HOSTNAME="MRF24J40"
+CONFIG_LIBC_HOSTNAME="MRF24J40"
 CONFIG_MAC802154_NTXDESC=32
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
--- a/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig
@ -57,7 +57,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_BUFSIZE=128
 CONFIG_IOB_NBUFFERS=32
 CONFIG_IOB_NCHAINS=16
-CONFIG_LIB_HOSTNAME="XBee"
+CONFIG_LIBC_HOSTNAME="XBee"
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NETDEV_LATEINIT=y
--- a/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c
@ -102,7 +102,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/stm32/et-stm32-stamp/configs/nsh/defconfig
+++ b/boards/arm/stm32/et-stm32-stamp/configs/nsh/defconfig
@ -15,7 +15,7 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_BOARD_LOOPSPERMSEC=5483
 CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
-CONFIG_LIB_RAND_ORDER=2
+CONFIG_LIBC_RAND_ORDER=2
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_LINELEN=80
--- a/boards/arm/stm32/maple/configs/nsh/defconfig
+++ b/boards/arm/stm32/maple/configs/nsh/defconfig
@ -31,7 +31,7 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_BOARD_LOOPSPERMSEC=5483
 CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
-CONFIG_LIB_RAND_ORDER=2
+CONFIG_LIBC_RAND_ORDER=2
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_LINELEN=80
--- a/boards/arm/stm32/maple/configs/nx/defconfig
+++ b/boards/arm/stm32/maple/configs/nx/defconfig
@ -44,7 +44,7 @@ CONFIG_EXAMPLES_NX_BPP=1
 CONFIG_I2C=y
 CONFIG_LCD=y
 CONFIG_LCD_SHARP_MEMLCD=y
-CONFIG_LIB_RAND_ORDER=2
+CONFIG_LIBC_RAND_ORDER=2
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
--- a/boards/arm/stm32/maple/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/maple/configs/usbnsh/defconfig
@ -37,7 +37,7 @@ CONFIG_CDCACM_RXBUFSIZE=256
 CONFIG_CDCACM_TXBUFSIZE=256
 CONFIG_DEFAULT_SMALL=y
 CONFIG_I2C=y
-CONFIG_LIB_RAND_ORDER=2
+CONFIG_LIBC_RAND_ORDER=2
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_LINELEN=80
--- a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
@ -101,7 +101,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig
@ -31,8 +31,8 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_HAVE_CXX=y
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIB_BOARDCTL=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_MM_KERNEL_HEAPSIZE=16384
 CONFIG_MM_REGIONS=2
 CONFIG_NUTTX_USERSPACE=0x08020000
--- a/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c
@ -102,7 +102,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig
+++ b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig
@ -51,7 +51,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_NBUFFERS=24
 CONFIG_IOB_NCHAINS=8
-CONFIG_LIB_HOSTNAME="omnibusf4"
+CONFIG_LIBC_HOSTNAME="omnibusf4"
 CONFIG_M25P_SPIFREQUENCY=75000000
 CONFIG_MMCSD=y
 CONFIG_MM_IOB=y
--- a/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c
@ -119,7 +119,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig
@ -36,8 +36,8 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LCD=y
 CONFIG_LCD_MAXCONTRAST=1
 CONFIG_LCD_NOGETRUN=y
+CONFIG_LIBC_USRWORK=y
 CONFIG_LIB_BOARDCTL=y
-CONFIG_LIB_USRWORK=y
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NUTTX_USERSPACE=0x08040000
--- a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
@ -101,7 +101,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig
+++ b/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig
@ -36,9 +36,9 @@ CONFIG_FS_FAT=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_HOSTNAME="butterfly2"
 CONFIG_LIBC_STRERROR=y
 CONFIG_LIBC_STRERROR_SHORT=y
-CONFIG_LIB_HOSTNAME="butterfly2"
 CONFIG_MMCSD=y
 CONFIG_NET=y
 CONFIG_NETINIT_DRIPADDR=0x0a010101
--- a/boards/arm/stm32/stm32f4discovery/README.txt
+++ b/boards/arm/stm32/stm32f4discovery/README.txt
@ -2327,7 +2327,7 @@ Configuration Sub-directories
       Further, the configuration assumes that executable files reside on the
       remotely mounted file system:

-       CONFIG_LIB_ENVPATH=y
+       CONFIG_LIBC_ENVPATH=y
       CONFIG_PATH_INITIAL="/mnt/nfs/bin"

    3 'ping' support
--- a/boards/arm/stm32/stm32f4discovery/configs/adb/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/adb/defconfig
@ -40,11 +40,11 @@ CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBUV=y
 CONFIG_LIBUV_PIPE=y
 CONFIG_LIBUV_STREAM=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_MMCSD=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
--- a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig
@ -25,8 +25,8 @@ CONFIG_EXAMPLES_ELF=y
 CONFIG_FS_ROMFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIB_BOARDCTL=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_MM_REGIONS=2
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
--- a/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig
@ -38,7 +38,7 @@ CONFIG_IOB_BUFSIZE=80
 CONFIG_IOB_NBUFFERS=64
 CONFIG_IOB_NCHAINS=16
 CONFIG_IOB_THROTTLE=16
-CONFIG_LIB_HOSTNAME="STM32F4-Discovery"
+CONFIG_LIBC_HOSTNAME="STM32F4-Discovery"
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NETDEV_LATEINIT=y
--- a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig
@ -31,7 +31,7 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_HOSTNAME="STM32F4-Discovery"
+CONFIG_LIBC_HOSTNAME="STM32F4-Discovery"
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
--- a/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig
@ -31,7 +31,7 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_HOSTNAME="STM32F4-Discovery"
+CONFIG_LIBC_HOSTNAME="STM32F4-Discovery"
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
--- a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig
@ -26,9 +26,9 @@ CONFIG_EXECFUNCS_SYMTAB_ARRAY="g_spawn_exports"
 CONFIG_FS_ROMFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIB_BOARDCTL=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_MM_REGIONS=2
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
--- a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig
@ -34,8 +34,8 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x0
--- a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig
@ -40,8 +40,8 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HEAP_COLORATION=y
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
-CONFIG_LIB_ENVPATH=y
 CONFIG_MMCSD=y
 CONFIG_MM_REGIONS=2
 CONFIG_NET=y
--- a/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c
@ -102,7 +102,7 @@ const struct userspace_s userspace locate_data(".userspace") =

  /* User-space work queue support (declared in include/nuttx/wqueue.h) */

-#ifdef CONFIG_LIB_USRWORK
+#ifdef CONFIG_LIBC_USRWORK
  .work_usrstart    = work_usrstart,
 #endif
 };
--- a/boards/arm/stm32/stm32ldiscovery/README.txt
+++ b/boards/arm/stm32/stm32ldiscovery/README.txt
@ -527,7 +527,7 @@ Configuration sub-directories
         CONFIG_ARCH_LEDS=n                      : Disable board LED support

       Library Routines:
-         CONFIG_LIB_SLCDCODEC=y                  : Enable the SLCD CODEC
+         CONFIG_LIBC_SLCDCODEC=y                  : Enable the SLCD CODEC

       System Type -> STM32 Peripheral Support:
         CONFIG_STM32_LCD=y                      : Enable the Segment LCD
--- a/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig
+++ b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig
@ -33,7 +33,7 @@ CONFIG_INPUT_BUTTONS=y
 CONFIG_INPUT_BUTTONS_LOWER=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LCD=y
-CONFIG_LIB_SLCDCODEC=y
+CONFIG_LIBC_SLCDCODEC=y
 CONFIG_LWL_CONSOLE=y
 CONFIG_MM_SMALL=y
 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
--- a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
@ -67,8 +67,8 @@

 /* Define CONFIG_DEBUG_LCD_INFO to enable detailed LCD debug output. */

-#ifndef CONFIG_LIB_SLCDCODEC
-#  error "This SLCD driver requires CONFIG_LIB_SLCDCODEC"
+#ifndef CONFIG_LIBC_SLCDCODEC
+#  error "This SLCD driver requires CONFIG_LIBC_SLCDCODEC"
 #endif

 /* The ever-present MIN/MAX macros ******************************************/
--- a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig
+++ b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig
@ -22,7 +22,7 @@ CONFIG_FS_PROCFS=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_NBUFFERS=24
-CONFIG_LIB_HOSTNAME="Viewtool-STM32F107"
+CONFIG_LIBC_HOSTNAME="Viewtool-STM32F107"
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDB_DNSSERVER_NOADDR=y
--- a/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig
+++ b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig
@ -23,7 +23,7 @@ CONFIG_FS_PROCFS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_IOB_NBUFFERS=50
 CONFIG_IOB_NCHAINS=12
-CONFIG_LIB_HOSTNAME="Viewtool-STM32F107"
+CONFIG_LIBC_HOSTNAME="Viewtool-STM32F107"
 CONFIG_NET=y
 CONFIG_NETINIT_NOMAC=y
 CONFIG_NETINIT_THREAD=y
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig
+++ b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig
@ -26,7 +26,7 @@ CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_TMPFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
-CONFIG_LIB_HOSTNAME="stntest"
+CONFIG_LIBC_HOSTNAME="stntest"
 CONFIG_MM_REGIONS=3
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
--- a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig
@ -27,7 +27,7 @@ CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_HOSTNAME="stntest"
+CONFIG_LIBC_HOSTNAME="stntest"
 CONFIG_MM_REGIONS=3
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
--- a/Show More
+++ b/Show More