Rename CONFIG_LIB_BOARDCTL to CONFIG_BOARDCTL

since boardctl isn't a libc feature Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2021-08-01 15:00:54 +08:00 · 2021-08-01 15:00:54 +08:00 · b12f588140
commit b12f588140
parent 0272a16010
538 changed files with 629 additions and 629 deletions
--- a/Documentation/reference/user/13_boardctl.rst
+++ b/Documentation/reference/user/13_boardctl.rst
@ -183,7 +183,7 @@ USB
   
   :Argument: A pointer to an instance of :c:struct:`boardioc_usbdev_ctrl_s`.
   
-   :configuration: CONFIG_LIB_BOARDCTL && CONFIG_BOARDCTL_USBDEVCTRL
+   :configuration: CONFIG_BOARDCTL && CONFIG_BOARDCTL_USBDEVCTRL
   
   :dependencies: Board logic must provide ``board_<usbdev>_initialize()`.
   
--- a/4
+++ b/4
@ -16670,7 +16670,7 @@ detailed bugfix information):

      - All configurations that use NXIMAGE or NXHELLO must select
        NX_MULTIUSER.  All configurations that use examples/nxterm must
-        enable CONFIG_LIB_BOARDCTL.
+        enable CONFIG_BOARDCTL.
      - All configurations that use NXLINES must select NX_MULTIUSER.  All
        configurations that use the NX server need to have larger POSIX
        messages.
@ -26284,7 +26284,7 @@ information):
    * Atmel SAMA5Dx Boards:

      - SAMA5D4-EK:  Fix bad conditional compilation for
-        board_app_initialize().  Should depend only on CONFIG_LIB_BOARDCTL,
+        board_app_initialize().  Should depend only on CONFIG_BOARDCTL,
        CONFIG_BUILD_KERNEL is irrelevant.  From Gregory Nutt.

    * Microchip i.MXRT:
--- a/boards/Kconfig
+++ b/boards/Kconfig
@ -3316,14 +3316,14 @@ config BOARD_INITRNGSEED
 		can then provide early entropy seed to the pool through
 		entropy injection APIs provided at 'nuttx/random.h'.

-config LIB_BOARDCTL
+config BOARDCTL
 	bool "Enable boardctl() interface"
 	default n
 	---help---
 		Enables support for the boardctl() interface.  Architecture
 		specific logic must provide board_app_initialize() interface.

-if LIB_BOARDCTL
+if BOARDCTL

 config BOARDCTL_FINALINIT
 	bool "Enable board app final init"
@ -3474,4 +3474,4 @@ config BOARDCTL_IOCTL
 		Enables support for board-specific boardctl() commands.
 		Architecture specific logic must provide board_ioctl() interface.

-endif # LIB_BOARDCTL
+endif # BOARDCTL
--- a/boards/Makefile
+++ b/boards/Makefile
@ -51,7 +51,7 @@ CONFIG_CSRCS = dummy.c

 # boardctl support

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CONFIG_CSRCS += boardctl.c
 endif

--- a/boards/arm/a1x/pcduino-a10/src/Makefile
+++ b/boards/arm/a1x/pcduino-a10/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = a1x_boot.c a1x_bringup.c a1x_leds.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += a1x_appinit.c
 endif

--- a/boards/arm/a1x/pcduino-a10/src/a1x_bringup.c
+++ b/boards/arm/a1x/pcduino-a10/src/a1x_bringup.c
@ -53,7 +53,7 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/a1x/pcduino-a10/src/pcduino_a10.h
+++ b/boards/arm/a1x/pcduino-a10/src/pcduino_a10.h
@ -145,7 +145,7 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/am335x/beaglebone-black/src/Makefile
+++ b/boards/arm/am335x/beaglebone-black/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = am335x_boot.c am335x_bringup.c am335x_leds.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += am335x_appinit.c
 endif

--- a/boards/arm/am335x/beaglebone-black/src/am335x_bringup.c
+++ b/boards/arm/am335x/beaglebone-black/src/am335x_bringup.c
@ -124,7 +124,7 @@ static void am335x_can_register(void)
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/am335x/beaglebone-black/src/beaglebone-black.h
+++ b/boards/arm/am335x/beaglebone-black/src/beaglebone-black.h
@ -129,7 +129,7 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/cxd56xx/spresense/configs/elf/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/elf/defconfig
@ -14,6 +14,7 @@ CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_USEBASEPRI=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
@ -34,7 +35,6 @@ CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_ROMFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_LIBC_ENVPATH=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=1572864
--- a/boards/arm/cxd56xx/spresense/configs/module/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/module/defconfig
@ -14,6 +14,7 @@ CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_USEBASEPRI=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
@ -33,7 +34,6 @@ CONFIG_FS_ROMFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_MODULE=y
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
--- a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig
@ -14,6 +14,7 @@ CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_USEBASEPRI=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARDCTL_APP_SYMTAB=y
 CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
@ -37,7 +38,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=1572864
--- a/boards/arm/cxd56xx/spresense/src/Make.defs
+++ b/boards/arm/cxd56xx/spresense/src/Make.defs
@ -22,7 +22,7 @@ CSRCS += cxd56_main.c
 CSRCS += cxd56_clock.c
 CSRCS += cxd56_bringup.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += cxd56_appinit.c
 CSRCS += cxd56_power.c
 endif
--- a/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
@ -182,7 +182,7 @@ static void timer_initialize(void)
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/cxd56xx/spresense/src/cxd56_ioctl.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_ioctl.c
@ -81,7 +81,7 @@ int board_ioctl(unsigned int cmd, uintptr_t arg)
       * DESCRIPTION:   Set signal id for notify USB device connection status
       *                and supply current value.
       * ARG:           None
-       * CONFIGURATION: CONFIG_LIB_BOARDCTL
+       * CONFIGURATION: CONFIG_BOARDCTL
       * DEPENDENCIES:  Board logic must provide board_app_initialization
       */

--- a/boards/arm/cxd56xx/spresense/src/spresense.h
+++ b/boards/arm/cxd56xx/spresense/src/spresense.h
@ -42,7 +42,7 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/dm320/ntosd-dm320/src/Makefile
+++ b/boards/arm/dm320/ntosd-dm320/src/Makefile
@ -26,7 +26,7 @@ ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y)
 CSRCS += dm320_boardinit.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += dm320_appinit.c
 endif

--- a/boards/arm/eoss3/quickfeather/src/eoss3_appinit.c
+++ b/boards/arm/eoss3/quickfeather/src/eoss3_appinit.c
@ -27,7 +27,7 @@

 #include <nuttx/board.h>

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -63,4 +63,4 @@ int board_app_initialize(uintptr_t arg)
  return OK;
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/eoss3/quickfeather/src/eoss3_bringup.c
+++ b/boards/arm/eoss3/quickfeather/src/eoss3_bringup.c
@ -45,7 +45,7 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/eoss3/quickfeather/src/quickfeather.h
+++ b/boards/arm/eoss3/quickfeather/src/quickfeather.h
@ -68,7 +68,7 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/imx6/sabre-6quad/configs/elf/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/elf/defconfig
@ -19,6 +19,7 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7A_ASSOCIATIVITY_16WAY=y
 CONFIG_ARMV7A_L2CC_PL310=y
 CONFIG_ARMV7A_WAYSIZE_64KB=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=99369
 CONFIG_BOOT_RUNFROMSDRAM=y
@ -37,7 +38,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_IMX6_UART1=y
 CONFIG_IMX_DDR_SIZE=1073741824
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_PL310_LOCKDOWN_BY_LINE=y
 CONFIG_PL310_LOCKDOWN_BY_MASTER=y
 CONFIG_PREALLOC_TIMERS=4
--- a/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig
@ -19,6 +19,7 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7A_ASSOCIATIVITY_16WAY=y
 CONFIG_ARMV7A_L2CC_PL310=y
 CONFIG_ARMV7A_WAYSIZE_64KB=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARDCTL_APP_SYMTAB=y
 CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=99369
@ -41,7 +42,6 @@ CONFIG_IMX_DDR_SIZE=1073741824
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PL310_LOCKDOWN_BY_LINE=y
 CONFIG_PL310_LOCKDOWN_BY_MASTER=y
--- a/boards/arm/imx6/sabre-6quad/src/Makefile
+++ b/boards/arm/imx6/sabre-6quad/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = imx_boardinit.c imx_bringup.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += imx_appinit.c
 endif

--- a/boards/arm/imx6/sabre-6quad/src/imx_appinit.c
+++ b/boards/arm/imx6/sabre-6quad/src/imx_appinit.c
@ -30,7 +30,7 @@

 #include "sabre-6quad.h"

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -72,4 +72,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/imx6/sabre-6quad/src/sabre-6quad.h
+++ b/boards/arm/imx6/sabre-6quad/src/sabre-6quad.h
@ -77,7 +77,7 @@
 *
 ****************************************************************************/

-#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
 int imx_bringup(void);
 #endif

--- a/boards/arm/imxrt/imxrt1020-evk/src/Makefile
+++ b/boards/arm/imxrt/imxrt1020-evk/src/Makefile
@ -25,7 +25,7 @@ ifeq ($(CONFIG_IMXRT_SDRAMC),y)
 CSRCS += imxrt_sdram.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += imxrt_appinit.c imxrt_bringup.c
 else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y)
 CSRCS += imxrt_bringup.c
--- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt1020-evk.h
+++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt1020-evk.h
@ -128,7 +128,7 @@
 *
 ****************************************************************************/

-#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
 int imxrt_bringup(void);
 #endif

--- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_appinit.c
+++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_appinit.c
@ -30,7 +30,7 @@

 #include "imxrt1020-evk.h"

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -72,4 +72,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/imxrt/imxrt1050-evk/src/Makefile
+++ b/boards/arm/imxrt/imxrt1050-evk/src/Makefile
@ -26,7 +26,7 @@ ifeq ($(CONFIG_IMXRT_SDRAMC),y)
 CSRCS += imxrt_sdram.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += imxrt_appinit.c imxrt_bringup.c
 else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y)
 CSRCS += imxrt_bringup.c
--- a/boards/arm/imxrt/imxrt1050-evk/src/imxrt1050-evk.h
+++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt1050-evk.h
@ -132,7 +132,7 @@
 *
 ****************************************************************************/

-#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
 int imxrt_bringup(void);
 #endif

--- a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_appinit.c
+++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_appinit.c
@ -30,7 +30,7 @@

 #include "imxrt1050-evk.h"

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -72,4 +72,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/imxrt/imxrt1060-evk/src/Makefile
+++ b/boards/arm/imxrt/imxrt1060-evk/src/Makefile
@ -26,7 +26,7 @@ ifeq ($(CONFIG_IMXRT_SDRAMC),y)
 CSRCS += imxrt_sdram.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += imxrt_appinit.c imxrt_bringup.c
 else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y)
 CSRCS += imxrt_bringup.c
--- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h
+++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h
@ -205,7 +205,7 @@
 *
 ****************************************************************************/

-#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
 int imxrt_bringup(void);
 #endif

--- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c
+++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c
@ -34,7 +34,7 @@
 #  define HAVE_LEDS 0
 #endif

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -88,4 +88,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/imxrt/imxrt1064-evk/src/Makefile
+++ b/boards/arm/imxrt/imxrt1064-evk/src/Makefile
@ -26,7 +26,7 @@ ifeq ($(CONFIG_IMXRT_SDRAMC),y)
 CSRCS += imxrt_sdram.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += imxrt_appinit.c imxrt_bringup.c
 else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y)
 CSRCS += imxrt_bringup.c
--- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt1064-evk.h
+++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt1064-evk.h
@ -205,7 +205,7 @@
 *
 ****************************************************************************/

-#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
 int imxrt_bringup(void);
 #endif

--- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_appinit.c
+++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_appinit.c
@ -34,7 +34,7 @@
 #  define HAVE_LEDS 0
 #endif

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -88,4 +88,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/imxrt/teensy-4.x/src/Makefile
+++ b/boards/arm/imxrt/teensy-4.x/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = imxrt_boot.c imxrt_flexspi_nor_boot.c imxrt_flexspi_nor_flash.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += imxrt_appinit.c imxrt_bringup.c
 else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y)
 CSRCS += imxrt_bringup.c
--- a/boards/arm/imxrt/teensy-4.x/src/imxrt_appinit.c
+++ b/boards/arm/imxrt/teensy-4.x/src/imxrt_appinit.c
@ -35,7 +35,7 @@
 #  define HAVE_LEDS 0
 #endif

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -96,4 +96,4 @@ int board_app_initialize(uintptr_t arg)
  UNUSED(ret);
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/imxrt/teensy-4.x/src/teensy-4.h
+++ b/boards/arm/imxrt/teensy-4.x/src/teensy-4.h
@ -145,7 +145,7 @@
 *
 ****************************************************************************/

-#    if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#    if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
 int imxrt_bringup(void);
 #    endif

--- a/boards/arm/kinetis/freedom-k28f/src/Makefile
+++ b/boards/arm/kinetis/freedom-k28f/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = k28_boot.c k28_bringup.c k28_spi.c k28_i2c.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += k28_appinit.c
 endif

--- a/boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h
+++ b/boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h
@ -224,7 +224,7 @@ extern FAR struct i2c_master_s *g_i2c1_dev;
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/kinetis/freedom-k28f/src/k28_bringup.c
+++ b/boards/arm/kinetis/freedom-k28f/src/k28_bringup.c
@ -55,7 +55,7 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/kinetis/freedom-k64f/README.txt
+++ b/boards/arm/kinetis/freedom-k64f/README.txt
@ -461,7 +461,7 @@ SD Card Support

    Application Configuration -> NSH Library
      CONFIG_NSH_ARCHINIT=y                 : NSH board-initialization, and
-      CONFIG_LIB_BOARDCTL=y                 : Or
+      CONFIG_BOARDCTL=y                 : Or
      CONFIG_BOARD_LATE_INITIALIZE=y

  Using the SD card
--- a/boards/arm/kinetis/freedom-k64f/src/Makefile
+++ b/boards/arm/kinetis/freedom-k64f/src/Makefile
@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += k64_buttons.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += k64_appinit.c k64_bringup.c
 else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y)
 CSRCS += k64_bringup.c
--- a/boards/arm/kinetis/freedom-k64f/src/freedom-k64f.h
+++ b/boards/arm/kinetis/freedom-k64f/src/freedom-k64f.h
@ -250,7 +250,7 @@ void weak_function k64_usbinitialize(void);
 *
 ****************************************************************************/

-#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
 int k64_bringup(void);
 #endif

--- a/boards/arm/kinetis/freedom-k64f/src/k64_appinit.c
+++ b/boards/arm/kinetis/freedom-k64f/src/k64_appinit.c
@ -30,7 +30,7 @@

 #include "freedom-k64f.h"

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -72,4 +72,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/kinetis/freedom-k64f/src/k64_bringup.c
+++ b/boards/arm/kinetis/freedom-k64f/src/k64_bringup.c
@ -38,7 +38,7 @@

 #include "freedom-k64f.h"

-#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)

 /****************************************************************************
 * Public Functions
@ -153,4 +153,4 @@ int k64_bringup(void)
  return OK;
 }

-#endif /* CONFIG_LIB_BOARDCTL CONFIG_BOARD_LATE_INITIALIZE */
+#endif /* CONFIG_BOARDCTL CONFIG_BOARD_LATE_INITIALIZE */
--- a/boards/arm/kinetis/freedom-k66f/README.txt
+++ b/boards/arm/kinetis/freedom-k66f/README.txt
@ -464,7 +464,7 @@ SD Card Support

    Application Configuration -> NSH Library
      CONFIG_NSH_ARCHINIT=y                 : NSH board-initialization, and
-      CONFIG_LIB_BOARDCTL=y                 : Or
+      CONFIG_BOARDCTL=y                 : Or
      CONFIG_BOARD_LATE_INITIALIZE=y

  Using the SD card
--- a/boards/arm/kinetis/freedom-k66f/src/Makefile
+++ b/boards/arm/kinetis/freedom-k66f/src/Makefile
@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += k66_buttons.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += k66_appinit.c k66_bringup.c
 ifeq ($(CONFIG_BOARDCTL_RESET),y)
 CSRCS += k66_reset.c
--- a/boards/arm/kinetis/freedom-k66f/src/freedom-k66f.h
+++ b/boards/arm/kinetis/freedom-k66f/src/freedom-k66f.h
@ -275,7 +275,7 @@ void weak_function k66_usbinitialize(void);
 *
 ****************************************************************************/

-#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
 int k66_bringup(void);
 #endif

--- a/boards/arm/kinetis/freedom-k66f/src/k66_appinit.c
+++ b/boards/arm/kinetis/freedom-k66f/src/k66_appinit.c
@ -30,7 +30,7 @@

 #include "freedom-k66f.h"

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -72,4 +72,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/kinetis/freedom-k66f/src/k66_bringup.c
+++ b/boards/arm/kinetis/freedom-k66f/src/k66_bringup.c
@ -38,7 +38,7 @@
 #include "kinetis_spi.h"
 #include "freedom-k66f.h"

-#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)

 /****************************************************************************
 * Public Functions
@ -156,4 +156,4 @@ int k66_bringup(void)
  UNUSED(ret);
  return OK;
 }
-#endif /* CONFIG_LIB_BOARDCTL CONFIG_BOARD_LATE_INITIALIZE */
+#endif /* CONFIG_BOARDCTL CONFIG_BOARD_LATE_INITIALIZE */
--- a/boards/arm/kinetis/kwikstik-k40/src/Makefile
+++ b/boards/arm/kinetis/kwikstik-k40/src/Makefile
@ -30,7 +30,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += k40_buttons.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += k40_appinit.c
 endif

--- a/boards/arm/kinetis/teensy-3.x/src/Makefile
+++ b/boards/arm/kinetis/teensy-3.x/src/Makefile
@ -31,7 +31,7 @@ ifeq ($(CONFIG_KINETIS_USBOTG),y)
 CSRCS += k20_usbdev.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += k20_appinit.c
 endif

--- a/boards/arm/kinetis/twr-k60n512/src/Makefile
+++ b/boards/arm/kinetis/twr-k60n512/src/Makefile
@ -30,7 +30,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += k60_buttons.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += k60_appinit.c
 endif

--- a/boards/arm/kinetis/twr-k64f120m/src/Makefile
+++ b/boards/arm/kinetis/twr-k64f120m/src/Makefile
@ -31,7 +31,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 #CSRCS += k64_buttons.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += k64_appinit.c
 endif

--- a/boards/arm/kinetis/twr-k64f120m/src/twrk64.h
+++ b/boards/arm/kinetis/twr-k64f120m/src/twrk64.h
@ -273,7 +273,7 @@ void weak_function k64_usbinitialize(void);
 *
 ****************************************************************************/

-#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
 int k64_bringup(void);
 #endif

--- a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig
+++ b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig
@ -19,6 +19,7 @@ CONFIG_ARCH_CHIP="kl"
 CONFIG_ARCH_CHIP_KL=y
 CONFIG_ARCH_CHIP_MKL25Z128=y
 CONFIG_ARCH_STACKDUMP=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARD_LOOPSPERMSEC=2988
 CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
@ -28,7 +29,6 @@ CONFIG_EXAMPLES_PWM=y
 CONFIG_KL_TPM0=y
 CONFIG_KL_TPM0_PWM=y
 CONFIG_KL_UART0=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_MM_SMALL=y
 CONFIG_MOTOROLA_SREC=y
 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
--- a/boards/arm/kl/freedom-kl25z/src/Makefile
+++ b/boards/arm/kl/freedom-kl25z/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = kl_boardinitialize.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += kl_appinit.c
 endif

--- a/boards/arm/kl/freedom-kl25z/src/kl_appinit.c
+++ b/boards/arm/kl/freedom-kl25z/src/kl_appinit.c
@ -32,7 +32,7 @@

 #include "freedom-kl25z.h"

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -87,4 +87,4 @@ int board_app_initialize(uintptr_t arg)
  return OK;
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c
+++ b/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c
@ -109,7 +109,7 @@ void board_late_initialize(void)
   * user-space but the initialization function must run in kernel space.
   */

-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
  board_app_initialize(0);
 #endif
 }
--- a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig
+++ b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig
@ -19,6 +19,7 @@ CONFIG_ARCH_CHIP="kl"
 CONFIG_ARCH_CHIP_KL=y
 CONFIG_ARCH_CHIP_MKL26Z128=y
 CONFIG_ARCH_STACKDUMP=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARD_LOOPSPERMSEC=2988
 CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
@ -28,7 +29,6 @@ CONFIG_EXAMPLES_PWM=y
 CONFIG_KL_TPM0=y
 CONFIG_KL_TPM0_PWM=y
 CONFIG_KL_UART0=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_MM_SMALL=y
 CONFIG_MOTOROLA_SREC=y
 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
--- a/boards/arm/kl/freedom-kl26z/src/Makefile
+++ b/boards/arm/kl/freedom-kl26z/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = kl_boardinitialize.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += kl_appinit.c
 endif

--- a/boards/arm/kl/freedom-kl26z/src/kl_appinit.c
+++ b/boards/arm/kl/freedom-kl26z/src/kl_appinit.c
@ -31,7 +31,7 @@

 #include "freedom-kl26z.h"

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -78,4 +78,4 @@ int board_app_initialize(uintptr_t arg)
  return OK;
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c
+++ b/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c
@ -102,7 +102,7 @@ void board_late_initialize(void)
   * user-space but the initialization function must run in kernel space.
   */

-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
  board_app_initialize(0);
 #endif
 }
--- a/boards/arm/kl/teensy-lc/configs/nsh/defconfig
+++ b/boards/arm/kl/teensy-lc/configs/nsh/defconfig
@ -20,6 +20,7 @@ CONFIG_ARCH_CHIP="kl"
 CONFIG_ARCH_CHIP_KL=y
 CONFIG_ARCH_CHIP_MKL25Z64=y
 CONFIG_ARCH_STACKDUMP=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARD_LOOPSPERMSEC=2988
 CONFIG_BUILTIN=y
 CONFIG_C99_BOOL8=y
@ -43,7 +44,6 @@ CONFIG_KL_TPM1_PWM=y
 CONFIG_KL_TPM2=y
 CONFIG_KL_TPM2_PWM=y
 CONFIG_KL_UART0=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_MM_SMALL=y
 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_BUILTIN_APPS=y
--- a/boards/arm/kl/teensy-lc/src/Makefile
+++ b/boards/arm/kl/teensy-lc/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = kl_boardinitialize.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += kl_appinit.c
 endif

--- a/boards/arm/kl/teensy-lc/src/kl_appinit.c
+++ b/boards/arm/kl/teensy-lc/src/kl_appinit.c
@ -32,7 +32,7 @@

 #include "teensy-lc.h"

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -81,4 +81,4 @@ int board_app_initialize(uintptr_t arg)
  return OK;
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c
+++ b/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c
@ -122,7 +122,7 @@ void board_late_initialize(void)
   * user-space but the initialization function must run in kernel space.
   */

-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
  board_app_initialize(0);
 #endif
 }
--- a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig
@ -14,6 +14,7 @@ CONFIG_ARCH_CHIP_LC823450=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_STDARG_H=y
 CONFIG_BINFMT_CONSTRUCTORS=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=12061
@ -34,7 +35,6 @@ CONFIG_LC823450_UART0=y
 CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_KBDCODEC=y
 CONFIG_LIBM=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_NAME_MAX=765
 CONFIG_NETUTILS_CODECS=y
--- a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig
@ -13,6 +13,7 @@ CONFIG_ARCH_CHIP="lc823450"
 CONFIG_ARCH_CHIP_LC823450=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_STDARG_H=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARDCTL_APP_SYMTAB=y
 CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=12061
@ -33,7 +34,6 @@ CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_KBDCODEC=y
 CONFIG_LIBM=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_NAME_MAX=765
 CONFIG_NETUTILS_CODECS=y
--- a/boards/arm/lc823450/lc823450-xgevk/src/Makefile
+++ b/boards/arm/lc823450/lc823450-xgevk/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = lc823450_boot.c lc823450_mux.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += lc823450_appinit.c lc823450_bringup.c
 ifeq ($(CONFIG_BOARDCTL_RESET),y)
 CSRCS += lc823450_reset.c
--- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450-xgevk.h
+++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450-xgevk.h
@ -67,7 +67,7 @@ int lc823450_adc_setup(void);
 *
 ****************************************************************************/

-#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
 int lc823450_bringup(void);
 #endif

--- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_appinit.c
+++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_appinit.c
@ -37,7 +37,7 @@
 #include "lc823450_i2c.h"
 #include "lc823450-xgevk.h"

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Private Functions
@ -174,4 +174,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/lpc17xx_40xx/lincoln60/src/Makefile
+++ b/boards/arm/lpc17xx_40xx/lincoln60/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = lpc17_40_boot.c lpc17_40_leds.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += lpc17_40_appinit.c
 endif

--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/Makefile
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/Makefile
@ -40,7 +40,7 @@ ifeq ($(CONFIG_LPC17_40_LCD),y)
  CSRCS += lpc17_40_lcd.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
  CSRCS += lpc17_40_appinit.c
 endif

--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_bringup.c
@ -327,7 +327,7 @@ static int nsh_usbhostinitialize(void)
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library via boardctl()
 *
 ****************************************************************************/
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc4088-devkit.h
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc4088-devkit.h
@ -166,7 +166,7 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library via boardctl()
 *
 ****************************************************************************/
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/Makefile
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/Makefile
@ -37,7 +37,7 @@ ifeq ($(CONFIG_LPC17_40_EXTNAND),y)
  CSRCS += lpc17_40_nandinitialize.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
  CSRCS += lpc17_40_appinit.c
 endif

--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_bringup.c
@ -363,7 +363,7 @@ static int nsh_usbhostinitialize(void)
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library via boardctl()
 *
 ****************************************************************************/
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc4088-quickstart.h
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc4088-quickstart.h
@ -94,7 +94,7 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library via boardctl()
 *
 ****************************************************************************/
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig
@ -14,9 +14,9 @@ CONFIG_ARCH_CHIP="lpc17xx_40xx"
 CONFIG_ARCH_CHIP_LPC1768=y
 CONFIG_ARCH_CHIP_LPC17XX_40XX=y
 CONFIG_ARCH_STACKDUMP=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARD_LOOPSPERMSEC=8079
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_LPC17_40_SSP1=y
 CONFIG_LPC17_40_UART3=y
 CONFIG_LPC17_40_USBDEV=y
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/Makefile
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/Makefile
@ -30,7 +30,7 @@ ifeq ($(CONFIG_ADC),y)
 CSRCS += lpc17_40_adc.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += lpc17_40_appinit.c
 endif

--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_appinit.c
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_appinit.c
@ -40,7 +40,7 @@

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

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /* PORT and SLOT number probably depend on the board configuration */

@ -93,7 +93,7 @@

 #else
 #  undef NSH_HAVEMMCSD
-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */

 /****************************************************************************
 * Public Functions
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/Makefile
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/Makefile
@ -30,7 +30,7 @@ endif
  CSRCS += lpc17_40_fpgainitialize.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
  CSRCS += lpc17_40_appinit.c
 endif

--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_bringup.c
@ -363,7 +363,7 @@ static int nsh_usbhostinitialize(void)
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library via boardctl()
 *
 ****************************************************************************/
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lx_cpu.h
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lx_cpu.h
@ -115,7 +115,7 @@
 *   CONFIG_BOARD_INITIALIZE=y :
 *     Called from board_initialize().
 *
- *   CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_INITIALIZE=n && CONFIG_BOARDCTL=y :
 *     Called from the NSH library via boardctl()
 *
 ****************************************************************************/
--- a/boards/arm/lpc17xx_40xx/mbed/src/Makefile
+++ b/boards/arm/lpc17xx_40xx/mbed/src/Makefile
@ -26,7 +26,7 @@ ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS += lpc17_40_leds.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += lpc17_40_appinit.c
 endif

--- a/boards/arm/lpc17xx_40xx/mcb1700/src/Makefile
+++ b/boards/arm/lpc17xx_40xx/mcb1700/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = lpc17_40_boot.c lpc17_40_bringup.c lpc17_40_leds.c lpc17_40_dac.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += lpc17_40_appinit.c
 endif

--- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_bringup.c
@ -319,7 +319,7 @@ static int nsh_usbhostinitialize(void)
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/lpc17xx_40xx/mcb1700/src/mcb1700.h
+++ b/boards/arm/lpc17xx_40xx/mcb1700/src/mcb1700.h
@ -64,7 +64,7 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig
@ -17,9 +17,9 @@ CONFIG_ARCH_CHIP_LPC1766=y
 CONFIG_ARCH_CHIP_LPC17XX_40XX=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARD_LOOPSPERMSEC=8111
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_LPC17_40_SSP1=y
 CONFIG_LPC17_40_UART0=y
 CONFIG_LPC17_40_USBDEV=y
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig
@ -14,11 +14,11 @@ CONFIG_ARCH_CHIP_LPC17XX_40XX=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
+CONFIG_BOARDCTL=y
 CONFIG_BOARD_LOOPSPERMSEC=8111
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_EXAMPLES_USBSERIAL=y
 CONFIG_INTELHEX_BINARY=y
-CONFIG_LIB_BOARDCTL=y
 CONFIG_LPC17_40_UART0=y
 CONFIG_LPC17_40_USBDEV=y
 CONFIG_LPC17_40_USBDEV_NDMADESCRIPTORS=0
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/Makefile
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/Makefile
@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs

 CSRCS = lpc17_40_boot.c lpc17_40_bringup.c lpc17_40_leds.c lpc17_40_ssp.c

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += lpc17_40_appinit.c
 endif

--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc1766stk.h
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc1766stk.h
@ -245,7 +245,7 @@
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_appinit.c
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_appinit.c
@ -31,7 +31,7 @@

 #include "lpc1766stk.h"

-#ifdef CONFIG_LIB_BOARDCTL
+#ifdef CONFIG_BOARDCTL

 /****************************************************************************
 * Public Functions
@ -45,11 +45,11 @@
 *   called directly from application code, but only indirectly via the
 *   (non-standard) boardctl() interface using the command BOARDIOC_INIT.
 *
- *   CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 *   CONFIG_BOARD_LATE_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
- *   CONFIG_LIB_BOARDCTL=n :
+ *   CONFIG_BOARDCTL=n :
 *     Called from board_late_initialize().
 *
 * Input Parameters:
@ -80,4 +80,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }

-#endif /* CONFIG_LIB_BOARDCTL */
+#endif /* CONFIG_BOARDCTL */
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_bringup.c
@ -338,7 +338,7 @@ static int nsh_usbhostinitialize(void)
 *   CONFIG_BOARD_LATE_INITIALIZE=y :
 *     Called from board_late_initialize().
 *
- *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
+ *   CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
 *     Called from the NSH library
 *
 ****************************************************************************/
--- a/boards/arm/lpc17xx_40xx/open1788/src/Makefile
+++ b/boards/arm/lpc17xx_40xx/open1788/src/Makefile
@ -40,7 +40,7 @@ ifeq ($(CONFIG_LPC17_40_LCD),y)
  CSRCS += lpc17_40_lcd.c
 endif

-ifeq ($(CONFIG_LIB_BOARDCTL),y)
+ifeq ($(CONFIG_BOARDCTL),y)
  CSRCS += lpc17_40_appinit.c
 endif

--- a/Show more
+++ b/Show more