sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename CONFIG_LIB_BOARDCTL to CONFIG_BOARDCTL

Browse Source 
since boardctl isn't a libc feature

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-08-01 14:59:37 +08:00 committed by Abdelatif Guettouche
parent 967f526850
commit d4d2f13f89
27 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/README.md
View File

@ -929,7 +929,7 @@ are not as expected:
CONFIG_DISABLE_MQUEUE=n CONFIG_DISABLE_MQUEUE=n
CONFIG_DISABLE_PTHREAD=n CONFIG_DISABLE_PTHREAD=n
CONFIG_NX_BLOCKING=y CONFIG_NX_BLOCKING=y
CONFIG_LIB_BOARDCTL=y CONFIG_BOARDCTL=y
``` ```
## `nxterm` Display NuttShell (NSH) as NX Console ## `nxterm` Display NuttShell (NSH) as NX Console

2
examples/adc/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_ADC config EXAMPLES_ADC
tristate "ADC example" tristate "ADC example"
default n default n
depends on ADC && LIB_BOARDCTL depends on ADC && BOARDCTL
---help--- ---help---
Enable the ADC example Enable the ADC example

4
examples/lvgldemo/lvgldemo.c
View File

@ -50,7 +50,7 @@
* board_late_initialize() during bootupif CONFIG_BOARD_LATE_INITIALIZE * board_late_initialize() during bootupif CONFIG_BOARD_LATE_INITIALIZE
* or 2). * or 2).
* via a call to boardctl() if the interface is enabled * 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 * If this task is running as an NSH built-in application, then that
* initialization has probably already been performed otherwise we do it * initialization has probably already been performed otherwise we do it
* here. * here.
@ -58,7 +58,7 @@
#undef NEED_BOARDINIT #undef NEED_BOARDINIT
#if defined(CONFIG_LIB_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT) #if defined(CONFIG_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT)
# define NEED_BOARDINIT 1 # define NEED_BOARDINIT 1
#endif #endif

2
examples/module/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_MODULE config EXAMPLES_MODULE
tristate "Module Example" tristate "Module Example"
default n default n
depends on MODULE && LIB_BOARDCTL depends on MODULE && BOARDCTL
select BOARDCTL_OS_SYMTAB select BOARDCTL_OS_SYMTAB
---help--- ---help---
Enable the module example Enable the module example

2
examples/mount/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_MOUNT config EXAMPLES_MOUNT
tristate "File system mount example" tristate "File system mount example"
default n default n
select LIB_BOARDCTL if !EXAMPLES_MOUNT_BLOCKDEVICE select BOARDCTL if !EXAMPLES_MOUNT_BLOCKDEVICE
select BOARDCTL_MKRD if !EXAMPLES_MOUNT_BLOCKDEVICE select BOARDCTL_MKRD if !EXAMPLES_MOUNT_BLOCKDEVICE
---help--- ---help---
Enable the file system mount example Enable the file system mount example

2
examples/nx/Kconfig
View File

@ -7,7 +7,7 @@ config EXAMPLES_NX
tristate "NX graphics example" tristate "NX graphics example"
default n default n
depends on NX depends on NX
select LIB_BOARDCTL select BOARDCTL
---help--- ---help---
Enable the NX graphics example Enable the NX graphics example

4
examples/nxdemo/Kconfig
View File

@ -53,7 +53,7 @@ endif
config EXAMPLES_NXDEMO_EXTERNINIT config EXAMPLES_NXDEMO_EXTERNINIT
bool "External Device Initialization" bool "External Device Initialization"
default n default n
depends on LIB_BOARDCTL depends on BOARDCTL
select BOARDCTL_GRAPHICS select BOARDCTL_GRAPHICS
---help--- ---help---
The driver for the graphics device on this platform requires some 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); FAR struct fb_vtable_s *board_graphics_setup(unsigned int devno);
#endif #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 CONFIG_BOARDCTL_GRAPHICS=y so that the boardctl() interface
will be available in order to access this function. will be available in order to access this function.

2
examples/nxhello/Kconfig
View File

@ -7,7 +7,7 @@ config EXAMPLES_NXHELLO
tristate "NX graphics \"Hello, World!\" example" tristate "NX graphics \"Hello, World!\" example"
default n default n
depends on NX depends on NX
select LIB_BOARDCTL select BOARDCTL
---help--- ---help---
Enable the NX graphics \"Hello, World!\" example Enable the NX graphics \"Hello, World!\" example

2
examples/nximage/Kconfig
View File

@ -7,7 +7,7 @@ config EXAMPLES_NXIMAGE
tristate "NX graphics image example" tristate "NX graphics image example"
default n default n
depends on NX depends on NX
select LIB_BOARDCTL select BOARDCTL
---help--- ---help---
Enable the X graphics image example Enable the X graphics image example

2
examples/nxlines/Kconfig
View File

@ -7,7 +7,7 @@ config EXAMPLES_NXLINES
tristate "NX graphics lines example" tristate "NX graphics lines example"
default n default n
depends on NX depends on NX
select LIB_BOARDCTL select BOARDCTL
---help--- ---help---
Enable the X graphics lines example Enable the X graphics lines example

2
examples/nxterm/Kconfig
View File

@ -7,7 +7,7 @@ config EXAMPLES_NXTERM
tristate "NxTerm example" tristate "NxTerm example"
default n default n
depends on NXTERM depends on NXTERM
select LIB_BOARDCTL select BOARDCTL
---help--- ---help---
Enable the NxTerm example Enable the NxTerm example

4
examples/posix_spawn/spawn_main.c
View File

@ -69,8 +69,8 @@
# error "You must not disable loadable modules via CONFIG_BINFMT_DISABLE in your configuration file" # error "You must not disable loadable modules via CONFIG_BINFMT_DISABLE in your configuration file"
#endif #endif
#ifndef CONFIG_LIB_BOARDCTL #ifndef CONFIG_BOARDCTL
# error "This configuration requires CONFIG_LIB_BOARDCTL" # error "This configuration requires CONFIG_BOARDCTL"
#endif #endif
#ifndef CONFIG_BOARDCTL_APP_SYMTAB #ifndef CONFIG_BOARDCTL_APP_SYMTAB

2
examples/pwfb/Kconfig
View File

@ -7,7 +7,7 @@ config EXAMPLES_PWFB
tristate "NX Per-Window Framebuffer Text Example" tristate "NX Per-Window Framebuffer Text Example"
default n default n
depends on NX depends on NX
select LIB_BOARDCTL select BOARDCTL
select NX_RAMBACKED select NX_RAMBACKED
---help--- ---help---
Enable the NX per-window framebuffer example Enable the NX per-window framebuffer example

2
examples/pwlines/Kconfig
View File

@ -7,7 +7,7 @@ config EXAMPLES_PWLINES
tristate "NX Per-Window Framebuffer Graphics Example" tristate "NX Per-Window Framebuffer Graphics Example"
default n default n
depends on NX depends on NX
select LIB_BOARDCTL select BOARDCTL
select NX_RAMBACKED select NX_RAMBACKED
---help--- ---help---
Enable the NX per-window framebuffer example Enable the NX per-window framebuffer example

2
examples/usbserial/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_USBSERIAL config EXAMPLES_USBSERIAL
tristate "USB serial test example" tristate "USB serial test example"
default n default n
depends on LIB_BOARDCTL depends on BOARDCTL
select BOARDCTL_USBDEVCTRL select BOARDCTL_USBDEVCTRL
---help--- ---help---
Enable the USB serial test example Enable the USB serial test example

4
graphics/nxwm/src/nxwm_main.cxx
View File

@ -498,12 +498,12 @@ static bool createMediaPlayer(void)
int main(int argc, char *argv[]) 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 // Should we perform board-specific initialization? There are two ways
// that board initialization can occur: 1) automatically via // that board initialization can occur: 1) automatically via
// board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or // board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or
// 2) here via a call to boardctl() if the interface is enabled // 2) here via a call to boardctl() if the interface is enabled
// (CONFIG_LIB_BOARDCTL=y). // (CONFIG_BOARDCTL=y).
boardctl(BOARDIOC_INIT, 0); boardctl(BOARDIOC_INIT, 0);
#endif #endif

2
graphics/twm4nx/Kconfig
View File

@ -45,7 +45,7 @@ config TWM4NX_REVMINOR
config TWM4NX_ARCHINIT config TWM4NX_ARCHINIT
bool "Have architecture-specific initialization" bool "Have architecture-specific initialization"
default n default n
select LIB_BOARDCTL select BOARDCTL
depends on !NSH_ARCHINIT depends on !NSH_ARCHINIT
---help--- ---help---
Set if your board provides architecture specific initialization Set if your board provides architecture specific initialization

4
graphics/twm4nx/src/twm4nx_main.cxx
View File

@ -112,13 +112,13 @@ int main(int argc, FAR char *argv[])
int ret; int ret;
#if defined(CONFIG_TWM4NX_ARCHINIT) && defined(CONFIG_LIB_BOARDCTL) && \ #if defined(CONFIG_TWM4NX_ARCHINIT) && defined(CONFIG_BOARDCTL) && \
!defined(CONFIG_BOARD_LATE_INITIALIZE) !defined(CONFIG_BOARD_LATE_INITIALIZE)
// Should we perform board-specific initialization? There are two ways // Should we perform board-specific initialization? There are two ways
// that board initialization can occur: 1) automatically via // that board initialization can occur: 1) automatically via
// board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or // board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or
// 2) here via a call to boardctl() if the interface is enabled // 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. // although less likely.
ret = boardctl(BOARDIOC_INIT, 0); ret = boardctl(BOARDIOC_INIT, 0);

6
nshlib/Kconfig
View File

@ -12,7 +12,7 @@ config NSH_LIBRARY
select NETUTILS_NETLIB if NET select NETUTILS_NETLIB if NET
select LIBC_NETDB if NET select LIBC_NETDB if NET
select READLINE_HAVE_EXTMATCH 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_MKRD if !NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT
select BOARDCTL_ROMDISK if NSH_ROMFSETC select BOARDCTL_ROMDISK if NSH_ROMFSETC
---help--- ---help---
@ -916,7 +916,7 @@ config NSH_CONSOLE
config NSH_USBCONSOLE config NSH_USBCONSOLE
bool "Use a USB serial console" bool "Use a USB serial console"
default n default n
depends on LIB_BOARDCTL && NSH_CONSOLE && USBDEV && (CDCACM || PL2303) depends on BOARDCTL && NSH_CONSOLE && USBDEV && (CDCACM || PL2303)
select BOARDCTL_USBDEVCTRL select BOARDCTL_USBDEVCTRL
---help--- ---help---
If defined, then the an arbitrary USB serial device may be used If defined, then the an arbitrary USB serial device may be used
@ -1103,7 +1103,7 @@ endmenu # USB Device Trace Support
config NSH_ARCHINIT config NSH_ARCHINIT
bool "Have architecture-specific initialization" bool "Have architecture-specific initialization"
default n default n
select LIB_BOARDCTL select BOARDCTL
---help--- ---help---
Set if your board provides architecture specific initialization Set if your board provides architecture specific initialization
via the board-interface function boardctl(). The boardctl() via the board-interface function boardctl(). The boardctl()

6
nshlib/nsh.h
View File

@ -835,14 +835,14 @@ int nsh_loginscript(FAR struct nsh_vtbl_s *vtbl);
/* Architecture-specific initialization depends on boardctl(BOARDIOC_INIT) */ /* Architecture-specific initialization depends on boardctl(BOARDIOC_INIT) */
#if defined(CONFIG_NSH_ARCHINIT) && !defined(CONFIG_LIB_BOARDCTL) #if defined(CONFIG_NSH_ARCHINIT) && !defined(CONFIG_BOARDCTL)
# warning CONFIG_NSH_ARCHINIT is set, but CONFIG_LIB_BOARDCTL is not # warning CONFIG_NSH_ARCHINIT is set, but CONFIG_BOARDCTL is not
# undef CONFIG_NSH_ARCHINIT # undef CONFIG_NSH_ARCHINIT
#endif #endif
/* The mkrd command depends on boardctl(BOARDIOC_MKRD) */ /* 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 # undef CONFIG_NSH_DISABLE_MKRD
# define CONFIG_NSH_DISABLE_MKRD 1 # define CONFIG_NSH_DISABLE_MKRD 1
#endif #endif

2
system/adb/Kconfig
View File

@ -142,7 +142,7 @@ config ADBD_FILE_SYMLINK
config ADBD_BOARD_INIT config ADBD_BOARD_INIT
bool "Board initialization" bool "Board initialization"
depends on LIB_BOARDCTL depends on BOARDCTL
default n default n
---help--- ---help---
Setup board before running adb daemon. Setup board before running adb daemon.

2
system/cdcacm/Kconfig
View File

@ -6,7 +6,7 @@
menuconfig SYSTEM_CDCACM menuconfig SYSTEM_CDCACM
tristate "USB CDC/ACM Device Commands" tristate "USB CDC/ACM Device Commands"
default n default n
depends on LIB_BOARDCTL && CDCACM depends on BOARDCTL && CDCACM
select BOARDCTL_USBDEVCTRL select BOARDCTL_USBDEVCTRL
---help--- ---help---
Enable the USB CDC/ACM class controls. These controls include: Enable the USB CDC/ACM class controls. These controls include:

2
system/composite/Kconfig
View File

@ -6,7 +6,7 @@
menuconfig SYSTEM_COMPOSITE menuconfig SYSTEM_COMPOSITE
tristate "USB Composite Device Commands" tristate "USB Composite Device Commands"
default n default n
depends on LIB_BOARDCTL && USBDEV_COMPOSITE && BUILD_FLAT depends on BOARDCTL && USBDEV_COMPOSITE && BUILD_FLAT
select BOARDCTL_USBDEVCTRL select BOARDCTL_USBDEVCTRL
---help--- ---help---
Enable the USB composite class controls. These controls include: Enable the USB composite class controls. These controls include:

2
system/nsh/Kconfig
View File

@ -24,7 +24,7 @@ config SYSTEM_NSH_STACKSIZE
config SYSTEM_NSH_SYMTAB config SYSTEM_NSH_SYMTAB
bool "Register symbol table" bool "Register symbol table"
default n default n
depends on LIBC_EXECFUNCS && LIB_BOARDCTL && !EXECFUNCS_HAVE_SYMTAB depends on LIBC_EXECFUNCS && BOARDCTL && !EXECFUNCS_HAVE_SYMTAB
select BOARDCTL_APP_SYMTAB select BOARDCTL_APP_SYMTAB
---help--- ---help---
Enable logic to automatically register an application symbol table Enable logic to automatically register an application symbol table

2
system/nsh/nsh_main.c
View File

@ -51,7 +51,7 @@
* support. * 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 # undef CONFIG_SYSTEM_NSH_SYMTAB
#endif #endif

2
system/usbmsc/Kconfig
View File

@ -6,7 +6,7 @@
menuconfig SYSTEM_USBMSC menuconfig SYSTEM_USBMSC
tristate "USB Mass Storage Device Commands" tristate "USB Mass Storage Device Commands"
default n default n
depends on LIB_BOARDCTL && USBMSC && BUILD_FLAT depends on BOARDCTL && USBMSC && BUILD_FLAT
select BOARDCTL_USBDEVCTRL select BOARDCTL_USBDEVCTRL
---help--- ---help---
Enable the USB mass storage class controls. These controls include: Enable the USB mass storage class controls. These controls include:

2
system/usbmsc/README.md
View File

@ -21,7 +21,7 @@ Configuration options:
commands if this option is selected: `msconn` will connect the USB mass commands if this option is selected: `msconn` will connect the USB mass
storage device; `msdis` will disconnect the USB storage device. 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` - `CONFIG_BOARDCTL_USBDEVCTRL` – Enables the `BOARDIOC_USBDEV_CONTROL`
`boardctl()` command. `boardctl()` command.