diff --git a/examples/README.md b/examples/README.md index efc666e5b..c2b2c28cf 100644 --- a/examples/README.md +++ b/examples/README.md @@ -929,7 +929,7 @@ are not as expected: CONFIG_DISABLE_MQUEUE=n CONFIG_DISABLE_PTHREAD=n CONFIG_NX_BLOCKING=y -CONFIG_LIB_BOARDCTL=y +CONFIG_BOARDCTL=y ``` ## `nxterm` Display NuttShell (NSH) as NX Console diff --git a/examples/adc/Kconfig b/examples/adc/Kconfig index 7b7ed0a7c..2c8b42bb8 100644 --- a/examples/adc/Kconfig +++ b/examples/adc/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_ADC tristate "ADC example" default n - depends on ADC && LIB_BOARDCTL + depends on ADC && BOARDCTL ---help--- Enable the ADC example diff --git a/examples/lvgldemo/lvgldemo.c b/examples/lvgldemo/lvgldemo.c index 6a88f88c0..c9dd63a8f 100644 --- a/examples/lvgldemo/lvgldemo.c +++ b/examples/lvgldemo/lvgldemo.c @@ -50,7 +50,7 @@ * board_late_initialize() during bootupif CONFIG_BOARD_LATE_INITIALIZE * or 2). * via a call to boardctl() if the interface is enabled - * (CONFIG_LIB_BOARDCTL=y). + * (CONFIG_BOARDCTL=y). * If this task is running as an NSH built-in application, then that * initialization has probably already been performed otherwise we do it * here. @@ -58,7 +58,7 @@ #undef NEED_BOARDINIT -#if defined(CONFIG_LIB_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT) +#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT) # define NEED_BOARDINIT 1 #endif diff --git a/examples/module/Kconfig b/examples/module/Kconfig index f58c38988..d51461d8d 100644 --- a/examples/module/Kconfig +++ b/examples/module/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_MODULE tristate "Module Example" default n - depends on MODULE && LIB_BOARDCTL + depends on MODULE && BOARDCTL select BOARDCTL_OS_SYMTAB ---help--- Enable the module example diff --git a/examples/mount/Kconfig b/examples/mount/Kconfig index 81e80eaa5..27f363cfd 100644 --- a/examples/mount/Kconfig +++ b/examples/mount/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_MOUNT tristate "File system mount example" default n - select LIB_BOARDCTL if !EXAMPLES_MOUNT_BLOCKDEVICE + select BOARDCTL if !EXAMPLES_MOUNT_BLOCKDEVICE select BOARDCTL_MKRD if !EXAMPLES_MOUNT_BLOCKDEVICE ---help--- Enable the file system mount example diff --git a/examples/nx/Kconfig b/examples/nx/Kconfig index 7c5b834e2..c5ac50ac9 100644 --- a/examples/nx/Kconfig +++ b/examples/nx/Kconfig @@ -7,7 +7,7 @@ config EXAMPLES_NX tristate "NX graphics example" default n depends on NX - select LIB_BOARDCTL + select BOARDCTL ---help--- Enable the NX graphics example diff --git a/examples/nxdemo/Kconfig b/examples/nxdemo/Kconfig index 1390e0182..dc9a95bd1 100644 --- a/examples/nxdemo/Kconfig +++ b/examples/nxdemo/Kconfig @@ -53,7 +53,7 @@ endif config EXAMPLES_NXDEMO_EXTERNINIT bool "External Device Initialization" default n - depends on LIB_BOARDCTL + depends on BOARDCTL select BOARDCTL_GRAPHICS ---help--- The driver for the graphics device on this platform requires some @@ -67,7 +67,7 @@ config EXAMPLES_NXDEMO_EXTERNINIT FAR struct fb_vtable_s *board_graphics_setup(unsigned int devno); #endif - and must also define: CONFIG_LIB_BOARDCTL=y and + and must also define: CONFIG_BOARDCTL=y and CONFIG_BOARDCTL_GRAPHICS=y so that the boardctl() interface will be available in order to access this function. diff --git a/examples/nxhello/Kconfig b/examples/nxhello/Kconfig index 36c97cffa..ee29ec205 100644 --- a/examples/nxhello/Kconfig +++ b/examples/nxhello/Kconfig @@ -7,7 +7,7 @@ config EXAMPLES_NXHELLO tristate "NX graphics \"Hello, World!\" example" default n depends on NX - select LIB_BOARDCTL + select BOARDCTL ---help--- Enable the NX graphics \"Hello, World!\" example diff --git a/examples/nximage/Kconfig b/examples/nximage/Kconfig index b1ca1bbc1..abc84fc60 100644 --- a/examples/nximage/Kconfig +++ b/examples/nximage/Kconfig @@ -7,7 +7,7 @@ config EXAMPLES_NXIMAGE tristate "NX graphics image example" default n depends on NX - select LIB_BOARDCTL + select BOARDCTL ---help--- Enable the X graphics image example diff --git a/examples/nxlines/Kconfig b/examples/nxlines/Kconfig index 82bab9d49..7e44a868a 100644 --- a/examples/nxlines/Kconfig +++ b/examples/nxlines/Kconfig @@ -7,7 +7,7 @@ config EXAMPLES_NXLINES tristate "NX graphics lines example" default n depends on NX - select LIB_BOARDCTL + select BOARDCTL ---help--- Enable the X graphics lines example diff --git a/examples/nxterm/Kconfig b/examples/nxterm/Kconfig index d9881638d..6ac118eea 100644 --- a/examples/nxterm/Kconfig +++ b/examples/nxterm/Kconfig @@ -7,7 +7,7 @@ config EXAMPLES_NXTERM tristate "NxTerm example" default n depends on NXTERM - select LIB_BOARDCTL + select BOARDCTL ---help--- Enable the NxTerm example diff --git a/examples/posix_spawn/spawn_main.c b/examples/posix_spawn/spawn_main.c index 9391a4798..1c0a84346 100644 --- a/examples/posix_spawn/spawn_main.c +++ b/examples/posix_spawn/spawn_main.c @@ -69,8 +69,8 @@ # error "You must not disable loadable modules via CONFIG_BINFMT_DISABLE in your configuration file" #endif -#ifndef CONFIG_LIB_BOARDCTL -# error "This configuration requires CONFIG_LIB_BOARDCTL" +#ifndef CONFIG_BOARDCTL +# error "This configuration requires CONFIG_BOARDCTL" #endif #ifndef CONFIG_BOARDCTL_APP_SYMTAB diff --git a/examples/pwfb/Kconfig b/examples/pwfb/Kconfig index 4c72205f3..8a38b006c 100644 --- a/examples/pwfb/Kconfig +++ b/examples/pwfb/Kconfig @@ -7,7 +7,7 @@ config EXAMPLES_PWFB tristate "NX Per-Window Framebuffer Text Example" default n depends on NX - select LIB_BOARDCTL + select BOARDCTL select NX_RAMBACKED ---help--- Enable the NX per-window framebuffer example diff --git a/examples/pwlines/Kconfig b/examples/pwlines/Kconfig index 02dd2f82f..29797ae86 100644 --- a/examples/pwlines/Kconfig +++ b/examples/pwlines/Kconfig @@ -7,7 +7,7 @@ config EXAMPLES_PWLINES tristate "NX Per-Window Framebuffer Graphics Example" default n depends on NX - select LIB_BOARDCTL + select BOARDCTL select NX_RAMBACKED ---help--- Enable the NX per-window framebuffer example diff --git a/examples/usbserial/Kconfig b/examples/usbserial/Kconfig index f5e87ce92..6e1bc5510 100644 --- a/examples/usbserial/Kconfig +++ b/examples/usbserial/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_USBSERIAL tristate "USB serial test example" default n - depends on LIB_BOARDCTL + depends on BOARDCTL select BOARDCTL_USBDEVCTRL ---help--- Enable the USB serial test example diff --git a/graphics/nxwm/src/nxwm_main.cxx b/graphics/nxwm/src/nxwm_main.cxx index 8543c6e29..3b21eda85 100644 --- a/graphics/nxwm/src/nxwm_main.cxx +++ b/graphics/nxwm/src/nxwm_main.cxx @@ -498,12 +498,12 @@ static bool createMediaPlayer(void) int main(int argc, char *argv[]) { -#if defined(CONFIG_LIB_BOARDCTL) && !defined(CONFIG_BOARD_LATE_INITIALIZE) +#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_BOARD_LATE_INITIALIZE) // Should we perform board-specific initialization? There are two ways // that board initialization can occur: 1) automatically via // board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or // 2) here via a call to boardctl() if the interface is enabled - // (CONFIG_LIB_BOARDCTL=y). + // (CONFIG_BOARDCTL=y). boardctl(BOARDIOC_INIT, 0); #endif diff --git a/graphics/twm4nx/Kconfig b/graphics/twm4nx/Kconfig index b1369db0a..9e1322dd0 100644 --- a/graphics/twm4nx/Kconfig +++ b/graphics/twm4nx/Kconfig @@ -45,7 +45,7 @@ config TWM4NX_REVMINOR config TWM4NX_ARCHINIT bool "Have architecture-specific initialization" default n - select LIB_BOARDCTL + select BOARDCTL depends on !NSH_ARCHINIT ---help--- Set if your board provides architecture specific initialization diff --git a/graphics/twm4nx/src/twm4nx_main.cxx b/graphics/twm4nx/src/twm4nx_main.cxx index ef7772b0c..8a978231a 100644 --- a/graphics/twm4nx/src/twm4nx_main.cxx +++ b/graphics/twm4nx/src/twm4nx_main.cxx @@ -112,13 +112,13 @@ int main(int argc, FAR char *argv[]) int ret; -#if defined(CONFIG_TWM4NX_ARCHINIT) && defined(CONFIG_LIB_BOARDCTL) && \ +#if defined(CONFIG_TWM4NX_ARCHINIT) && defined(CONFIG_BOARDCTL) && \ !defined(CONFIG_BOARD_LATE_INITIALIZE) // Should we perform board-specific initialization? There are two ways // that board initialization can occur: 1) automatically via // board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or // 2) here via a call to boardctl() if the interface is enabled - // (CONFIG_LIB_BOARDCTL=y). board_early_initialize() is also possibility, + // (CONFIG_BOARDCTL=y). board_early_initialize() is also possibility, // although less likely. ret = boardctl(BOARDIOC_INIT, 0); diff --git a/nshlib/Kconfig b/nshlib/Kconfig index c9e842c87..758b69e2d 100644 --- a/nshlib/Kconfig +++ b/nshlib/Kconfig @@ -12,7 +12,7 @@ config NSH_LIBRARY select NETUTILS_NETLIB if NET select LIBC_NETDB if NET select READLINE_HAVE_EXTMATCH - select LIB_BOARDCTL if (!NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT) || NSH_ARCHINIT || NSH_ROMFSETC + select BOARDCTL if (!NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT) || NSH_ARCHINIT || NSH_ROMFSETC select BOARDCTL_MKRD if !NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT select BOARDCTL_ROMDISK if NSH_ROMFSETC ---help--- @@ -916,7 +916,7 @@ config NSH_CONSOLE config NSH_USBCONSOLE bool "Use a USB serial console" default n - depends on LIB_BOARDCTL && NSH_CONSOLE && USBDEV && (CDCACM || PL2303) + depends on BOARDCTL && NSH_CONSOLE && USBDEV && (CDCACM || PL2303) select BOARDCTL_USBDEVCTRL ---help--- If defined, then the an arbitrary USB serial device may be used @@ -1103,7 +1103,7 @@ endmenu # USB Device Trace Support config NSH_ARCHINIT bool "Have architecture-specific initialization" default n - select LIB_BOARDCTL + select BOARDCTL ---help--- Set if your board provides architecture specific initialization via the board-interface function boardctl(). The boardctl() diff --git a/nshlib/nsh.h b/nshlib/nsh.h index 8990579ba..785b640de 100644 --- a/nshlib/nsh.h +++ b/nshlib/nsh.h @@ -835,14 +835,14 @@ int nsh_loginscript(FAR struct nsh_vtbl_s *vtbl); /* Architecture-specific initialization depends on boardctl(BOARDIOC_INIT) */ -#if defined(CONFIG_NSH_ARCHINIT) && !defined(CONFIG_LIB_BOARDCTL) -# warning CONFIG_NSH_ARCHINIT is set, but CONFIG_LIB_BOARDCTL is not +#if defined(CONFIG_NSH_ARCHINIT) && !defined(CONFIG_BOARDCTL) +# warning CONFIG_NSH_ARCHINIT is set, but CONFIG_BOARDCTL is not # undef CONFIG_NSH_ARCHINIT #endif /* The mkrd command depends on boardctl(BOARDIOC_MKRD) */ -#if !defined(CONFIG_LIB_BOARDCTL) || !defined(CONFIG_BOARDCTL_MKRD) +#if !defined(CONFIG_BOARDCTL) || !defined(CONFIG_BOARDCTL_MKRD) # undef CONFIG_NSH_DISABLE_MKRD # define CONFIG_NSH_DISABLE_MKRD 1 #endif diff --git a/system/adb/Kconfig b/system/adb/Kconfig index 83a8019e6..c9f13e93e 100644 --- a/system/adb/Kconfig +++ b/system/adb/Kconfig @@ -142,7 +142,7 @@ config ADBD_FILE_SYMLINK config ADBD_BOARD_INIT bool "Board initialization" - depends on LIB_BOARDCTL + depends on BOARDCTL default n ---help--- Setup board before running adb daemon. diff --git a/system/cdcacm/Kconfig b/system/cdcacm/Kconfig index 8d0cc8b68..e246f8c31 100644 --- a/system/cdcacm/Kconfig +++ b/system/cdcacm/Kconfig @@ -6,7 +6,7 @@ menuconfig SYSTEM_CDCACM tristate "USB CDC/ACM Device Commands" default n - depends on LIB_BOARDCTL && CDCACM + depends on BOARDCTL && CDCACM select BOARDCTL_USBDEVCTRL ---help--- Enable the USB CDC/ACM class controls. These controls include: diff --git a/system/composite/Kconfig b/system/composite/Kconfig index c8e5bbb02..e158e71f4 100644 --- a/system/composite/Kconfig +++ b/system/composite/Kconfig @@ -6,7 +6,7 @@ menuconfig SYSTEM_COMPOSITE tristate "USB Composite Device Commands" default n - depends on LIB_BOARDCTL && USBDEV_COMPOSITE && BUILD_FLAT + depends on BOARDCTL && USBDEV_COMPOSITE && BUILD_FLAT select BOARDCTL_USBDEVCTRL ---help--- Enable the USB composite class controls. These controls include: diff --git a/system/nsh/Kconfig b/system/nsh/Kconfig index d72bc02fa..20b16ba89 100644 --- a/system/nsh/Kconfig +++ b/system/nsh/Kconfig @@ -24,7 +24,7 @@ config SYSTEM_NSH_STACKSIZE config SYSTEM_NSH_SYMTAB bool "Register symbol table" default n - depends on LIBC_EXECFUNCS && LIB_BOARDCTL && !EXECFUNCS_HAVE_SYMTAB + depends on LIBC_EXECFUNCS && BOARDCTL && !EXECFUNCS_HAVE_SYMTAB select BOARDCTL_APP_SYMTAB ---help--- Enable logic to automatically register an application symbol table diff --git a/system/nsh/nsh_main.c b/system/nsh/nsh_main.c index a13a7a871..87fa48a08 100644 --- a/system/nsh/nsh_main.c +++ b/system/nsh/nsh_main.c @@ -51,7 +51,7 @@ * support. */ -#if !defined(CONFIG_LIB_BOARDCTL) || !defined(CONFIG_BOARDCTL_APP_SYMTAB) +#if !defined(CONFIG_BOARDCTL) || !defined(CONFIG_BOARDCTL_APP_SYMTAB) # undef CONFIG_SYSTEM_NSH_SYMTAB #endif diff --git a/system/usbmsc/Kconfig b/system/usbmsc/Kconfig index 15b3751e5..4f7ed995b 100644 --- a/system/usbmsc/Kconfig +++ b/system/usbmsc/Kconfig @@ -6,7 +6,7 @@ menuconfig SYSTEM_USBMSC tristate "USB Mass Storage Device Commands" default n - depends on LIB_BOARDCTL && USBMSC && BUILD_FLAT + depends on BOARDCTL && USBMSC && BUILD_FLAT select BOARDCTL_USBDEVCTRL ---help--- Enable the USB mass storage class controls. These controls include: diff --git a/system/usbmsc/README.md b/system/usbmsc/README.md index 8d14c1c04..bfce42d81 100644 --- a/system/usbmsc/README.md +++ b/system/usbmsc/README.md @@ -21,7 +21,7 @@ Configuration options: commands if this option is selected: `msconn` will connect the USB mass storage device; `msdis` will disconnect the USB storage device. -- `CONFIG_LIB_BOARDCTL` – Enables the `boardctl()` interfaces. +- `CONFIG_BOARDCTL` – Enables the `boardctl()` interfaces. - `CONFIG_BOARDCTL_USBDEVCTRL` – Enables the `BOARDIOC_USBDEV_CONTROL` `boardctl()` command.