diff --git a/Documentation/applications/nsh/commands.rst b/Documentation/applications/nsh/commands.rst index cb91899b398..a0463881599 100644 --- 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. ================== ===================================== diff --git a/Documentation/components/binfmt.rst b/Documentation/components/binfmt.rst index e86c0ee1348..9b692b7d6a1 100644 --- 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. diff --git a/Documentation/reference/os/wqueue.rst b/Documentation/reference/os/wqueue.rst index c3fc95489a8..405f259c0ab 100644 --- 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. diff --git a/Documentation/reference/user/01_task_control.rst b/Documentation/reference/user/01_task_control.rst index b3d0c90d9bb..81b33072fd8 100644 --- 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 diff --git a/ReleaseNotes b/ReleaseNotes index dcd1605faef..d77109d3010 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -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 diff --git a/binfmt/Kconfig b/binfmt/Kconfig index 22c3df5eb5b..594a0db13ba 100644 --- 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" diff --git a/binfmt/binfmt_exec.c b/binfmt/binfmt_exec.c index c8900d4e694..5bac3a5e736 100644 --- 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. diff --git a/binfmt/binfmt_loadmodule.c b/binfmt/binfmt_loadmodule.c index 700ddc83678..3816a7ea9a0 100644 --- 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; diff --git a/boards/arm/cxd56xx/spresense/configs/elf/defconfig b/boards/arm/cxd56xx/spresense/configs/elf/defconfig index a91441ad7ab..b0d32bef980 100644 --- 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 diff --git a/boards/arm/cxd56xx/spresense/configs/module/defconfig b/boards/arm/cxd56xx/spresense/configs/module/defconfig index 7273323d9ce..5134063f5cb 100644 --- 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 diff --git a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig index 42aefac60b3..11ebaee3dfa 100644 --- 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 diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig index 86af62c08b9..691ab42b78f 100644 --- 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 diff --git a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig index d8f21a06e59..ece068fe223 100644 --- 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 diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig index 0d59823d9bc..c4a8fe8d10e 100644 --- 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 diff --git a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig index abb4d343ce2..d7c371e5021 100644 --- 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 diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig index c0da06ce253..758edcc0a39 100644 --- 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 diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig index 0d33db93fa1..1555ee7deb6 100644 --- 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 diff --git a/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig b/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig index 37e07688554..1cf40ed9d5a 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig index b3263fa9941..7fecacbf5f6 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c index 0f0ee111308..3b6570bc00e 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig index a6860f54119..3a75ecc886f 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c index e2557c7b358..574e28eafb1 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/netnsh/defconfig index a3809c48a88..a757489b071 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c index 9ef183fe029..aed67cf2140 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig index ab10887c533..001f98acfa2 100644 --- 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 diff --git a/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig b/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig index 2abd15ff351..8805f60e0f4 100644 --- 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 diff --git a/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c b/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c index 557da3d9342..a34e930f7e0 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig b/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig index 7634fe3c1b5..c2b7be6e460 100644 --- 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 diff --git a/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig b/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig index 1bfa81518c1..6fece401b5d 100644 --- 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 diff --git a/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig b/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig index aeaccdfb806..8248bb58db2 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig index baa9f26b7ae..c0cd24bcd43 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig index b80edbd15f9..7ec26b80de1 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig index 1c98b40fbc3..c7a1ed33d0e 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig index aaecfdb5d9d..657bf784066 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig index 8800ad015f6..35459b482a9 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig index a67d732de90..922cd1b7a78 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig index ce10e7909e1..af99ffc075d 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig index 7199a9531bd..b3043c24d98 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig index fcc9aaaa832..a27e62dfaa5 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c b/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c index 7eedb98bd30..c6b550920dc 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c index 2af4c85cfb4..22995e4f676 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c index 4f5c33cd104..ee15d8c4eb1 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig index 0878b9d3790..9cb3c5f9362 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c index 09450eca6b1..78c7fc1a5d4 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c index 8a8451c4a34..e9106e842d9 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig index ffe30bd2675..e7a37f228e4 100644 --- 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 diff --git a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig index faec1298197..05119ba6c90 100644 --- 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 diff --git a/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c b/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c index e59fd01c6f8..966daab9480 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig index 23178acc139..acd40ff53d0 100644 --- 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 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig index a8a2a17b728..2e1817bbc69 100644 --- 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 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig index 42b2eb59f8b..28ab62c537c 100644 --- 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 diff --git a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c index da2e8d808ab..74297f374aa 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/sam34/sam4l-xplained/README.txt b/boards/arm/sam34/sam4l-xplained/README.txt index bf84ebd5908..c5211f2b5fb 100644 --- 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: diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c index 9c7440b8c63..2cae27282ce 100644 --- 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) diff --git a/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig index 40d4b240263..4bb7bdffdc4 100644 --- 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 diff --git a/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig index 3c6aed89e33..4d5f1bfb205 100644 --- 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 diff --git a/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig index 86bd6ca98eb..e274ef79c38 100644 --- 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 diff --git a/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig index 437a5d0644e..758f15c4945 100644 --- 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 diff --git a/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig b/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig index ed49a970e7f..cb39facabdc 100644 --- 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 diff --git a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig index d778b58456f..207d192a27d 100644 --- 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 diff --git a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c index 2cd40031bc2..ef2e5d83d4b 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig index cd6b6d8beb0..8e3d1066aaf 100644 --- 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 diff --git a/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig b/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig index 242a7cfff92..f865430c60b 100644 --- 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 diff --git a/boards/arm/samv7/samv71-xult/configs/vnc/defconfig b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig index f12f45b5fe1..3e5e51c1515 100644 --- 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 diff --git a/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig index 15561864901..542cfcad873 100644 --- 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 diff --git a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c index 01be17d1fc1..58e863c4c98 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig index 42e82568859..c5e07ef29a3 100644 --- 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 diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig index ef42c6541b4..491b03ffbdd 100644 --- 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 diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig index 9d6fe69db28..f0ed7be6f3a 100644 --- 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 diff --git a/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig index bd412c45253..ebd4eac94cd 100644 --- 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 diff --git a/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c b/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c index 2a2521c68ac..1a58e2fd9ca 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32/et-stm32-stamp/configs/nsh/defconfig b/boards/arm/stm32/et-stm32-stamp/configs/nsh/defconfig index 129a40b8ab7..3f07b14fd17 100644 --- 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 diff --git a/boards/arm/stm32/maple/configs/nsh/defconfig b/boards/arm/stm32/maple/configs/nsh/defconfig index 9614151486e..109dc05e02a 100644 --- 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 diff --git a/boards/arm/stm32/maple/configs/nx/defconfig b/boards/arm/stm32/maple/configs/nx/defconfig index 232ac0cae78..9e3b9fab9cb 100644 --- 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 diff --git a/boards/arm/stm32/maple/configs/usbnsh/defconfig b/boards/arm/stm32/maple/configs/usbnsh/defconfig index 1a2c5455dde..3f62b7ab6ea 100644 --- 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 diff --git a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c index 25af38e677b..c8d38dc7935 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig index 1b471ddd451..0f05ee3f73e 100644 --- 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 diff --git a/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c b/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c index efe32d85082..79d99f620ed 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig index b0b109be7a9..ea87aa1245b 100644 --- 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 diff --git a/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c b/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c index 08c02ae1a8e..8927f044ce0 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig index ed933046e01..a04dd951bd6 100644 --- 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 diff --git a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c index 4eafb03e4ec..a5f85d6ae03 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig index 849a002f61b..58b16bc8d2b 100644 --- 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 diff --git a/boards/arm/stm32/stm32f4discovery/README.txt b/boards/arm/stm32/stm32f4discovery/README.txt index 3cbe2596a2d..b5841775bed 100644 --- 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 diff --git a/boards/arm/stm32/stm32f4discovery/configs/adb/defconfig b/boards/arm/stm32/stm32f4discovery/configs/adb/defconfig index 732db60b522..3b0f497a746 100644 --- 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 diff --git a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig index 89da21a5449..76f5d26d488 100644 --- 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 diff --git a/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig index baf60dd61d5..1919146176b 100644 --- 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 diff --git a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig index 0bffd1a4fa2..064648067dd 100644 --- 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 diff --git a/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig index 633bc623497..e5bfdbf3582 100644 --- 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 diff --git a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig index cf6c772d21d..7fc316bf3c3 100644 --- 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 diff --git a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig index 1aa38f83d05..92e1f941c27 100644 --- 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 diff --git a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig index d8a3e2d8b1c..733c0d100e7 100644 --- 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 diff --git a/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c b/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c index ff60953b5f0..7aba9b1bd05 100644 --- 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 __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32/stm32ldiscovery/README.txt b/boards/arm/stm32/stm32ldiscovery/README.txt index 7fdfdae3199..74a968ec615 100644 --- 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 diff --git a/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig index 97cc29185ec..63e1e4a711b 100644 --- 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 diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c index 3453915db53..75e824b76c4 100644 --- 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 ******************************************/ diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig index 599059add1e..087729fb0eb 100644 --- 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 diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig index f32f8cdb776..859d97a3931 100644 --- 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 diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig index 3edec3b0792..cbed403806c 100644 --- 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 diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig index 68dcd69e274..310e27547e6 100644 --- 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 diff --git a/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c b/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c index 0ee9fa14958..8802d46627c 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c +++ b/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c @@ -102,7 +102,7 @@ const struct userspace_s userspace __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig index 2bd7b12cc65..d9f269a147a 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig +++ b/boards/arm/stm32f7/stm32f769i-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_MMCSD=y CONFIG_MMCSD_SDIO=y CONFIG_MM_REGIONS=3 diff --git a/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c b/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c index f85466e5b5f..70de68b0dd2 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c +++ b/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c @@ -102,7 +102,7 @@ const struct userspace_s userspace __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c b/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c index 54fb39e0510..c4ce31e82ea 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c +++ b/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c @@ -102,7 +102,7 @@ const struct userspace_s userspace __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c b/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c index 4dfafe8a421..ff757d4e606 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c +++ b/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c @@ -102,7 +102,7 @@ const struct userspace_s userspace __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig index b477cb7641b..69bdb01a33d 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig @@ -44,8 +44,8 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=94 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 +CONFIG_LIBC_HOSTNAME="B-L475E-IOT01A" CONFIG_LIBM=y -CONFIG_LIB_HOSTNAME="B-L475E-IOT01A" CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig index 68521c80c47..2d0dcf304d6 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig @@ -33,8 +33,8 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=94 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 +CONFIG_LIBC_HOSTNAME="B-L475E-IOT01A" CONFIG_LIBM=y -CONFIG_LIB_HOSTNAME="B-L475E-IOT01A" CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig index 217a3c76c29..653976196a2 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig @@ -45,8 +45,8 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=94 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 +CONFIG_LIBC_HOSTNAME="B-L475E-IOT01A" CONFIG_LIBM=y -CONFIG_LIB_HOSTNAME="B-L475E-IOT01A" CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y diff --git a/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c index 548d619a623..b38e8c97ddc 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c @@ -102,7 +102,7 @@ const struct userspace_s userspace __attribute__ ((section (".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 }; diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c index ae474c689f4..5ef281ecacb 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c @@ -102,7 +102,7 @@ const struct userspace_s userspace __attribute__ ((section (".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 }; diff --git a/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig index 2386efe1a1c..b310b74e1d2 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig @@ -42,7 +42,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y CONFIG_HOST_MACOS=y CONFIG_LIBC_DLFCN=y -CONFIG_LIB_ENVPATH=y +CONFIG_LIBC_ENVPATH=y CONFIG_MMCSD=y CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_NET=y diff --git a/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig index 65759f21126..c78638d7324 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig @@ -44,7 +44,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y CONFIG_HOST_MACOS=y CONFIG_LIBC_DLFCN=y -CONFIG_LIB_ENVPATH=y +CONFIG_LIBC_ENVPATH=y CONFIG_MMCSD=y CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_MODULE=y diff --git a/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c b/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c index 1e6ae7bced8..f3cb6f077c0 100644 --- a/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c +++ b/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c @@ -102,7 +102,7 @@ const struct userspace_s userspace __attribute__ ((section (".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 }; diff --git a/boards/mips/pic32mx/sure-pic32mx/README.txt b/boards/mips/pic32mx/sure-pic32mx/README.txt index e9718fb3b9e..1ecba7a0048 100644 --- a/boards/mips/pic32mx/sure-pic32mx/README.txt +++ b/boards/mips/pic32mx/sure-pic32mx/README.txt @@ -730,7 +730,7 @@ Where is one of the following: CONFIG_LCD_MAXPOWER=255 : (Or any large-ish value that you prefer) Library Routines: - CONFIG_LIB_SLCDCODEC=y : Enable the SLCD CODEC + CONFIG_LIBC_SLCDCODEC=y : Enable the SLCD CODEC NOTE that is is not necessary to select the PMP peripheral; this LCD driver is a bit-bang driver that just happens to use the PMP pins as diff --git a/boards/misoc/lm32/misoc/configs/hello/defconfig b/boards/misoc/lm32/misoc/configs/hello/defconfig index ff96e5cf269..9d46b399c1f 100644 --- a/boards/misoc/lm32/misoc/configs/hello/defconfig +++ b/boards/misoc/lm32/misoc/configs/hello/defconfig @@ -35,7 +35,7 @@ CONFIG_EXAMPLES_TELNETD_NOMAC=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_IOB_NBUFFERS=24 -CONFIG_LIB_HOSTNAME="nuttx" +CONFIG_LIBC_HOSTNAME="nuttx" CONFIG_MISOC_ETHERNET=y CONFIG_MISOC_UART1=y CONFIG_NET=y diff --git a/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c b/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c index 9f24ab1a9d7..bb757032877 100644 --- a/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c +++ b/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c @@ -106,7 +106,7 @@ const struct userspace_s userspace __attribute__ ((section (".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 }; diff --git a/boards/risc-v/k210/maix-bit/configs/elf/defconfig b/boards/risc-v/k210/maix-bit/configs/elf/defconfig index b49295ade27..28918244775 100644 --- a/boards/risc-v/k210/maix-bit/configs/elf/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/elf/defconfig @@ -29,10 +29,10 @@ CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIB_BOARDCTL=y -CONFIG_LIB_ENVPATH=y CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=3072 diff --git a/boards/risc-v/k210/maix-bit/configs/module/defconfig b/boards/risc-v/k210/maix-bit/configs/module/defconfig index 3f19329e1e4..e02419c5ce4 100644 --- a/boards/risc-v/k210/maix-bit/configs/module/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/module/defconfig @@ -29,11 +29,11 @@ CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIB_BOARDCTL=y -CONFIG_LIB_ENVPATH=y CONFIG_MODULE=y CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PIPES=y diff --git a/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig b/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig index ebea6b48e75..7f37c25e343 100644 --- a/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig @@ -27,11 +27,11 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIB_BOARDCTL=y -CONFIG_LIB_ENVPATH=y CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 diff --git a/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c b/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c index f7ff8e5dfd6..7815b1d411b 100644 --- a/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c +++ b/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c @@ -102,7 +102,7 @@ const struct userspace_s userspace __attribute__ ((section (".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 }; diff --git a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig index 87dfc3387cb..cf8fae65e7b 100644 --- a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig @@ -31,9 +31,9 @@ CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y +CONFIG_LIBC_HOSTNAME="icicle" CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_HOSTNAME="icicle" CONFIG_MEMSET_64BIT=y CONFIG_MEMSET_OPTSPEED=y CONFIG_MPFS_ENABLE_DPFPU=y diff --git a/boards/risc-v/mpfs/icicle/kernel/mpfs_userspace.c b/boards/risc-v/mpfs/icicle/kernel/mpfs_userspace.c index 6fda7b7c8fb..a2fba9f4e61 100755 --- a/boards/risc-v/mpfs/icicle/kernel/mpfs_userspace.c +++ b/boards/risc-v/mpfs/icicle/kernel/mpfs_userspace.c @@ -109,7 +109,7 @@ const struct userspace_s userspace __attribute__ ((section (".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 }; diff --git a/boards/sim/sim/sim/configs/alsa/defconfig b/boards/sim/sim/sim/configs/alsa/defconfig index 7ab6550db5b..b0d1880f39a 100644 --- a/boards/sim/sim/sim/configs/alsa/defconfig +++ b/boards/sim/sim/sim/configs/alsa/defconfig @@ -31,8 +31,8 @@ CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARCHROMFS=y CONFIG_NSH_BUILTIN_APPS=y diff --git a/boards/sim/sim/sim/configs/bas/defconfig b/boards/sim/sim/sim/configs/bas/defconfig index a9f92fcdcf8..25bca93dee5 100644 --- a/boards/sim/sim/sim/configs/bas/defconfig +++ b/boards/sim/sim/sim/configs/bas/defconfig @@ -22,9 +22,9 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_INTERPRETERS_BAS=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBM=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FATDEVNO=2 diff --git a/boards/sim/sim/sim/configs/bastest/defconfig b/boards/sim/sim/sim/configs/bastest/defconfig index 4fd991384dc..fe330cfcf0f 100644 --- a/boards/sim/sim/sim/configs/bastest/defconfig +++ b/boards/sim/sim/sim/configs/bastest/defconfig @@ -33,10 +33,10 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_INTERPRETERS_BAS=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARCHROMFS=y CONFIG_NSH_BUILTIN_APPS=y diff --git a/boards/sim/sim/sim/configs/bluetooth/defconfig b/boards/sim/sim/sim/configs/bluetooth/defconfig index 947b1badf43..f49b3ccf2e3 100644 --- a/boards/sim/sim/sim/configs/bluetooth/defconfig +++ b/boards/sim/sim/sim/configs/bluetooth/defconfig @@ -34,9 +34,9 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y -CONFIG_LIB_HOSTNAME="NuttX-SIM" +CONFIG_LIBC_HOSTNAME="NuttX-SIM" CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y diff --git a/boards/sim/sim/sim/configs/bthcisock/defconfig b/boards/sim/sim/sim/configs/bthcisock/defconfig index 7c22ea74968..d4e2bd95ce8 100644 --- a/boards/sim/sim/sim/configs/bthcisock/defconfig +++ b/boards/sim/sim/sim/configs/bthcisock/defconfig @@ -35,9 +35,9 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y -CONFIG_LIB_HOSTNAME="NuttX-SIM" +CONFIG_LIBC_HOSTNAME="NuttX-SIM" CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y diff --git a/boards/sim/sim/sim/configs/btuart/defconfig b/boards/sim/sim/sim/configs/btuart/defconfig index 6e5ceba7c97..08ff5a0aafb 100644 --- a/boards/sim/sim/sim/configs/btuart/defconfig +++ b/boards/sim/sim/sim/configs/btuart/defconfig @@ -36,9 +36,9 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y -CONFIG_LIB_HOSTNAME="NuttX-SIM" +CONFIG_LIBC_HOSTNAME="NuttX-SIM" CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y diff --git a/boards/sim/sim/sim/configs/configdata/defconfig b/boards/sim/sim/sim/configs/configdata/defconfig index a06ffd17300..5cb69ac3f39 100644 --- a/boards/sim/sim/sim/configs/configdata/defconfig +++ b/boards/sim/sim/sim/configs/configdata/defconfig @@ -20,7 +20,7 @@ CONFIG_EXAMPLES_CONFIGDATA_SILENT=y CONFIG_FS_FAT=y CONFIG_FS_NXFFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 -CONFIG_LIB_RAND_ORDER=3 +CONFIG_LIBC_RAND_ORDER=3 CONFIG_MTD=y CONFIG_MTD_BYTE_WRITE=y CONFIG_MTD_CONFIG=y diff --git a/boards/sim/sim/sim/configs/duktape/defconfig b/boards/sim/sim/sim/configs/duktape/defconfig index 56ce97bc286..32fae1922e1 100644 --- a/boards/sim/sim/sim/configs/duktape/defconfig +++ b/boards/sim/sim/sim/configs/duktape/defconfig @@ -31,9 +31,9 @@ CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_INTERPRETERS_DUKTAPE=y CONFIG_INTERPRETERS_DUKTAPE_STACKSIZE=32768 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBM=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARCHROMFS=y CONFIG_NSH_BUILTIN_APPS=y diff --git a/boards/sim/sim/sim/configs/elf/defconfig b/boards/sim/sim/sim/configs/elf/defconfig index 9b201f7f51b..c7310d5e5e2 100644 --- a/boards/sim/sim/sim/configs/elf/defconfig +++ b/boards/sim/sim/sim/configs/elf/defconfig @@ -35,8 +35,8 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILE_APPS=y diff --git a/boards/sim/sim/sim/configs/foc/defconfig b/boards/sim/sim/sim/configs/foc/defconfig index 4c02a6d8447..297c84b5c6b 100644 --- a/boards/sim/sim/sim/configs/foc/defconfig +++ b/boards/sim/sim/sim/configs/foc/defconfig @@ -56,10 +56,10 @@ CONFIG_INDUSTRY_FOC_FIXED16=y CONFIG_INDUSTRY_FOC_FLOAT=y CONFIG_INDUSTRY_FOC_HANDLER_PRINT=y CONFIG_INDUSTRY_FOC_MODEL_PMSM=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y -CONFIG_LIB_ENVPATH=y CONFIG_MOTOR=y CONFIG_MOTOR_FOC=y CONFIG_MOTOR_FOC_INST=4 diff --git a/boards/sim/sim/sim/configs/ipforward/defconfig b/boards/sim/sim/sim/configs/ipforward/defconfig index efa4bd16232..f0be3429c4b 100644 --- a/boards/sim/sim/sim/configs/ipforward/defconfig +++ b/boards/sim/sim/sim/configs/ipforward/defconfig @@ -30,9 +30,9 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y -CONFIG_LIB_HOSTNAME="IP-Forward" +CONFIG_LIBC_HOSTNAME="IP-Forward" CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NET_IPFORWARD=y diff --git a/boards/sim/sim/sim/configs/libcxxtest/defconfig b/boards/sim/sim/sim/configs/libcxxtest/defconfig index 169288dd758..dd5bbc84de8 100644 --- a/boards/sim/sim/sim/configs/libcxxtest/defconfig +++ b/boards/sim/sim/sim/configs/libcxxtest/defconfig @@ -42,8 +42,8 @@ CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IOB_NOTIFIER=y CONFIG_LIBCXX=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y CONFIG_MM_FILL_ALLOCATIONS=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y diff --git a/boards/sim/sim/sim/configs/loadable/defconfig b/boards/sim/sim/sim/configs/loadable/defconfig index f33f5730cc3..ac4acc84868 100644 --- a/boards/sim/sim/sim/configs/loadable/defconfig +++ b/boards/sim/sim/sim/configs/loadable/defconfig @@ -30,8 +30,8 @@ CONFIG_INIT_MOUNT_FLAGS=0x1 CONFIG_INIT_MOUNT_FSTYPE="hostfs" CONFIG_INIT_MOUNT_SOURCE="" CONFIG_INIT_MOUNT_TARGET="/system" +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y CONFIG_MEMSET_OPTSPEED=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y diff --git a/boards/sim/sim/sim/configs/minibasic/defconfig b/boards/sim/sim/sim/configs/minibasic/defconfig index 80f43b5bf0f..b747b9a2bf0 100644 --- a/boards/sim/sim/sim/configs/minibasic/defconfig +++ b/boards/sim/sim/sim/configs/minibasic/defconfig @@ -29,9 +29,9 @@ CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_INTERPRETERS_MINIBASIC=y CONFIG_INTERPRETER_MINIBASIC_TESTSCRIPT=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBM=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARCHROMFS=y CONFIG_NSH_BUILTIN_APPS=y diff --git a/boards/sim/sim/sim/configs/module/defconfig b/boards/sim/sim/sim/configs/module/defconfig index 60e7f27eff9..d1b44066eef 100644 --- a/boards/sim/sim/sim/configs/module/defconfig +++ b/boards/sim/sim/sim/configs/module/defconfig @@ -28,8 +28,8 @@ CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_ROMFS=y CONFIG_IOB_NOTIFIER=y CONFIG_LIBC_DLFCN=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_ENVPATH=y CONFIG_MM_FILL_ALLOCATIONS=y CONFIG_NAME_MAX=64 CONFIG_NET=y diff --git a/boards/sim/sim/sim/configs/module32/defconfig b/boards/sim/sim/sim/configs/module32/defconfig index 797486dd62f..5e6d376f834 100644 --- a/boards/sim/sim/sim/configs/module32/defconfig +++ b/boards/sim/sim/sim/configs/module32/defconfig @@ -28,8 +28,8 @@ CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_ROMFS=y CONFIG_IOB_NOTIFIER=y CONFIG_LIBC_DLFCN=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_ENVPATH=y CONFIG_MM_FILL_ALLOCATIONS=y CONFIG_NAME_MAX=64 CONFIG_NET=y diff --git a/boards/sim/sim/sim/configs/mtdpart/defconfig b/boards/sim/sim/sim/configs/mtdpart/defconfig index 32e3ea18a72..acee6ac8b76 100644 --- a/boards/sim/sim/sim/configs/mtdpart/defconfig +++ b/boards/sim/sim/sim/configs/mtdpart/defconfig @@ -17,7 +17,7 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_MTDPART=y CONFIG_FS_FAT=y CONFIG_IDLETHREAD_STACKSIZE=4096 -CONFIG_LIB_RAND_ORDER=3 +CONFIG_LIBC_RAND_ORDER=3 CONFIG_MTD=y CONFIG_MTD_PARTITION=y CONFIG_RAMMTD=y diff --git a/boards/sim/sim/sim/configs/mtdrwb/defconfig b/boards/sim/sim/sim/configs/mtdrwb/defconfig index 7b3ca81c640..cdfa9a23196 100644 --- a/boards/sim/sim/sim/configs/mtdrwb/defconfig +++ b/boards/sim/sim/sim/configs/mtdrwb/defconfig @@ -18,7 +18,7 @@ CONFIG_DRVR_WRITEBUFFER=y CONFIG_EXAMPLES_MTDRWB=y CONFIG_FS_FAT=y CONFIG_IDLETHREAD_STACKSIZE=4096 -CONFIG_LIB_RAND_ORDER=3 +CONFIG_LIBC_RAND_ORDER=3 CONFIG_MTD=y CONFIG_MTD_PARTITION=y CONFIG_MTD_READAHEAD=y diff --git a/boards/sim/sim/sim/configs/nimble/defconfig b/boards/sim/sim/sim/configs/nimble/defconfig index f8e17c036d6..2c4cb5ba454 100644 --- a/boards/sim/sim/sim/configs/nimble/defconfig +++ b/boards/sim/sim/sim/configs/nimble/defconfig @@ -36,9 +36,9 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y -CONFIG_LIB_HOSTNAME="NuttX-SIM" +CONFIG_LIBC_HOSTNAME="NuttX-SIM" CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y diff --git a/boards/sim/sim/sim/configs/nsh/defconfig b/boards/sim/sim/sim/configs/nsh/defconfig index 78b7fbf97f0..f4896b46dfa 100644 --- a/boards/sim/sim/sim/configs/nsh/defconfig +++ b/boards/sim/sim/sim/configs/nsh/defconfig @@ -29,11 +29,11 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_LOCALE=y CONFIG_LIBC_LOCALE_CATALOG=y CONFIG_LIBC_LOCALE_GETTEXT=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARCHROMFS=y CONFIG_NSH_BUILTIN_APPS=y diff --git a/boards/sim/sim/sim/configs/nshcromfs/defconfig b/boards/sim/sim/sim/configs/nshcromfs/defconfig index 9bb2df9b8e3..40020996570 100644 --- a/boards/sim/sim/sim/configs/nshcromfs/defconfig +++ b/boards/sim/sim/sim/configs/nshcromfs/defconfig @@ -30,8 +30,8 @@ CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILE_APPS=y diff --git a/boards/sim/sim/sim/configs/nxffs/defconfig b/boards/sim/sim/sim/configs/nxffs/defconfig index 3944a3873b6..13c250b39f3 100644 --- a/boards/sim/sim/sim/configs/nxffs/defconfig +++ b/boards/sim/sim/sim/configs/nxffs/defconfig @@ -17,7 +17,7 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_FS_FAT=y CONFIG_FS_NXFFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 -CONFIG_LIB_RAND_ORDER=3 +CONFIG_LIBC_RAND_ORDER=3 CONFIG_MTD=y CONFIG_NXFFS_SCAN_VOLUME=y CONFIG_RAMMTD=y diff --git a/boards/sim/sim/sim/configs/pf_ieee802154/defconfig b/boards/sim/sim/sim/configs/pf_ieee802154/defconfig index 22e89b9e611..fd021b0e2d4 100644 --- a/boards/sim/sim/sim/configs/pf_ieee802154/defconfig +++ b/boards/sim/sim/sim/configs/pf_ieee802154/defconfig @@ -34,7 +34,7 @@ CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IEEE802154_LOOPBACK=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=48 -CONFIG_LIB_HOSTNAME="SAMV71-XULT" +CONFIG_LIBC_HOSTNAME="SAMV71-XULT" CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MTD=y diff --git a/boards/sim/sim/sim/configs/pktradio/defconfig b/boards/sim/sim/sim/configs/pktradio/defconfig index 71ac6f6a37b..cd81eb091ef 100644 --- a/boards/sim/sim/sim/configs/pktradio/defconfig +++ b/boards/sim/sim/sim/configs/pktradio/defconfig @@ -49,7 +49,7 @@ CONFIG_I2C_DRIVER=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=48 -CONFIG_LIB_HOSTNAME="SAMV71-XULT" +CONFIG_LIBC_HOSTNAME="SAMV71-XULT" CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MTD=y diff --git a/boards/sim/sim/sim/configs/posix_spawn/defconfig b/boards/sim/sim/sim/configs/posix_spawn/defconfig index bdaa0236835..c696c150a66 100644 --- a/boards/sim/sim/sim/configs/posix_spawn/defconfig +++ b/boards/sim/sim/sim/configs/posix_spawn/defconfig @@ -35,9 +35,9 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILE_APPS=y diff --git a/boards/sim/sim/sim/configs/rc/defconfig b/boards/sim/sim/sim/configs/rc/defconfig index df465c7e1ce..21b0416804e 100644 --- a/boards/sim/sim/sim/configs/rc/defconfig +++ b/boards/sim/sim/sim/configs/rc/defconfig @@ -25,9 +25,9 @@ CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_BINFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_FLOATINGPOINT=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILE_APPS=y diff --git a/boards/sim/sim/sim/configs/romfs/defconfig b/boards/sim/sim/sim/configs/romfs/defconfig index 05221993668..b6999fa689e 100644 --- a/boards/sim/sim/sim/configs/romfs/defconfig +++ b/boards/sim/sim/sim/configs/romfs/defconfig @@ -30,9 +30,9 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARCHROMFS=y CONFIG_NSH_BUILTIN_APPS=y diff --git a/boards/sim/sim/sim/configs/rpproxy/defconfig b/boards/sim/sim/sim/configs/rpproxy/defconfig index 8c861aa0c8a..82e242e5a0f 100644 --- a/boards/sim/sim/sim/configs/rpproxy/defconfig +++ b/boards/sim/sim/sim/configs/rpproxy/defconfig @@ -20,7 +20,7 @@ CONFIG_FS_HOSTFS=y CONFIG_FS_HOSTFS_RPMSG=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 -CONFIG_LIB_HOSTNAME="proxy" +CONFIG_LIBC_HOSTNAME="proxy" CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSCLIENT_MAXRESPONSE=176 diff --git a/boards/sim/sim/sim/configs/rpserver/defconfig b/boards/sim/sim/sim/configs/rpserver/defconfig index 2c30410d2cf..311e40c9865 100644 --- a/boards/sim/sim/sim/configs/rpserver/defconfig +++ b/boards/sim/sim/sim/configs/rpserver/defconfig @@ -19,7 +19,7 @@ CONFIG_FS_HOSTFS=y CONFIG_FS_HOSTFS_RPMSG_SERVER=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 -CONFIG_LIB_HOSTNAME="server" +CONFIG_LIBC_HOSTNAME="server" CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSCLIENT_MAXRESPONSE=176 diff --git a/boards/sim/sim/sim/configs/sensor/defconfig b/boards/sim/sim/sim/configs/sensor/defconfig index 05fb1b2b5ee..ebbc29245d8 100644 --- a/boards/sim/sim/sim/configs/sensor/defconfig +++ b/boards/sim/sim/sim/configs/sensor/defconfig @@ -26,9 +26,9 @@ CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_BINFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_FLOATINGPOINT=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILE_APPS=y diff --git a/boards/sim/sim/sim/configs/sixlowpan/defconfig b/boards/sim/sim/sim/configs/sixlowpan/defconfig index 8e41279bd95..fda61a5c673 100644 --- a/boards/sim/sim/sim/configs/sixlowpan/defconfig +++ b/boards/sim/sim/sim/configs/sixlowpan/defconfig @@ -50,7 +50,7 @@ CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IEEE802154_LOOPBACK=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=48 -CONFIG_LIB_HOSTNAME="SAMV71-XULT" +CONFIG_LIBC_HOSTNAME="SAMV71-XULT" CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MTD=y diff --git a/boards/sim/sim/sim/configs/sotest/defconfig b/boards/sim/sim/sim/configs/sotest/defconfig index 5eb28f1625c..938e1297027 100644 --- a/boards/sim/sim/sim/configs/sotest/defconfig +++ b/boards/sim/sim/sim/configs/sotest/defconfig @@ -28,8 +28,8 @@ CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_ROMFS=y CONFIG_IOB_NOTIFIER=y CONFIG_LIBC_DLFCN=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_ENVPATH=y CONFIG_MM_FILL_ALLOCATIONS=y CONFIG_NAME_MAX=64 CONFIG_NET=y diff --git a/boards/sim/sim/sim/configs/sotest32/defconfig b/boards/sim/sim/sim/configs/sotest32/defconfig index b4eaf3e6df6..df436747e0d 100644 --- a/boards/sim/sim/sim/configs/sotest32/defconfig +++ b/boards/sim/sim/sim/configs/sotest32/defconfig @@ -28,8 +28,8 @@ CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_ROMFS=y CONFIG_IOB_NOTIFIER=y CONFIG_LIBC_DLFCN=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_ENVPATH=y CONFIG_MM_FILL_ALLOCATIONS=y CONFIG_NAME_MAX=64 CONFIG_NET=y diff --git a/boards/sim/sim/sim/configs/spiffs/defconfig b/boards/sim/sim/sim/configs/spiffs/defconfig index bcaf85f159d..14e24534e60 100644 --- a/boards/sim/sim/sim/configs/spiffs/defconfig +++ b/boards/sim/sim/sim/configs/spiffs/defconfig @@ -19,7 +19,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_FS_SPIFFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 -CONFIG_LIB_RAND_ORDER=3 +CONFIG_LIBC_RAND_ORDER=3 CONFIG_MTD=y CONFIG_RAMMTD=y CONFIG_RAMMTD_FLASHSIM=y diff --git a/boards/sim/sim/sim/configs/tcploop/defconfig b/boards/sim/sim/sim/configs/tcploop/defconfig index ff23abcec01..8766a9101ca 100644 --- a/boards/sim/sim/sim/configs/tcploop/defconfig +++ b/boards/sim/sim/sim/configs/tcploop/defconfig @@ -31,9 +31,9 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y -CONFIG_LIB_HOSTNAME="IP-Forward" +CONFIG_LIBC_HOSTNAME="IP-Forward" CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NET_IPv6=y diff --git a/boards/sim/sim/sim/configs/udgram/defconfig b/boards/sim/sim/sim/configs/udgram/defconfig index b487e149576..e319ec69b41 100644 --- a/boards/sim/sim/sim/configs/udgram/defconfig +++ b/boards/sim/sim/sim/configs/udgram/defconfig @@ -28,8 +28,8 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NET_LOCAL=y diff --git a/boards/sim/sim/sim/configs/unionfs/defconfig b/boards/sim/sim/sim/configs/unionfs/defconfig index 287a21af19e..83c69f40ff0 100644 --- a/boards/sim/sim/sim/configs/unionfs/defconfig +++ b/boards/sim/sim/sim/configs/unionfs/defconfig @@ -25,9 +25,9 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_UNIONFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_ENVPATH=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FATDEVNO=2 diff --git a/boards/sim/sim/sim/configs/userfs/defconfig b/boards/sim/sim/sim/configs/userfs/defconfig index 910ffd036fa..3cf10e9f517 100644 --- a/boards/sim/sim/sim/configs/userfs/defconfig +++ b/boards/sim/sim/sim/configs/userfs/defconfig @@ -30,8 +30,8 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_USERFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NET_LOCAL=y diff --git a/boards/sim/sim/sim/configs/ustream/defconfig b/boards/sim/sim/sim/configs/ustream/defconfig index 92d0e9ee5ab..d7f5fbc9e84 100644 --- a/boards/sim/sim/sim/configs/ustream/defconfig +++ b/boards/sim/sim/sim/configs/ustream/defconfig @@ -28,8 +28,8 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NET_LOCAL=y diff --git a/boards/sim/sim/sim/configs/vpnkit/defconfig b/boards/sim/sim/sim/configs/vpnkit/defconfig index be6bef90c9f..3f45b1cdafd 100644 --- a/boards/sim/sim/sim/configs/vpnkit/defconfig +++ b/boards/sim/sim/sim/configs/vpnkit/defconfig @@ -38,8 +38,8 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IOB_NOTIFIER=y +CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_ENVPATH=y CONFIG_MM_FILL_ALLOCATIONS=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y diff --git a/boards/sim/sim/sim/src/Makefile b/boards/sim/sim/sim/src/Makefile index 598b8af0a6f..fc87cdd3dfa 100644 --- a/boards/sim/sim/sim/src/Makefile +++ b/boards/sim/sim/sim/src/Makefile @@ -34,12 +34,12 @@ endif ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += sim_bringup.c -ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y) +ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y) CSRCS += sim_zoneinfo.c endif else ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += sim_bringup.c -ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y) +ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y) CSRCS += sim_zoneinfo.c endif endif diff --git a/boards/sim/sim/sim/src/sim.h b/boards/sim/sim/sim/src/sim.h index 8ace3991dc0..68f6554280d 100644 --- a/boards/sim/sim/sim/src/sim.h +++ b/boards/sim/sim/sim/src/sim.h @@ -93,7 +93,7 @@ int sim_bringup(void); * ****************************************************************************/ -#ifdef CONFIG_LIB_ZONEINFO_ROMFS +#ifdef CONFIG_LIBC_ZONEINFO_ROMFS int sim_zoneinfo(int minor); #endif diff --git a/boards/sim/sim/sim/src/sim_bringup.c b/boards/sim/sim/sim/src/sim_bringup.c index 3aa4ae55351..1b7679fc7d4 100644 --- a/boards/sim/sim/sim/src/sim_bringup.c +++ b/boards/sim/sim/sim/src/sim_bringup.c @@ -140,7 +140,7 @@ int sim_bringup(void) } #endif -#ifdef CONFIG_LIB_ZONEINFO_ROMFS +#ifdef CONFIG_LIBC_ZONEINFO_ROMFS /* Mount the TZ database */ sim_zoneinfo(3); diff --git a/boards/sim/sim/sim/src/sim_zoneinfo.c b/boards/sim/sim/sim/src/sim_zoneinfo.c index 3fbd8eca6a7..ff33122e9b1 100644 --- a/boards/sim/sim/sim/src/sim_zoneinfo.c +++ b/boards/sim/sim/sim/src/sim_zoneinfo.c @@ -33,7 +33,7 @@ #include #include -#ifdef CONFIG_LIB_ZONEINFO_ROMFS +#ifdef CONFIG_LIBC_ZONEINFO_ROMFS /**************************************************************************** * Pre-processor Definitions @@ -131,4 +131,4 @@ int sim_zoneinfo(int minor) return OK; } -#endif /* CONFIG_LIB_ZONEINFO_ROMFS */ +#endif /* CONFIG_LIBC_ZONEINFO_ROMFS */ diff --git a/boards/z80/ez80/makerlisp/configs/sdboot/defconfig b/boards/z80/ez80/makerlisp/configs/sdboot/defconfig index 7367a6c252c..8999bb634fe 100644 --- a/boards/z80/ez80/makerlisp/configs/sdboot/defconfig +++ b/boards/z80/ez80/makerlisp/configs/sdboot/defconfig @@ -25,7 +25,7 @@ CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y -CONFIG_LIB_HEX2BIN=y +CONFIG_LIBC_HEX2BIN=y CONFIG_MAKERLISP_SDBOOT=y CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y diff --git a/boards/z80/ez80/z20x/Kconfig b/boards/z80/ez80/z20x/Kconfig index 4296f233f59..0e396b183af 100644 --- a/boards/z80/ez80/z20x/Kconfig +++ b/boards/z80/ez80/z20x/Kconfig @@ -11,7 +11,7 @@ choice config Z20X_SDBOOT bool "SD boot loader" - select LIB_HEX2BIN + select LIBC_HEX2BIN select EZ80_BOOTLOADER depends on EZ80_SPI && MMCSD_SPI ---help--- @@ -22,7 +22,7 @@ config Z20X_SDBOOT config Z20X_W25BOOT bool "W25 boot loader" select Z20X_W25_CHARDEV - select LIB_HEX2BIN + select LIBC_HEX2BIN select EZ80_BOOTLOADER depends on EZ80_SPI && MTD_W25 ---help--- diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 570066d78d0..27aa49ea59a 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -46,7 +46,7 @@ config DEV_URANDOM_CONGRUENTIAL Use the same congruential general used with srand(). This algorithm is computationally more intense and uses double precision floating point. NOTE: Good randomness from the congruential generator also - requires that you also select CONFIG_LIB_RAND_ORDER > 2 + requires that you also select CONFIG_LIBC_RAND_ORDER > 2 NOTE: Not cyptographically secure diff --git a/drivers/lcd/Kconfig b/drivers/lcd/Kconfig index 08f3a2e3cf5..488a73efd9c 100644 --- a/drivers/lcd/Kconfig +++ b/drivers/lcd/Kconfig @@ -1427,7 +1427,7 @@ config LCD_BACKPACK bool "PCF8574 LCD Backpack" default n depends on I2C - select LIB_SLCDCODEC + select LIBC_SLCDCODEC ---help--- Enable support for PCF8574 LCD Backpack driver. This driver supports an interface board that is based on the PCF8574 io expander and diff --git a/drivers/lcd/ht16k33_14seg.c b/drivers/lcd/ht16k33_14seg.c index df6a8f23c2f..460d9c6d871 100644 --- a/drivers/lcd/ht16k33_14seg.c +++ b/drivers/lcd/ht16k33_14seg.c @@ -68,7 +68,7 @@ #include #include -#ifndef CONFIG_LIB_SLCDCODEC +#ifndef CONFIG_LIBC_SLCDCODEC # error please also select Library Routines, Segment LCD CODEC #endif diff --git a/drivers/lcd/pcf8574_lcd_backpack.c b/drivers/lcd/pcf8574_lcd_backpack.c index 9d87594e69d..5574517ce42 100644 --- a/drivers/lcd/pcf8574_lcd_backpack.c +++ b/drivers/lcd/pcf8574_lcd_backpack.c @@ -36,7 +36,7 @@ #include #include -#ifndef CONFIG_LIB_SLCDCODEC +#ifndef CONFIG_LIBC_SLCDCODEC # error please also select Library Routines, Segment LCD CODEC #endif diff --git a/drivers/lcd/st7032.c b/drivers/lcd/st7032.c index 5673d05b21c..8d51dff1ff1 100644 --- a/drivers/lcd/st7032.c +++ b/drivers/lcd/st7032.c @@ -40,7 +40,7 @@ #include #include -#ifndef CONFIG_LIB_SLCDCODEC +#ifndef CONFIG_LIBC_SLCDCODEC # error please also select Library Routines, Segment LCD CODEC #endif diff --git a/drivers/usbhost/Kconfig b/drivers/usbhost/Kconfig index 60e399eb840..b3d5312aad3 100644 --- a/drivers/usbhost/Kconfig +++ b/drivers/usbhost/Kconfig @@ -333,7 +333,7 @@ config HIDKBD_RAWSCANCODES config HIDKBD_ENCODED bool "Encode Special Keys" default n - depends on !HIDKBD_RAWSCANCODES && LIB_KBDCODEC + depends on !HIDKBD_RAWSCANCODES && LIBC_KBDCODEC ---help--- Encode special key press events in the user buffer. In this case, the user end must decode the encoded special key values using the diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c index 65a7a79da44..4e27d83fd31 100644 --- a/drivers/usbhost/usbhost_hidkbd.c +++ b/drivers/usbhost/usbhost_hidkbd.c @@ -119,7 +119,7 @@ * CODEC is enabled. */ -#ifndef CONFIG_LIB_KBDCODEC +#ifndef CONFIG_LIBC_KBDCODEC # undef CONFIG_HIDKBD_ENCODED #endif diff --git a/fs/inode/fs_inodesearch.c b/fs/inode/fs_inodesearch.c index 8cb99a6a0cd..920d81794cc 100644 --- a/fs/inode/fs_inodesearch.c +++ b/fs/inode/fs_inodesearch.c @@ -431,7 +431,7 @@ static FAR const char *_inode_getcwd(void) pwd = getenv("PWD"); if (pwd == NULL) { - pwd = CONFIG_LIB_HOMEDIR; + pwd = CONFIG_LIBC_HOMEDIR; } #endif diff --git a/graphics/vnc/server/Kconfig b/graphics/vnc/server/Kconfig index 53d186239a8..70146a34cf2 100644 --- a/graphics/vnc/server/Kconfig +++ b/graphics/vnc/server/Kconfig @@ -134,7 +134,7 @@ config VNCSERVER_UPDATE_BUFSIZE config VNCSERVER_KBDENCODE bool "Encode keyboard input" default n - depends on LIB_KBDCODEC + depends on LIBC_KBDCODEC ---help--- Use a special encoding of keyboard characters as defined in include/nuttx/input/kbd_coded.h. diff --git a/include/hex2bin.h b/include/hex2bin.h index 9b5f6745ff3..b2d78987c9c 100644 --- a/include/hex2bin.h +++ b/include/hex2bin.h @@ -30,7 +30,7 @@ #include #include -#ifdef CONFIG_LIB_HEX2BIN +#ifdef CONFIG_LIBC_HEX2BIN /**************************************************************************** * Pre-processor Definitions diff --git a/include/nuttx/binfmt/binfmt.h b/include/nuttx/binfmt/binfmt.h index a0334c906d4..e49a80f4eaa 100644 --- a/include/nuttx/binfmt/binfmt.h +++ b/include/nuttx/binfmt/binfmt.h @@ -52,7 +52,7 @@ typedef FAR void (*binfmt_dtor_t)(void); /* This describes the file to be loaded. * * NOTE 1: The 'filename' must be the full, absolute path to the file to be - * executed unless CONFIG_LIB_ENVPATH is defined. In that case, + * executed 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. @@ -271,7 +271,7 @@ int exec_module(FAR const struct binary_s *binp, * * 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. @@ -301,7 +301,7 @@ int exec(FAR const char *filename, FAR char * const *argv, * * 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. diff --git a/include/nuttx/envpath.h b/include/nuttx/envpath.h index 9c9df1af2b0..ed8ea4dc765 100644 --- a/include/nuttx/envpath.h +++ b/include/nuttx/envpath.h @@ -27,7 +27,7 @@ #include -#ifdef CONFIG_LIB_ENVPATH +#ifdef CONFIG_LIBC_ENVPATH /**************************************************************************** * Pre-processor Definitions @@ -140,5 +140,5 @@ void envpath_release(ENVPATH_HANDLE handle); } #endif -#endif /* CONFIG_LIB_ENVPATH */ +#endif /* CONFIG_LIBC_ENVPATH */ #endif /* INCLUDE_NUTTX_ENVPATH_H */ diff --git a/include/nuttx/input/kbd_codec.h b/include/nuttx/input/kbd_codec.h index 3d227d53b56..79b4975c37e 100644 --- a/include/nuttx/input/kbd_codec.h +++ b/include/nuttx/input/kbd_codec.h @@ -29,7 +29,7 @@ #include #include -#ifdef CONFIG_LIB_KBDCODEC +#ifdef CONFIG_LIBC_KBDCODEC /**************************************************************************** * Pre-processor Definitions @@ -327,5 +327,5 @@ int kbd_decode(FAR struct lib_instream_s *stream, } #endif -#endif /* CONFIG_LIB_KBDCODEC */ +#endif /* CONFIG_LIBC_KBDCODEC */ #endif /* __INCLUDE_NUTTX_INPUT_KBD_CODEC_H */ diff --git a/include/nuttx/lcd/slcd_codec.h b/include/nuttx/lcd/slcd_codec.h index e22adfdc346..6e61dc63b67 100644 --- a/include/nuttx/lcd/slcd_codec.h +++ b/include/nuttx/lcd/slcd_codec.h @@ -29,7 +29,7 @@ #include #include -#ifdef CONFIG_LIB_SLCDCODEC +#ifdef CONFIG_LIBC_SLCDCODEC /**************************************************************************** * Pre-processor Definitions @@ -188,5 +188,5 @@ enum slcdret_e slcd_decode(FAR struct lib_instream_s *stream, } #endif -#endif /* CONFIG_LIB_SLCDCODEC */ +#endif /* CONFIG_LIBC_SLCDCODEC */ #endif /* __INCLUDE_NUTTX_LCD_SLCD_CODEC_H */ diff --git a/include/nuttx/userspace.h b/include/nuttx/userspace.h index 2cf14e30d54..657fe68aab1 100644 --- a/include/nuttx/userspace.h +++ b/include/nuttx/userspace.h @@ -111,7 +111,7 @@ struct userspace_s /* User-space work queue support */ -#ifdef CONFIG_LIB_USRWORK +#ifdef CONFIG_LIBC_USRWORK CODE int (*work_usrstart)(void); #endif }; diff --git a/include/nuttx/wqueue.h b/include/nuttx/wqueue.h index c96ad22f201..fc04ff9262e 100644 --- a/include/nuttx/wqueue.h +++ b/include/nuttx/wqueue.h @@ -77,11 +77,11 @@ * builds. This those configurations, the user-mode work queue provides the * same (non-standard) facility for use by applications. * - * CONFIG_LIB_USRWORK. If CONFIG_LIB_USRWORK is also defined then the + * CONFIG_LIBC_USRWORK. If CONFIG_LIBC_USRWORK is also defined then the * user-mode work queue will be created. - * CONFIG_LIB_USRWORKPRIORITY - The minimum execution priority of the lower + * CONFIG_LIBC_USRWORKPRIORITY - The minimum execution priority of the lower * priority worker thread. Default: 100 - * CONFIG_LIB_USRWORKSTACKSIZE - The stack size allocated for the lower + * CONFIG_LIBC_USRWORKSTACKSIZE - The stack size allocated for the lower * priority worker thread. Default: 2048. */ @@ -91,7 +91,7 @@ /* Yes.. user-space worker threads are not built in a flat build */ -# undef CONFIG_LIB_USRWORK +# undef CONFIG_LIBC_USRWORK #elif !defined(__KERNEL__) @@ -179,17 +179,17 @@ /* User space work queue configuration **************************************/ -#ifdef CONFIG_LIB_USRWORK +#ifdef CONFIG_LIBC_USRWORK -# ifndef CONFIG_LIB_USRWORKPRIORITY -# define CONFIG_LIB_USRWORKPRIORITY 100 +# ifndef CONFIG_LIBC_USRWORKPRIORITY +# define CONFIG_LIBC_USRWORKPRIORITY 100 # endif -# ifndef CONFIG_LIB_USRWORKSTACKSIZE -# define CONFIG_LIB_USRWORKSTACKSIZE CONFIG_IDLETHREAD_STACKSIZE +# ifndef CONFIG_LIBC_USRWORKSTACKSIZE +# define CONFIG_LIBC_USRWORKSTACKSIZE CONFIG_IDLETHREAD_STACKSIZE # endif -#endif /* CONFIG_LIB_USRWORK */ +#endif /* CONFIG_LIBC_USRWORK */ /* Work queue IDs: * @@ -208,7 +208,7 @@ * priority work queue (if there is one). */ -#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIBC_USRWORK) && !defined(__KERNEL__) /* User mode */ # define USRWORK 2 /* User mode work queue */ @@ -226,7 +226,7 @@ # endif # define USRWORK LPWORK /* Redirect user-mode references */ -#endif /* CONFIG_LIB_USRWORK && !__KERNEL__ */ +#endif /* CONFIG_LIBC_USRWORK && !__KERNEL__ */ /**************************************************************************** * Public Types @@ -323,7 +323,7 @@ extern "C" * ****************************************************************************/ -#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIBC_USRWORK) && !defined(__KERNEL__) int work_usrstart(void); #endif diff --git a/include/nuttx/zoneinfo.h b/include/nuttx/zoneinfo.h index 4d381a1e70a..1fcce556168 100644 --- a/include/nuttx/zoneinfo.h +++ b/include/nuttx/zoneinfo.h @@ -27,7 +27,7 @@ #include -#ifdef CONFIG_LIB_ZONEINFO_ROMFS +#ifdef CONFIG_LIBC_ZONEINFO_ROMFS /**************************************************************************** * Pre-processor Definitions @@ -64,5 +64,5 @@ EXTERN unsigned int romfs_zoneinfo_img_len; } #endif -#endif /* CONFIG_LIB_ZONEINFO_ROMFS */ +#endif /* CONFIG_LIBC_ZONEINFO_ROMFS */ #endif /* __INCLUDE_NUTTX_ZONEINFO_H */ diff --git a/include/spawn.h b/include/spawn.h index 40c4d80eccf..dc3beb8afc1 100644 --- a/include/spawn.h +++ b/include/spawn.h @@ -125,7 +125,7 @@ extern "C" * file system at 'path' */ -#ifdef CONFIG_LIB_ENVPATH +#ifdef CONFIG_LIBC_ENVPATH int posix_spawnp(FAR pid_t *pid, FAR const char *path, FAR const posix_spawn_file_actions_t *file_actions, FAR const posix_spawnattr_t *attr, diff --git a/include/sys/syscall_lookup.h b/include/sys/syscall_lookup.h index 42d781d3a93..c266f729a4b 100644 --- a/include/sys/syscall_lookup.h +++ b/include/sys/syscall_lookup.h @@ -140,7 +140,7 @@ SYSCALL_LOOKUP(up_assert, 2) SYSCALL_LOOKUP(exec, 4) #endif #ifdef CONFIG_LIBC_EXECFUNCS -#ifdef CONFIG_LIB_ENVPATH +#ifdef CONFIG_LIBC_ENVPATH SYSCALL_LOOKUP(posix_spawnp, 6) #else SYSCALL_LOOKUP(posix_spawn, 6) diff --git a/include/sys/utsname.h b/include/sys/utsname.h index b152dc3ea7e..27d5d2be809 100644 --- a/include/sys/utsname.h +++ b/include/sys/utsname.h @@ -57,7 +57,7 @@ * * FIELD Default * sysname NuttX - * nodename CONFIG_LIB_HOSTNAME + * nodename CONFIG_LIBC_HOSTNAME * release From version.h * version From version.h * machine CONFIG_ARCH diff --git a/libs/libc/Makefile b/libs/libc/Makefile index ceb65cf8e5d..17cf5df7cf3 100644 --- a/libs/libc/Makefile +++ b/libs/libc/Makefile @@ -137,7 +137,7 @@ $(COBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.c $(BIN): $(OBJS) $(call ARCHIVE, $@, $^) -ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y) +ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y) $(Q) $(MAKE) -C zoneinfo all BIN=$(BIN) endif @@ -151,7 +151,7 @@ endif # Context context:: -ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y) +ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y) $(Q) $(MAKE) -C zoneinfo context BIN=$(BIN) endif @@ -170,7 +170,7 @@ makekdepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds) ifneq ($(CONFIG_BUILD_FLAT),y) $(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)" OBJPATH="kbin" endif -ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y) +ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y) $(Q) $(MAKE) -C zoneinfo depend BIN=$(BIN) endif $(Q) touch $@ diff --git a/libs/libc/dlfcn/Kconfig b/libs/libc/dlfcn/Kconfig index 79a351f99b0..7ee9cce3786 100644 --- a/libs/libc/dlfcn/Kconfig +++ b/libs/libc/dlfcn/Kconfig @@ -18,7 +18,7 @@ if LIBC_DLFCN config LDPATH_INITIAL string "Initial LD_LIBRARY_PATH Value" default "" - depends on LIB_ENVPATH + depends on LIBC_ENVPATH ---help--- The initial value of the LD_LIBRARY_PATH variable. This is the colon-separated list of absolute paths. E.g., "/lib:/usr/lib:/system/lib" diff --git a/libs/libc/dlfcn/lib_dlopen.c b/libs/libc/dlfcn/lib_dlopen.c index ed51ac04185..1f4aeaabee4 100644 --- a/libs/libc/dlfcn/lib_dlopen.c +++ b/libs/libc/dlfcn/lib_dlopen.c @@ -410,7 +410,7 @@ FAR void *dlopen(FAR const char *file, int mode) { FAR void *handle = NULL; -#ifdef CONFIG_LIB_ENVPATH +#ifdef CONFIG_LIBC_ENVPATH if (file[0] != '/') { FAR const char *relpath; diff --git a/libs/libc/hex2bin/Kconfig b/libs/libc/hex2bin/Kconfig index 82bb419727c..9e1ead445e4 100644 --- a/libs/libc/hex2bin/Kconfig +++ b/libs/libc/hex2bin/Kconfig @@ -3,7 +3,7 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -config LIB_HEX2BIN +config LIBC_HEX2BIN bool "Intel HEX to binary conversion library" default n ---help--- diff --git a/libs/libc/hex2bin/Make.defs b/libs/libc/hex2bin/Make.defs index b6a27477dd0..2303199f877 100644 --- a/libs/libc/hex2bin/Make.defs +++ b/libs/libc/hex2bin/Make.defs @@ -18,7 +18,7 @@ # ############################################################################ -ifeq ($(CONFIG_LIB_HEX2BIN),y) +ifeq ($(CONFIG_LIBC_HEX2BIN),y) # Add the hex2bin sources to the build diff --git a/libs/libc/hex2bin/lib_fhex2mem.c b/libs/libc/hex2bin/lib_fhex2mem.c index 8853404daae..81713b96d14 100644 --- a/libs/libc/hex2bin/lib_fhex2mem.c +++ b/libs/libc/hex2bin/lib_fhex2mem.c @@ -30,7 +30,7 @@ #include -#ifdef CONFIG_LIB_HEX2BIN +#ifdef CONFIG_LIBC_HEX2BIN /**************************************************************************** * Public Functions @@ -85,4 +85,4 @@ int fhex2mem(FAR FILE *instream, uint32_t baseaddr, uint32_t endpaddr, (enum hex2bin_swap_e)swap); } -#endif /* CONFIG_LIB_HEX2BIN */ +#endif /* CONFIG_LIBC_HEX2BIN */ diff --git a/libs/libc/hex2bin/lib_hex2bin.c b/libs/libc/hex2bin/lib_hex2bin.c index e3cc3bd921e..81e4a7ab401 100644 --- a/libs/libc/hex2bin/lib_hex2bin.c +++ b/libs/libc/hex2bin/lib_hex2bin.c @@ -45,7 +45,7 @@ #include "libc.h" -#ifdef CONFIG_LIB_HEX2BIN +#ifdef CONFIG_LIBC_HEX2BIN /**************************************************************************** * Pre-processor Definitions @@ -710,4 +710,4 @@ exit_with_buffers: return ret; } -#endif /* CONFIG_LIB_HEX2BIN */ +#endif /* CONFIG_LIBC_HEX2BIN */ diff --git a/libs/libc/hex2bin/lib_hex2mem.c b/libs/libc/hex2bin/lib_hex2mem.c index 30716250ec7..628ca5201e7 100644 --- a/libs/libc/hex2bin/lib_hex2mem.c +++ b/libs/libc/hex2bin/lib_hex2mem.c @@ -30,7 +30,7 @@ #include -#ifdef CONFIG_LIB_HEX2BIN +#ifdef CONFIG_LIBC_HEX2BIN /**************************************************************************** * Public Functions @@ -85,4 +85,4 @@ int hex2mem(int fd, uint32_t baseaddr, uint32_t endpaddr, (enum hex2bin_swap_e)swap); } -#endif /* CONFIG_LIB_HEX2BIN */ +#endif /* CONFIG_LIBC_HEX2BIN */ diff --git a/libs/libc/libc.h b/libs/libc/libc.h index feef666e50e..c80d9931c8d 100644 --- a/libs/libc/libc.h +++ b/libs/libc/libc.h @@ -47,8 +47,8 @@ * directory. */ -#ifndef CONFIG_LIB_HOMEDIR -# define CONFIG_LIB_HOMEDIR "/" +#ifndef CONFIG_LIBC_HOMEDIR +# define CONFIG_LIBC_HOMEDIR "/" #endif #define LIB_BUFLEN_UNKNOWN INT_MAX diff --git a/libs/libc/misc/Kconfig b/libs/libc/misc/Kconfig index e8f8978c82a..183108c7609 100644 --- a/libs/libc/misc/Kconfig +++ b/libs/libc/misc/Kconfig @@ -5,13 +5,13 @@ comment "Non-standard Library Support" -config LIB_CRC64_FAST +config LIBC_CRC64_FAST bool "Fast CRC64" default n ---help--- Enable the CRC64 lookup table to compute the CRC64 faster. -config LIB_KBDCODEC +config LIBC_KBDCODEC bool "Keyboard CODEC" default n ---help--- @@ -33,7 +33,7 @@ config LIB_KBDCODEC the C library, it is included here because the decoding side of this interface must be accessible by end user programs. -config LIB_SLCDCODEC +config LIBC_SLCDCODEC bool "Segment LCD CODEC" default n ---help--- @@ -54,7 +54,7 @@ config LIB_SLCDCODEC library, it is included here because the encoding side of this interface must be accessible by end user programs. -config LIB_ENVPATH +config LIBC_ENVPATH bool "Support PATH Environment Variable" default n depends on !DISABLE_ENVIRON diff --git a/libs/libc/misc/Make.defs b/libs/libc/misc/Make.defs index c9ce6ef2a6d..6f46283621c 100644 --- a/libs/libc/misc/Make.defs +++ b/libs/libc/misc/Make.defs @@ -50,19 +50,19 @@ CSRCS += lib_crc8table.c # Keyboard driver encoder/decoder -ifeq ($(CONFIG_LIB_KBDCODEC),y) +ifeq ($(CONFIG_LIBC_KBDCODEC),y) CSRCS += lib_kbdencode.c lib_kbddecode.c endif # SLCD driver encoder/decoder -ifeq ($(CONFIG_LIB_SLCDCODEC),y) +ifeq ($(CONFIG_LIBC_SLCDCODEC),y) CSRCS += lib_slcdencode.c lib_slcddecode.c endif # Environment search path support -ifeq ($(CONFIG_LIB_ENVPATH),y) +ifeq ($(CONFIG_LIBC_ENVPATH),y) CSRCS += lib_envpath.c endif diff --git a/libs/libc/misc/lib_crc64.c b/libs/libc/misc/lib_crc64.c index 328fba8448b..6ee27f3836b 100644 --- a/libs/libc/misc/lib_crc64.c +++ b/libs/libc/misc/lib_crc64.c @@ -104,7 +104,7 @@ * ****************************************************************************/ -#ifdef CONFIG_LIB_CRC64_FAST +#ifdef CONFIG_LIBC_CRC64_FAST static const uint64_t crc64_tab[256] = { 0x0000000000000000, 0x42f0e1eba9ea3693, @@ -250,7 +250,7 @@ static const uint64_t crc64_tab[256] = * ****************************************************************************/ -#ifdef CONFIG_LIB_CRC64_FAST +#ifdef CONFIG_LIBC_CRC64_FAST uint64_t crc64part(FAR const uint8_t *src, size_t len, uint64_t crc64val) { size_t i; diff --git a/libs/libc/misc/lib_envpath.c b/libs/libc/misc/lib_envpath.c index 461f5ac7f29..2d30d9d24aa 100644 --- a/libs/libc/misc/lib_envpath.c +++ b/libs/libc/misc/lib_envpath.c @@ -36,7 +36,7 @@ #include "libc.h" -#if defined(CONFIG_LIB_ENVPATH) +#if defined(CONFIG_LIBC_ENVPATH) /**************************************************************************** * Private Types diff --git a/libs/libc/stdlib/Kconfig b/libs/libc/stdlib/Kconfig index 50e231743b4..b9125f8848d 100644 --- a/libs/libc/stdlib/Kconfig +++ b/libs/libc/stdlib/Kconfig @@ -5,7 +5,7 @@ menu "stdlib Options" -config LIB_RAND_ORDER +config LIBC_RAND_ORDER int "Order of the random number generate" default 1 range 1 3 @@ -13,7 +13,7 @@ config LIB_RAND_ORDER The order of the random number generator. 1=fast but very bad random numbers, 3=slow but very good random numbers. -config LIB_HOMEDIR +config LIBC_HOMEDIR string "Home directory" default "/" depends on !DISABLE_ENVIRON diff --git a/libs/libc/stdlib/lib_srand.c b/libs/libc/stdlib/lib_srand.c index 03f181a7197..80df76fe5ec 100644 --- a/libs/libc/stdlib/lib_srand.c +++ b/libs/libc/stdlib/lib_srand.c @@ -34,13 +34,13 @@ /* First, second, and thired order congruential generators are supported */ -#ifndef CONFIG_LIB_RAND_ORDER -# define CONFIG_LIB_RAND_ORDER 1 +#ifndef CONFIG_LIBC_RAND_ORDER +# define CONFIG_LIBC_RAND_ORDER 1 #endif -#if CONFIG_LIB_RAND_ORDER > 3 -# undef CONFIG_LIB_RAND_ORDER -# define CONFIG_LIB_RAND_ORDER 3 +#if CONFIG_LIBC_RAND_ORDER > 3 +# undef CONFIG_LIBC_RAND_ORDER +# define CONFIG_LIBC_RAND_ORDER 3 #endif #ifndef CONFIG_HAVE_DOUBLE @@ -68,21 +68,21 @@ typedef double float_t; /* First order congruential generators */ static inline unsigned long fgenerate1(void); -#if (CONFIG_LIB_RAND_ORDER == 1) +#if (CONFIG_LIBC_RAND_ORDER == 1) static float_t frand1(void); #endif /* Second order congruential generators */ -#if (CONFIG_LIB_RAND_ORDER > 1) +#if (CONFIG_LIBC_RAND_ORDER > 1) static inline unsigned long fgenerate2(void); -#if (CONFIG_LIB_RAND_ORDER == 2) +#if (CONFIG_LIBC_RAND_ORDER == 2) static float_t frand2(void); #endif /* Third order congruential generators */ -#if (CONFIG_LIB_RAND_ORDER > 2) +#if (CONFIG_LIBC_RAND_ORDER > 2) static inline unsigned long fgenerate3(void); static float_t frand3(void); #endif @@ -93,9 +93,9 @@ static float_t frand3(void); ****************************************************************************/ static unsigned long g_randint1; -#if (CONFIG_LIB_RAND_ORDER > 1) +#if (CONFIG_LIBC_RAND_ORDER > 1) static unsigned long g_randint2; -#if (CONFIG_LIB_RAND_ORDER > 2) +#if (CONFIG_LIBC_RAND_ORDER > 2) static unsigned long g_randint3; #endif #endif @@ -120,7 +120,7 @@ static inline unsigned long fgenerate1(void) return randint; } -#if (CONFIG_LIB_RAND_ORDER == 1) +#if (CONFIG_LIBC_RAND_ORDER == 1) static float_t frand1(void) { /* First order congruential generator. */ @@ -135,7 +135,7 @@ static float_t frand1(void) /* Second order congruential generators */ -#if (CONFIG_LIB_RAND_ORDER > 1) +#if (CONFIG_LIBC_RAND_ORDER > 1) static inline unsigned long fgenerate2(void) { unsigned long randint; @@ -160,7 +160,7 @@ static inline unsigned long fgenerate2(void) return randint; } -#if (CONFIG_LIB_RAND_ORDER == 2) +#if (CONFIG_LIBC_RAND_ORDER == 2) static float_t frand2(void) { /* Second order congruential generator */ @@ -175,7 +175,7 @@ static float_t frand2(void) /* Third order congruential generators */ -#if (CONFIG_LIB_RAND_ORDER > 2) +#if (CONFIG_LIBC_RAND_ORDER > 2) static inline unsigned long fgenerate3(void) { unsigned long randint; @@ -230,10 +230,10 @@ static float_t frand3(void) void srand(unsigned int seed) { g_randint1 = seed; -#if (CONFIG_LIB_RAND_ORDER > 1) +#if (CONFIG_LIBC_RAND_ORDER > 1) g_randint2 = seed; fgenerate1(); -#if (CONFIG_LIB_RAND_ORDER > 2) +#if (CONFIG_LIBC_RAND_ORDER > 2) g_randint3 = seed; fgenerate2(); #endif @@ -259,11 +259,11 @@ unsigned long nrand(unsigned long limit) { /* Get a random integer in the range 0.0 - 1.0 */ -#if (CONFIG_LIB_RAND_ORDER == 1) +#if (CONFIG_LIBC_RAND_ORDER == 1) ratio = frand1(); -#elif (CONFIG_LIB_RAND_ORDER == 2) +#elif (CONFIG_LIBC_RAND_ORDER == 2) ratio = frand2(); -#else /* if (CONFIG_LIB_RAND_ORDER > 2) */ +#else /* if (CONFIG_LIBC_RAND_ORDER > 2) */ ratio = frand3(); #endif diff --git a/libs/libc/time/Kconfig b/libs/libc/time/Kconfig index d1e8cfd2aa0..20abdfc3bc3 100644 --- a/libs/libc/time/Kconfig +++ b/libs/libc/time/Kconfig @@ -51,21 +51,21 @@ config LIBC_TZDIR This is the full path to the location where the TZ database is expected to be found. -config LIB_ZONEINFO +config LIBC_ZONEINFO bool "TZ database" default n ---help--- Download and build the TZ/Olson database. -if LIB_ZONEINFO +if LIBC_ZONEINFO -config LIB_ZONEINFO_ROMFS +config LIBC_ZONEINFO_ROMFS bool "Build ROMFS filesystem" default n depends on FS_ROMFS ---help--- Build a mountable ROMFS filesystem containing the TZ/Olson database -endif # LIB_ZONEINFO +endif # LIBC_ZONEINFO endif # LIBC_LOCALTIME endmenu # Time/Time Zone Support diff --git a/libs/libc/unistd/Kconfig b/libs/libc/unistd/Kconfig index e82b5ea6aa6..bc76ef8e206 100644 --- a/libs/libc/unistd/Kconfig +++ b/libs/libc/unistd/Kconfig @@ -132,7 +132,7 @@ config TASK_SPAWN_DEFAULT_STACKSIZE endmenu # Program Execution Options -config LIB_HOSTNAME +config LIBC_HOSTNAME string "Host name for this device" default "" ---help--- diff --git a/libs/libc/unistd/lib_chdir.c b/libs/libc/unistd/lib_chdir.c index 655b8f18470..20111b61ebf 100644 --- a/libs/libc/unistd/lib_chdir.c +++ b/libs/libc/unistd/lib_chdir.c @@ -142,7 +142,7 @@ int chdir(FAR const char *path) oldpwd = getenv("PWD"); if (!oldpwd) { - oldpwd = CONFIG_LIB_HOMEDIR; + oldpwd = CONFIG_LIBC_HOMEDIR; } alloc = strdup(oldpwd); /* kludge needed because environment is realloc'ed */ diff --git a/libs/libc/unistd/lib_execl.c b/libs/libc/unistd/lib_execl.c index cdea9025046..5caba340cb4 100644 --- a/libs/libc/unistd/lib_execl.c +++ b/libs/libc/unistd/lib_execl.c @@ -100,7 +100,7 @@ * task. * * Input Parameters: - * path - The path to the program to be executed. If CONFIG_LIB_ENVPATH + * path - The path to the program to be executed. If 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. diff --git a/libs/libc/unistd/lib_getcwd.c b/libs/libc/unistd/lib_getcwd.c index 648eb4a1aea..418253ec9d7 100644 --- a/libs/libc/unistd/lib_getcwd.c +++ b/libs/libc/unistd/lib_getcwd.c @@ -98,7 +98,7 @@ FAR char *getcwd(FAR char *buf, size_t size) pwd = getenv("PWD"); if (pwd == NULL) { - pwd = CONFIG_LIB_HOMEDIR; + pwd = CONFIG_LIBC_HOMEDIR; } /* Verify that the cwd will fit into the user-provided buffer */ diff --git a/libs/libc/unistd/lib_gethostname.c b/libs/libc/unistd/lib_gethostname.c index c02b2d9858f..0689aa794b3 100644 --- a/libs/libc/unistd/lib_gethostname.c +++ b/libs/libc/unistd/lib_gethostname.c @@ -62,8 +62,8 @@ * changed via sethostname(), however. */ -#ifndef CONFIG_LIB_HOSTNAME -# define CONFIG_LIB_HOSTNAME "" +#ifndef CONFIG_LIBC_HOSTNAME +# define CONFIG_LIBC_HOSTNAME "" #endif /**************************************************************************** @@ -72,7 +72,7 @@ /* This is the system hostname */ -char g_hostname[HOST_NAME_MAX + 1] = CONFIG_LIB_HOSTNAME; +char g_hostname[HOST_NAME_MAX + 1] = CONFIG_LIBC_HOSTNAME; /**************************************************************************** * Public Functions diff --git a/libs/libc/wqueue/Kconfig b/libs/libc/wqueue/Kconfig index b9afc345811..0dd9cf425f9 100644 --- a/libs/libc/wqueue/Kconfig +++ b/libs/libc/wqueue/Kconfig @@ -6,26 +6,26 @@ menu "User Work Queue Support" depends on !BUILD_FLAT -config LIB_USRWORK +config LIBC_USRWORK bool "User mode worker thread" default n ---help--- User space work queues can also be made available for deferred processing in the NuttX kernel build. -if LIB_USRWORK +if LIBC_USRWORK -config LIB_USRWORKPRIORITY +config LIBC_USRWORKPRIORITY int "User mode priority worker thread priority" default 100 ---help--- The execution priority of the user-mode priority worker thread. Default: 100 -config LIB_USRWORKSTACKSIZE +config LIBC_USRWORKSTACKSIZE int "User mode worker thread stack size" default DEFAULT_TASK_STACKSIZE ---help--- The stack size allocated for the lower priority worker thread. Default: 2K. -endif # LIB_USRWORK +endif # LIBC_USRWORK endmenu # User Work Queue Support diff --git a/libs/libc/wqueue/Make.defs b/libs/libc/wqueue/Make.defs index a0633d14192..a743ae2e3a1 100644 --- a/libs/libc/wqueue/Make.defs +++ b/libs/libc/wqueue/Make.defs @@ -18,7 +18,7 @@ # ############################################################################ -ifeq ($(CONFIG_LIB_USRWORK),y) +ifeq ($(CONFIG_LIBC_USRWORK),y) # Add the work queue C files to the build diff --git a/libs/libc/wqueue/work_cancel.c b/libs/libc/wqueue/work_cancel.c index 21c967b9a98..78813bc17a1 100644 --- a/libs/libc/wqueue/work_cancel.c +++ b/libs/libc/wqueue/work_cancel.c @@ -33,7 +33,7 @@ #include "wqueue/wqueue.h" -#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIBC_USRWORK) && !defined(__KERNEL__) /**************************************************************************** * Private Functions @@ -163,4 +163,4 @@ int work_cancel(int qid, FAR struct work_s *work) } } -#endif /* CONFIG_LIB_USRWORK && !__KERNEL__ */ +#endif /* CONFIG_LIBC_USRWORK && !__KERNEL__ */ diff --git a/libs/libc/wqueue/work_queue.c b/libs/libc/wqueue/work_queue.c index ba5a822edd5..80950fe5aa7 100644 --- a/libs/libc/wqueue/work_queue.c +++ b/libs/libc/wqueue/work_queue.c @@ -36,7 +36,7 @@ #include "wqueue/wqueue.h" -#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIBC_USRWORK) && !defined(__KERNEL__) /**************************************************************************** * Private Functions @@ -196,4 +196,4 @@ int work_queue(int qid, FAR struct work_s *work, worker_t worker, } } -#endif /* CONFIG_LIB_USRWORK && !__KERNEL__ */ +#endif /* CONFIG_LIBC_USRWORK && !__KERNEL__ */ diff --git a/libs/libc/wqueue/work_usrthread.c b/libs/libc/wqueue/work_usrthread.c index 64974c58a6b..874cbcfd968 100644 --- a/libs/libc/wqueue/work_usrthread.c +++ b/libs/libc/wqueue/work_usrthread.c @@ -37,7 +37,7 @@ #include "wqueue/wqueue.h" -#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIBC_USRWORK) && !defined(__KERNEL__) /**************************************************************************** * Pre-processor Definitions @@ -293,8 +293,8 @@ int work_usrstart(void) /* Start a user-mode worker thread for use by applications. */ ret = task_create("uwork", - CONFIG_LIB_USRWORKPRIORITY, - CONFIG_LIB_USRWORKSTACKSIZE, + CONFIG_LIBC_USRWORKPRIORITY, + CONFIG_LIBC_USRWORKSTACKSIZE, (main_t)work_usrthread, ((FAR char * const *)NULL)); if (ret < 0) @@ -309,10 +309,10 @@ int work_usrstart(void) /* Start a user-mode worker thread for use by applications. */ pthread_attr_init(&attr); - pthread_attr_setstacksize(&attr, CONFIG_LIB_USRWORKSTACKSIZE); + pthread_attr_setstacksize(&attr, CONFIG_LIBC_USRWORKSTACKSIZE); pthread_attr_getschedparam(&attr, ¶m); - param.sched_priority = CONFIG_LIB_USRWORKPRIORITY; + param.sched_priority = CONFIG_LIBC_USRWORKPRIORITY; pthread_attr_setschedparam(&attr, ¶m); ret = pthread_create(&usrwork, &attr, work_usrthread, NULL); @@ -331,4 +331,4 @@ int work_usrstart(void) #endif } -#endif /* CONFIG_LIB_USRWORK && !__KERNEL__*/ +#endif /* CONFIG_LIBC_USRWORK && !__KERNEL__*/ diff --git a/libs/libc/wqueue/wqueue.h b/libs/libc/wqueue/wqueue.h index 4c0342199a0..d9886c276a5 100644 --- a/libs/libc/wqueue/wqueue.h +++ b/libs/libc/wqueue/wqueue.h @@ -32,7 +32,7 @@ #include -#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIBC_USRWORK) && !defined(__KERNEL__) /**************************************************************************** * Pre-processor Definitions @@ -63,5 +63,5 @@ extern struct usr_wqueue_s g_usrwork; * Public Function Prototypes ****************************************************************************/ -#endif /* CONFIG_LIB_USRWORK && !__KERNEL__*/ +#endif /* CONFIG_LIBC_USRWORK && !__KERNEL__*/ #endif /* __LIBC_WQUEUE_WQUEUE_H */ diff --git a/libs/libc/zoneinfo/Makefile b/libs/libc/zoneinfo/Makefile index 05a438d4ca0..2357a1ff782 100644 --- a/libs/libc/zoneinfo/Makefile +++ b/libs/libc/zoneinfo/Makefile @@ -20,7 +20,7 @@ include $(TOPDIR)/Make.defs -ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y) +ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y) CSRCS += tzromfs.c endif @@ -51,7 +51,7 @@ $(COBJS): %$(OBJEXT): %.c # ROMFS file system containing the TZ database -ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y) +ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y) checkgenromfs: @genromfs -h 1>/dev/null 2>&1 || { \ @@ -72,7 +72,7 @@ else romfs: -endif # CONFIG_LIB_ZONEINFO_ROMFS +endif # CONFIG_LIBC_ZONEINFO_ROMFS # Build TZ database diff --git a/libs/libc/zoneinfo/README.txt b/libs/libc/zoneinfo/README.txt index 8d0ef674b77..de5d23bde0f 100644 --- a/libs/libc/zoneinfo/README.txt +++ b/libs/libc/zoneinfo/README.txt @@ -54,8 +54,8 @@ modifications to the configuration that I used for testing: CONFIG_LIBC_TZ_MAX_TIMES=370 CONFIG_LIBC_TZ_MAX_TYPES=20 - CONFIG_LIB_ZONEINFO=y - CONFIG_LIB_ZONEINFO_ROMFS=y + CONFIG_LIBC_ZONEINFO=y + CONFIG_LIBC_ZONEINFO_ROMFS=y NOTE: The full TZ database is quite large. To create a reasonable sized ROMFS image, I had to trim some of the files like this: diff --git a/sched/Kconfig b/sched/Kconfig index 49417539414..d17cb570540 100644 --- a/sched/Kconfig +++ b/sched/Kconfig @@ -1357,7 +1357,7 @@ config SIG_EVTHREAD bool "Support SIGEV_THHREAD" default n depends on !BUILD_KERNEL && SCHED_WORKQUEUE - select LIB_USRWORK if BUILD_PROTECTED + select LIBC_USRWORK if BUILD_PROTECTED ---help--- Built in support for the SIGEV_THREAD signal deliver method. @@ -1562,7 +1562,7 @@ config SIG_SIGCONDTIMEDOUT config SIG_SIGWORK int "SIGWORK" default 17 - depends on SCHED_WORKQUEUE || LIB_USRWORK + depends on SCHED_WORKQUEUE || LIBC_USRWORK ---help--- SIGWORK is a non-standard signal used to wake up various internal NuttX worker threads. This setting specifies the signal number diff --git a/sched/init/nx_bringup.c b/sched/init/nx_bringup.c index 7e6d6f769f8..66e5b0869b3 100644 --- a/sched/init/nx_bringup.c +++ b/sched/init/nx_bringup.c @@ -105,7 +105,7 @@ extern const int CONFIG_INIT_NEXPORTS; /* In the protected build (only) we also need to start the user work queue */ #if !defined(CONFIG_BUILD_PROTECTED) -# undef CONFIG_LIB_USRWORK +# undef CONFIG_LIBC_USRWORK #endif #if !defined(CONFIG_USERMAIN_PRIORITY) @@ -170,7 +170,7 @@ static inline void nx_pgworker(void) #ifdef CONFIG_SCHED_WORKQUEUE static inline void nx_workqueues(void) { -#ifdef CONFIG_LIB_USRWORK +#ifdef CONFIG_LIBC_USRWORK pid_t pid; #endif @@ -192,7 +192,7 @@ static inline void nx_workqueues(void) #endif /* CONFIG_SCHED_LPWORK */ -#ifdef CONFIG_LIB_USRWORK +#ifdef CONFIG_LIBC_USRWORK /* Start the user-space work queue */ DEBUGASSERT(USERSPACE->work_usrstart != NULL); @@ -403,8 +403,8 @@ int nx_bringup(void) * by all of the threads created by the IDLE task. */ -#ifdef CONFIG_LIB_HOMEDIR - setenv("PWD", CONFIG_LIB_HOMEDIR, 1); +#ifdef CONFIG_LIBC_HOMEDIR + setenv("PWD", CONFIG_LIBC_HOMEDIR, 1); #endif #ifdef CONFIG_PATH_INITIAL diff --git a/sched/task/task_execv.c b/sched/task/task_execv.c index 65163250328..b4472e82891 100644 --- a/sched/task/task_execv.c +++ b/sched/task/task_execv.c @@ -94,7 +94,7 @@ * task. * * Input Parameters: - * path - The path to the program to be executed. If CONFIG_LIB_ENVPATH + * path - The path to the program to be executed. If 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. diff --git a/sched/task/task_posixspawn.c b/sched/task/task_posixspawn.c index 2f09bdf0871..c7ede6c16d6 100644 --- a/sched/task/task_posixspawn.c +++ b/sched/task/task_posixspawn.c @@ -56,7 +56,7 @@ * child task in the variable pointed to by a non-NULL 'pid' argument.| * * path - The 'path' argument identifies the file to execute. If - * CONFIG_LIB_ENVPATH is defined, this may be either a relative or + * CONFIG_LIBC_ENVPATH is defined, this may be either a relative or * or an absolute path. Otherwise, it must be an absolute path. * * attr - If the value of the 'attr' parameter is NULL, the all default @@ -240,7 +240,7 @@ static int nxposix_spawn_proxy(int argc, FAR char *argv[]) * directories passed as the environment variable PATH. * * NOTE: NuttX provides only one implementation: If - * CONFIG_LIB_ENVPATH is defined, then only posix_spawnp() behavior + * CONFIG_LIBC_ENVPATH is defined, then only posix_spawnp() behavior * is supported; otherwise, only posix_spawn behavior is supported. * * file_actions - If 'file_actions' is a null pointer, then file @@ -292,8 +292,8 @@ static int nxposix_spawn_proxy(int argc, FAR char *argv[]) * * 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() behavior + * 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 * altered (NuttX does not support the 'environ' variable). @@ -310,7 +310,7 @@ static int nxposix_spawn_proxy(int argc, FAR char *argv[]) * ****************************************************************************/ -#ifdef CONFIG_LIB_ENVPATH +#ifdef CONFIG_LIBC_ENVPATH int posix_spawnp(FAR pid_t *pid, FAR const char *path, FAR const posix_spawn_file_actions_t *file_actions, FAR const posix_spawnattr_t *attr, diff --git a/syscall/syscall.csv b/syscall/syscall.csv index c202ac9232b..44266c1bd2b 100644 --- a/syscall/syscall.csv +++ b/syscall/syscall.csv @@ -84,8 +84,8 @@ "opendir","dirent.h","","FAR DIR *","FAR const char *" "pgalloc", "nuttx/arch.h", "defined(CONFIG_BUILD_KERNEL)", "uintptr_t", "uintptr_t", "unsigned int" "poll","poll.h","","int","FAR struct pollfd *","nfds_t","int" -"posix_spawn","spawn.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS) && !defined(CONFIG_LIB_ENVPATH)","int","FAR pid_t *","FAR const char *","FAR const posix_spawn_file_actions_t *","FAR const posix_spawnattr_t *","FAR char * const []|FAR char * const *","FAR char * const []|FAR char * const *" -"posix_spawnp","spawn.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS) && defined(CONFIG_LIB_ENVPATH)","int","FAR pid_t *","FAR const char *","FAR const posix_spawn_file_actions_t *","FAR const posix_spawnattr_t *","FAR char * const []|FAR char * const *","FAR char * const []|FAR char * const *" +"posix_spawn","spawn.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS) && !defined(CONFIG_LIBC_ENVPATH)","int","FAR pid_t *","FAR const char *","FAR const posix_spawn_file_actions_t *","FAR const posix_spawnattr_t *","FAR char * const []|FAR char * const *","FAR char * const []|FAR char * const *" +"posix_spawnp","spawn.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS) && defined(CONFIG_LIBC_ENVPATH)","int","FAR pid_t *","FAR const char *","FAR const posix_spawn_file_actions_t *","FAR const posix_spawnattr_t *","FAR char * const []|FAR char * const *","FAR char * const []|FAR char * const *" "ppoll","poll.h","","int","FAR struct pollfd *","nfds_t","FAR const struct timespec *","FAR const sigset_t *" "prctl","sys/prctl.h", "CONFIG_TASK_NAME_SIZE > 0","int","int","...","uintptr_t","uintptr_t" "pread","unistd.h","","ssize_t","int","FAR void *","size_t","off_t"