diff --git a/Documentation/reference/user/13_boardctl.rst b/Documentation/reference/user/13_boardctl.rst index 2e6a973bd2b..2195db22834 100644 --- 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__initialize()`. diff --git a/ReleaseNotes b/ReleaseNotes index d77109d3010..8041637e34c 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -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: diff --git a/boards/Kconfig b/boards/Kconfig index ddf3982c51c..6d63294ea5c 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -3301,14 +3301,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" @@ -3448,4 +3448,4 @@ config BOARDCTL_IOCTL Enables support for board-specific boardctl() commands. Architecture specific logic must provide board_ioctl() interface. -endif # LIB_BOARDCTL +endif # BOARDCTL diff --git a/boards/Makefile b/boards/Makefile index be505cbee5b..f253c92ddd3 100644 --- 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 diff --git a/boards/arm/a1x/pcduino-a10/src/Makefile b/boards/arm/a1x/pcduino-a10/src/Makefile index d2ed3212a11..dc88386a29e 100644 --- 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 diff --git a/boards/arm/a1x/pcduino-a10/src/a1x_bringup.c b/boards/arm/a1x/pcduino-a10/src/a1x_bringup.c index 09c090b500e..ab49d056915 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/a1x/pcduino-a10/src/pcduino_a10.h b/boards/arm/a1x/pcduino-a10/src/pcduino_a10.h index b55c409a0c4..0292d965661 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/am335x/beaglebone-black/src/Makefile b/boards/arm/am335x/beaglebone-black/src/Makefile index 9936bbf5204..1920ec69b97 100644 --- 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 diff --git a/boards/arm/am335x/beaglebone-black/src/am335x_bringup.c b/boards/arm/am335x/beaglebone-black/src/am335x_bringup.c index ad3ffccf9b5..72d762b368f 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/am335x/beaglebone-black/src/beaglebone-black.h b/boards/arm/am335x/beaglebone-black/src/beaglebone-black.h index bb003319a40..cdd4585751f 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/cxd56xx/spresense/configs/elf/defconfig b/boards/arm/cxd56xx/spresense/configs/elf/defconfig index b0d32bef980..c4c2b44f0b9 100644 --- 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 diff --git a/boards/arm/cxd56xx/spresense/configs/module/defconfig b/boards/arm/cxd56xx/spresense/configs/module/defconfig index 5134063f5cb..a2c13552f35 100644 --- 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 diff --git a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig index 11ebaee3dfa..ad39da80bd1 100644 --- 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 diff --git a/boards/arm/cxd56xx/spresense/src/Make.defs b/boards/arm/cxd56xx/spresense/src/Make.defs index d22bd8a5280..1bb84d5462b 100644 --- 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 diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c b/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c index 12976b19daf..b9a81a5a7b7 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_ioctl.c b/boards/arm/cxd56xx/spresense/src/cxd56_ioctl.c index 92b11876555..025ff6b67ca 100644 --- 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 */ diff --git a/boards/arm/cxd56xx/spresense/src/spresense.h b/boards/arm/cxd56xx/spresense/src/spresense.h index 4045769c495..a4ad6b8c076 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/dm320/ntosd-dm320/src/Makefile b/boards/arm/dm320/ntosd-dm320/src/Makefile index e00b8e1d81f..cc48605f551 100644 --- 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 diff --git a/boards/arm/eoss3/quickfeather/src/eoss3_appinit.c b/boards/arm/eoss3/quickfeather/src/eoss3_appinit.c index aa1cfa2712d..954420d7001 100644 --- a/boards/arm/eoss3/quickfeather/src/eoss3_appinit.c +++ b/boards/arm/eoss3/quickfeather/src/eoss3_appinit.c @@ -27,7 +27,7 @@ #include -#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 */ diff --git a/boards/arm/eoss3/quickfeather/src/eoss3_bringup.c b/boards/arm/eoss3/quickfeather/src/eoss3_bringup.c index 013c1744817..bc6130d5d3a 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/eoss3/quickfeather/src/quickfeather.h b/boards/arm/eoss3/quickfeather/src/quickfeather.h index 2a750867cb0..b969a8aaf32 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/imx6/sabre-6quad/configs/elf/defconfig b/boards/arm/imx6/sabre-6quad/configs/elf/defconfig index 8295c635d83..1300349ff1c 100644 --- 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 diff --git a/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig b/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig index 1cf40ed9d5a..7020a31015a 100644 --- 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 diff --git a/boards/arm/imx6/sabre-6quad/src/Makefile b/boards/arm/imx6/sabre-6quad/src/Makefile index 4dc70ed4f89..a817775f484 100644 --- 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 diff --git a/boards/arm/imx6/sabre-6quad/src/imx_appinit.c b/boards/arm/imx6/sabre-6quad/src/imx_appinit.c index 5c4dcc32ce5..01128906571 100644 --- 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 */ diff --git a/boards/arm/imx6/sabre-6quad/src/sabre-6quad.h b/boards/arm/imx6/sabre-6quad/src/sabre-6quad.h index e67334b567e..6381e1484d1 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1020-evk/src/Makefile b/boards/arm/imxrt/imxrt1020-evk/src/Makefile index fdfdd9ed4ac..fa689f3ac2c 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt1020-evk.h b/boards/arm/imxrt/imxrt1020-evk/src/imxrt1020-evk.h index 531063a4011..7ed1c4982e5 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_appinit.c b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_appinit.c index 91a7f154975..8df90ba5e45 100644 --- 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 */ diff --git a/boards/arm/imxrt/imxrt1050-evk/src/Makefile b/boards/arm/imxrt/imxrt1050-evk/src/Makefile index ed366048984..9a8880b3948 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1050-evk/src/imxrt1050-evk.h b/boards/arm/imxrt/imxrt1050-evk/src/imxrt1050-evk.h index 83f0af10331..d5d9daa5e67 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_appinit.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_appinit.c index 3a6df23e7e9..6222c28e85d 100644 --- 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 */ diff --git a/boards/arm/imxrt/imxrt1060-evk/src/Makefile b/boards/arm/imxrt/imxrt1060-evk/src/Makefile index ef6d3951296..3ad472fbcad 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h b/boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h index dcdd8fb5fe6..154af509099 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c index d16e498c3fe..bb07ed00c76 100644 --- 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 */ diff --git a/boards/arm/imxrt/imxrt1064-evk/src/Makefile b/boards/arm/imxrt/imxrt1064-evk/src/Makefile index 45fd5f54187..bffdbca9ea4 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt1064-evk.h b/boards/arm/imxrt/imxrt1064-evk/src/imxrt1064-evk.h index 8376c5d1d3a..17894c23651 100644 --- 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 diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_appinit.c b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_appinit.c index fa67a2b4097..31f4398b0e9 100644 --- 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 */ diff --git a/boards/arm/imxrt/teensy-4.x/src/Makefile b/boards/arm/imxrt/teensy-4.x/src/Makefile index d31beb00363..9a838f9d942 100644 --- 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 diff --git a/boards/arm/imxrt/teensy-4.x/src/imxrt_appinit.c b/boards/arm/imxrt/teensy-4.x/src/imxrt_appinit.c index 09cb334a47f..97ba5d23e4d 100644 --- 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 */ diff --git a/boards/arm/imxrt/teensy-4.x/src/teensy-4.h b/boards/arm/imxrt/teensy-4.x/src/teensy-4.h index 188d53d3c4e..5f40526c943 100644 --- 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 diff --git a/boards/arm/kinetis/freedom-k28f/src/Makefile b/boards/arm/kinetis/freedom-k28f/src/Makefile index 9faaa917047..57b0bfac86d 100644 --- 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 diff --git a/boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h b/boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h index bd712ab63a1..cd6a5b693da 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_bringup.c b/boards/arm/kinetis/freedom-k28f/src/k28_bringup.c index 744266dcbde..84fde55a649 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/kinetis/freedom-k64f/README.txt b/boards/arm/kinetis/freedom-k64f/README.txt index d29d5a2d2d2..b81ff185980 100644 --- 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 diff --git a/boards/arm/kinetis/freedom-k64f/src/Makefile b/boards/arm/kinetis/freedom-k64f/src/Makefile index ed9777b1188..0ab2c204e4f 100644 --- 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 diff --git a/boards/arm/kinetis/freedom-k64f/src/freedom-k64f.h b/boards/arm/kinetis/freedom-k64f/src/freedom-k64f.h index 97d80ebe24c..e9c734c0d2e 100644 --- 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 diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_appinit.c b/boards/arm/kinetis/freedom-k64f/src/k64_appinit.c index 29852821361..00ec7b2787a 100644 --- 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 */ diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_bringup.c b/boards/arm/kinetis/freedom-k64f/src/k64_bringup.c index 96d3224cc31..b5df56315e3 100644 --- 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 */ diff --git a/boards/arm/kinetis/freedom-k66f/README.txt b/boards/arm/kinetis/freedom-k66f/README.txt index 8cf32b832c2..53501be86dd 100644 --- 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 diff --git a/boards/arm/kinetis/freedom-k66f/src/Makefile b/boards/arm/kinetis/freedom-k66f/src/Makefile index e84563f6865..5e2158e1cd5 100644 --- 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 diff --git a/boards/arm/kinetis/freedom-k66f/src/freedom-k66f.h b/boards/arm/kinetis/freedom-k66f/src/freedom-k66f.h index 9fc795425ac..264a40c0fb3 100644 --- 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 diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_appinit.c b/boards/arm/kinetis/freedom-k66f/src/k66_appinit.c index 08fa69df392..abc3f6452ea 100644 --- 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 */ diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_bringup.c b/boards/arm/kinetis/freedom-k66f/src/k66_bringup.c index f3517d6f67a..c08a0a53141 100644 --- 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 */ diff --git a/boards/arm/kinetis/kwikstik-k40/src/Makefile b/boards/arm/kinetis/kwikstik-k40/src/Makefile index 7cde85a0922..925c4b3dc93 100644 --- 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 diff --git a/boards/arm/kinetis/teensy-3.x/src/Makefile b/boards/arm/kinetis/teensy-3.x/src/Makefile index 306c4227be2..fa34fef660d 100644 --- 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 diff --git a/boards/arm/kinetis/twr-k60n512/src/Makefile b/boards/arm/kinetis/twr-k60n512/src/Makefile index b0cfe78707b..c0bc7c4e04b 100644 --- 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 diff --git a/boards/arm/kinetis/twr-k64f120m/src/Makefile b/boards/arm/kinetis/twr-k64f120m/src/Makefile index 265bb77d7d7..679752eba91 100644 --- 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 diff --git a/boards/arm/kinetis/twr-k64f120m/src/twrk64.h b/boards/arm/kinetis/twr-k64f120m/src/twrk64.h index 0760b31a140..a83d0887933 100644 --- 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 diff --git a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig index e36e935802e..fbf0f13d4d8 100644 --- 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 diff --git a/boards/arm/kl/freedom-kl25z/src/Makefile b/boards/arm/kl/freedom-kl25z/src/Makefile index 34289eff923..eaefd8e7f12 100644 --- 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 diff --git a/boards/arm/kl/freedom-kl25z/src/kl_appinit.c b/boards/arm/kl/freedom-kl25z/src/kl_appinit.c index f5c03171af5..323d3763d68 100644 --- 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 */ diff --git a/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c b/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c index 0bf0c13b52f..ffbfb04ccc6 100644 --- 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 } diff --git a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig index 6867afc1926..db046e03aca 100644 --- 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 diff --git a/boards/arm/kl/freedom-kl26z/src/Makefile b/boards/arm/kl/freedom-kl26z/src/Makefile index 3bad359cd10..592894cd3bc 100644 --- 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 diff --git a/boards/arm/kl/freedom-kl26z/src/kl_appinit.c b/boards/arm/kl/freedom-kl26z/src/kl_appinit.c index b82011c4cbe..b42ffaf93bc 100644 --- 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 */ diff --git a/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c b/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c index b607906e1aa..d8b53e2d5bc 100644 --- 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 } diff --git a/boards/arm/kl/teensy-lc/configs/nsh/defconfig b/boards/arm/kl/teensy-lc/configs/nsh/defconfig index 7032e556880..fafa2397c53 100644 --- 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 diff --git a/boards/arm/kl/teensy-lc/src/Makefile b/boards/arm/kl/teensy-lc/src/Makefile index ad17afe7ac6..5eb039bb974 100644 --- 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 diff --git a/boards/arm/kl/teensy-lc/src/kl_appinit.c b/boards/arm/kl/teensy-lc/src/kl_appinit.c index 56de1a43e03..98a106350fa 100644 --- 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 */ diff --git a/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c b/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c index b2d57c00586..5f2ff4d4dbd 100644 --- 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 } diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig index c7a1ed33d0e..0f21d8a3420 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig index af99ffc075d..1e0b1e3ce60 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/src/Makefile b/boards/arm/lc823450/lc823450-xgevk/src/Makefile index c9cb9965d2e..7a033525879 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450-xgevk.h b/boards/arm/lc823450/lc823450-xgevk/src/lc823450-xgevk.h index 4f9bc98e275..4c47891eda9 100644 --- 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 diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_appinit.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_appinit.c index 09de6383e56..f366e25fb69 100644 --- 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 */ diff --git a/boards/arm/lpc17xx_40xx/lincoln60/src/Makefile b/boards/arm/lpc17xx_40xx/lincoln60/src/Makefile index f99e0b59133..63fda698caf 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/Makefile b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/Makefile index ee96c361914..c8ba75d2d01 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_bringup.c index 1d9c7f0e0ef..4c8f17d5ede 100644 --- 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() * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc4088-devkit.h b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc4088-devkit.h index 2b536a0694a..c2cd7f6328a 100644 --- 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() * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/Makefile b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/Makefile index dcb5981fc80..38f18cd447e 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_bringup.c index 0b98814a179..69fb4e59ecb 100644 --- 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() * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc4088-quickstart.h b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc4088-quickstart.h index b6d90578036..73b3eb02384 100644 --- 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() * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig index 46bf3e73827..d17c3d74c43 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/Makefile b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/Makefile index 06f55d4e5f1..0b8c078e6ca 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_appinit.c index f9dd583ed7d..72d01570e05 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/Makefile b/boards/arm/lpc17xx_40xx/lx_cpu/src/Makefile index 97ac5ec9473..93b563333e6 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_bringup.c index 7d94a014f5a..50493bd42b4 100644 --- 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() * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lx_cpu.h b/boards/arm/lpc17xx_40xx/lx_cpu/src/lx_cpu.h index 363f5b0edca..136ab78e15a 100644 --- 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() * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/mbed/src/Makefile b/boards/arm/lpc17xx_40xx/mbed/src/Makefile index cac2ca20b3a..3d434c4d106 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/Makefile b/boards/arm/lpc17xx_40xx/mcb1700/src/Makefile index 74625033bb4..4911c496a79 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_bringup.c index db0356bda91..fe2944e29d2 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/mcb1700.h b/boards/arm/lpc17xx_40xx/mcb1700/src/mcb1700.h index a66d9ac4cff..7044b3f0ae8 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig index 4dfb4f6c37e..f7cb77c958f 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig index 11cede94523..4b3e822ebd2 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/Makefile b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/Makefile index c47b8ff8d79..faae54bf7cd 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc1766stk.h b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc1766stk.h index 7de83859ece..d0944ce3c48 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_appinit.c index 98cb024bd52..e973e403f81 100644 --- 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 */ diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_bringup.c index d8273a881f9..378f48088de 100644 --- 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 * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/open1788/src/Makefile b/boards/arm/lpc17xx_40xx/open1788/src/Makefile index 254a052f134..dd8bfe99687 100644 --- 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 diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_bringup.c index 87e85e33b4a..d48fa9ff57e 100644 --- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_bringup.c +++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_bringup.c @@ -362,7 +362,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() * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/open1788/src/open1788.h b/boards/arm/lpc17xx_40xx/open1788/src/open1788.h index 483d836f44c..cd238ddc66a 100644 --- a/boards/arm/lpc17xx_40xx/open1788/src/open1788.h +++ b/boards/arm/lpc17xx_40xx/open1788/src/open1788.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() * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/Makefile b/boards/arm/lpc17xx_40xx/pnev5180b/src/Makefile index f193363d2bd..469353d4f25 100644 --- a/boards/arm/lpc17xx_40xx/pnev5180b/src/Makefile +++ b/boards/arm/lpc17xx_40xx/pnev5180b/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 diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c index d36b61a681b..fd8ce7a3cfa 100644 --- a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c +++ b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c @@ -95,7 +95,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 * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/pnev5180b.h b/boards/arm/lpc17xx_40xx/pnev5180b/src/pnev5180b.h index 1e38412e04d..83e5cde5eff 100644 --- a/boards/arm/lpc17xx_40xx/pnev5180b/src/pnev5180b.h +++ b/boards/arm/lpc17xx_40xx/pnev5180b/src/pnev5180b.h @@ -79,7 +79,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 * ****************************************************************************/ diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/Makefile b/boards/arm/lpc17xx_40xx/u-blox-c027/src/Makefile index 41ce8fc03d0..f7b8a79f214 100644 --- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/Makefile +++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = lpc17_40_boot.c lpc17_40_leds.c lpc17_40_ssp.c lpc17_40_dac.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc17_40_appinit.c endif diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_appinit.c index 68415327b56..6a58c8b6620 100644 --- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_appinit.c +++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_appinit.c @@ -41,7 +41,7 @@ /* Configuration ************************************************************/ -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /* PORT and SLOT number probably depend on the board configuration */ @@ -100,7 +100,7 @@ #else # undef NSH_HAVEMMCSD -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ /**************************************************************************** * Public Functions diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/Makefile b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/Makefile index 808f54d6342..2e217bfe33b 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/Makefile +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/Makefile @@ -42,7 +42,7 @@ include $(TOPDIR)/Make.defs CSRCS = lpc17_40_boot.c lpc17_40_leds.c lpc17_40_ssp.c lpc17_40_buttons.c lpc17_40_lcd.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc17_40_appinit.c endif diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig index 7c2e9c0986a..a27ab8a86ba 100644 --- a/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH_CHIP_LPC214X=y CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_BUILDROOT=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_CDCACM=y CONFIG_CDCACM_COMPOSITE=y @@ -30,7 +31,6 @@ CONFIG_COMPOSITE_VENDORID=0x03eb CONFIG_COMPOSITE_VERSIONNO=0x0101 CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_PREALLOC_TIMERS=4 diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig index 6a9dc474775..d52227e6348 100644 --- a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig @@ -16,9 +16,9 @@ CONFIG_ARCH_CHIP_LPC214X=y CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_BUILDROOT=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_IDLETHREAD_STACKSIZE=2048 -CONFIG_LIB_BOARDCTL=y CONFIG_MMCSD=y CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=32768 diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig index 26aa1ec1870..2b7f08e6e9a 100644 --- a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig @@ -14,11 +14,11 @@ CONFIG_ARCH_CHIP_LPC214X=y CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_BUILDROOT=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_DISABLE_MOUNTPOINT=y CONFIG_EXAMPLES_USBSERIAL=y CONFIG_IDLETHREAD_STACKSIZE=2048 -CONFIG_LIB_BOARDCTL=y CONFIG_PL2303=y CONFIG_PL2303_EPBULKIN=5 CONFIG_PL2303_PRODUCTSTR="USBdev Serial" diff --git a/boards/arm/lpc214x/mcu123-lpc214x/src/Makefile b/boards/arm/lpc214x/mcu123-lpc214x/src/Makefile index 4e0a1e64749..5a9274cc071 100644 --- a/boards/arm/lpc214x/mcu123-lpc214x/src/Makefile +++ b/boards/arm/lpc214x/mcu123-lpc214x/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = lpc2148_spi1.c lpc2148_leds.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc2148_appinit.c endif diff --git a/boards/arm/lpc214x/zp214xpa/src/Makefile b/boards/arm/lpc214x/zp214xpa/src/Makefile index b686cbab371..13afbcb7c4d 100644 --- a/boards/arm/lpc214x/zp214xpa/src/Makefile +++ b/boards/arm/lpc214x/zp214xpa/src/Makefile @@ -24,7 +24,7 @@ ifeq ($(CONFIG_LCD_UG2864AMBAG01),y) CSRCS += lpc2148_ug2864ambag01.c lpc2148_spi1.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc2148_appinit.c endif diff --git a/boards/arm/lpc214x/zp214xpa/src/lpc2148_appinit.c b/boards/arm/lpc214x/zp214xpa/src/lpc2148_appinit.c index e20652bf9ac..b52f071cd84 100644 --- a/boards/arm/lpc214x/zp214xpa/src/lpc2148_appinit.c +++ b/boards/arm/lpc214x/zp214xpa/src/lpc2148_appinit.c @@ -31,7 +31,7 @@ # include #endif -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Public Functions @@ -90,4 +90,4 @@ int board_app_initialize(uintptr_t arg) return OK; } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/arm/lpc2378/olimex-lpc2378/src/Makefile b/boards/arm/lpc2378/olimex-lpc2378/src/Makefile index 9d8ac25a93f..fa046a0beb0 100644 --- a/boards/arm/lpc2378/olimex-lpc2378/src/Makefile +++ b/boards/arm/lpc2378/olimex-lpc2378/src/Makefile @@ -42,7 +42,7 @@ include $(TOPDIR)/Make.defs CSRCS = lpc2378_leds.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc2378_appinit.c endif diff --git a/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig index d93ba4074ee..06aa7f0e021 100644 --- a/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig +++ b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig @@ -14,13 +14,13 @@ CONFIG_ARCH_CHIP_LPC31XX=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_ROMPGTABLE=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=16945 CONFIG_BOOT_RUNFROMISRAM=y CONFIG_CONSOLE_SYSLOG=y CONFIG_DISABLE_ENVIRON=y CONFIG_EXAMPLES_USBSERIAL=y CONFIG_HOST_WINDOWS=y -CONFIG_LIB_BOARDCTL=y CONFIG_LPC31_UART=y CONFIG_LPC31_USBOTG=y CONFIG_PL2303=y diff --git a/boards/arm/lpc31xx/ea3131/src/Makefile b/boards/arm/lpc31xx/ea3131/src/Makefile index d493757bf97..1a3cdaee019 100644 --- a/boards/arm/lpc31xx/ea3131/src/Makefile +++ b/boards/arm/lpc31xx/ea3131/src/Makefile @@ -38,7 +38,7 @@ ifeq ($(CONFIG_LPC31_SPI),y) CSRCS += lpc31_spi.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc31_appinit.c endif diff --git a/boards/arm/lpc31xx/ea3152/src/Makefile b/boards/arm/lpc31xx/ea3152/src/Makefile index c158df5a3db..204429c3167 100644 --- a/boards/arm/lpc31xx/ea3152/src/Makefile +++ b/boards/arm/lpc31xx/ea3152/src/Makefile @@ -33,7 +33,7 @@ endif ifeq ($(CONFIG_LPC31_SPI),y) CSRCS += lpc31_spi.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc31_appinit.c endif ifeq ($(CONFIG_PAGING),y) diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/Makefile b/boards/arm/lpc31xx/olimex-lpc-h3131/src/Makefile index 14380ea0e9b..d8b8831af57 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/Makefile +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/Makefile @@ -38,7 +38,7 @@ ifeq ($(CONFIG_LPC31_MCI),y) CSRCS += lpc31_mmcsd.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc31_appinit.c endif diff --git a/boards/arm/lpc43xx/bambino-200e/src/Makefile b/boards/arm/lpc43xx/bambino-200e/src/Makefile index aec132da3a7..5f07e77ee2a 100644 --- a/boards/arm/lpc43xx/bambino-200e/src/Makefile +++ b/boards/arm/lpc43xx/bambino-200e/src/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG_SENSORS_MAX31855),y) CSRCS += lpc43_max31855.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc43_appinit.c endif diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/Makefile b/boards/arm/lpc43xx/lpc4330-xplorer/src/Makefile index d634610b6c5..8deabf2a3a2 100644 --- a/boards/arm/lpc43xx/lpc4330-xplorer/src/Makefile +++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = lpc43_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc43_appinit.c endif diff --git a/boards/arm/lpc43xx/lpc4337-ws/src/Makefile b/boards/arm/lpc43xx/lpc4337-ws/src/Makefile index 5041ee757e0..e4026372093 100644 --- a/boards/arm/lpc43xx/lpc4337-ws/src/Makefile +++ b/boards/arm/lpc43xx/lpc4337-ws/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = lpc43_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc43_appinit.c endif diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/Makefile b/boards/arm/lpc43xx/lpc4357-evb/src/Makefile index eb1bf644239..b669b3cde45 100644 --- a/boards/arm/lpc43xx/lpc4357-evb/src/Makefile +++ b/boards/arm/lpc43xx/lpc4357-evb/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = lpc43_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc43_appinit.c endif diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/Makefile b/boards/arm/lpc43xx/lpc4370-link2/src/Makefile index 208434791ab..e251651d6ef 100644 --- a/boards/arm/lpc43xx/lpc4370-link2/src/Makefile +++ b/boards/arm/lpc43xx/lpc4370-link2/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = lpc43_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc43_appinit.c endif diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig index 2513ff0e63b..27863c6b774 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_CHIP_LPC54XX=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STDARG_H=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=21082 CONFIG_BUILTIN=y CONFIG_DRIVERS_VIDEO=y @@ -29,7 +30,6 @@ CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INPUT=y CONFIG_INPUT_FT5X06=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y 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/src/Makefile b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/Makefile index 0ab4b629802..33e8e4e5048 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/Makefile +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/Makefile @@ -30,7 +30,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += lpc54_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lpc54_appinit.c endif diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_bringup.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_bringup.c index 3f80e3d0137..083cec7af38 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_bringup.c +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_bringup.c @@ -63,7 +63,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 * ****************************************************************************/ diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h index 3a393fabca2..6884e3dacec 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h @@ -308,7 +308,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 * ****************************************************************************/ diff --git a/boards/arm/max326xx/max32660-evsys/src/Makefile b/boards/arm/max326xx/max32660-evsys/src/Makefile index 7d5187d8b9a..4d6c6802cdb 100644 --- a/boards/arm/max326xx/max32660-evsys/src/Makefile +++ b/boards/arm/max326xx/max32660-evsys/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = max326_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += max326_appinit.c max326_bringup.c else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += max326_bringup.c diff --git a/boards/arm/max326xx/max32660-evsys/src/max32660-evsys.h b/boards/arm/max326xx/max32660-evsys/src/max32660-evsys.h index 4ec5240e505..b6ad5cbc100 100644 --- a/boards/arm/max326xx/max32660-evsys/src/max32660-evsys.h +++ b/boards/arm/max326xx/max32660-evsys/src/max32660-evsys.h @@ -99,7 +99,7 @@ * from board_late_initialize(). * * If CONFIG_BOARD_LATE_INITIALIZE is not selected, - * but CONFIG_LIB_BOARDCTL=y + * but CONFIG_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_appinit.c b/boards/arm/max326xx/max32660-evsys/src/max326_appinit.c index 1b9e028399b..a6e2c781680 100644 --- a/boards/arm/max326xx/max32660-evsys/src/max326_appinit.c +++ b/boards/arm/max326xx/max32660-evsys/src/max326_appinit.c @@ -30,7 +30,7 @@ #include "max32660-evsys.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 */ diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_bringup.c b/boards/arm/max326xx/max32660-evsys/src/max326_bringup.c index cfb05da18ff..9fee06bff51 100644 --- a/boards/arm/max326xx/max32660-evsys/src/max326_bringup.c +++ b/boards/arm/max326xx/max32660-evsys/src/max326_bringup.c @@ -57,7 +57,7 @@ * from board_late_initialize(). * * If CONFIG_BOARD_LATE_INITIALIZE is not selected, - * but CONFIG_LIB_BOARDCTL=y + * but CONFIG_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/boards/arm/moxart/moxa/src/Makefile b/boards/arm/moxart/moxa/src/Makefile index 7a7af16599e..ff004e119d1 100644 --- a/boards/arm/moxart/moxa/src/Makefile +++ b/boards/arm/moxart/moxa/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = moxart_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += moxart_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += moxart_reset.c diff --git a/boards/arm/moxart/moxa/src/moxart_appinit.c b/boards/arm/moxart/moxa/src/moxart_appinit.c index 969ce3d3ff7..5e32460f60c 100644 --- a/boards/arm/moxart/moxa/src/moxart_appinit.c +++ b/boards/arm/moxart/moxa/src/moxart_appinit.c @@ -63,11 +63,11 @@ * Description: * Perform architecture specific initialization * - * 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: diff --git a/boards/arm/nrf52/nrf52-feather/src/Makefile b/boards/arm/nrf52/nrf52-feather/src/Makefile index ee935317ef5..5a478e5249a 100644 --- a/boards/arm/nrf52/nrf52-feather/src/Makefile +++ b/boards/arm/nrf52/nrf52-feather/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = nrf52_boot.c nrf52_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += nrf52_appinit.c endif diff --git a/boards/arm/nrf52/nrf52-feather/src/nrf52-feather.h b/boards/arm/nrf52/nrf52-feather/src/nrf52-feather.h index 7303f4b251d..783c7434fe1 100644 --- a/boards/arm/nrf52/nrf52-feather/src/nrf52-feather.h +++ b/boards/arm/nrf52/nrf52-feather/src/nrf52-feather.h @@ -92,7 +92,7 @@ int nrf52_i2ctool(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 * ****************************************************************************/ diff --git a/boards/arm/nrf52/nrf52-feather/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52-feather/src/nrf52_bringup.c index 88d72d2316c..49f67b46f64 100644 --- a/boards/arm/nrf52/nrf52-feather/src/nrf52_bringup.c +++ b/boards/arm/nrf52/nrf52-feather/src/nrf52_bringup.c @@ -50,7 +50,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 * ****************************************************************************/ diff --git a/boards/arm/nrf52/nrf52832-dk/src/Makefile b/boards/arm/nrf52/nrf52832-dk/src/Makefile index 71467bfa333..b92e452c579 100644 --- a/boards/arm/nrf52/nrf52832-dk/src/Makefile +++ b/boards/arm/nrf52/nrf52832-dk/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = nrf52_boot.c nrf52_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += nrf52_appinit.c endif diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h b/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h index 8c49f8d4883..e3a379be88b 100644 --- a/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h +++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h @@ -75,7 +75,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 * ****************************************************************************/ diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c index c6f194745fd..43f7c7673e8 100644 --- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c +++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c @@ -48,7 +48,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 * ****************************************************************************/ diff --git a/boards/arm/nrf52/nrf52832-mdk/src/Makefile b/boards/arm/nrf52/nrf52832-mdk/src/Makefile index c6c35cecc1d..0ecfda0fadd 100644 --- a/boards/arm/nrf52/nrf52832-mdk/src/Makefile +++ b/boards/arm/nrf52/nrf52832-mdk/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = nrf52_boot.c nrf52_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += nrf52_appinit.c endif diff --git a/boards/arm/nrf52/nrf52832-mdk/src/nrf52832-mdk.h b/boards/arm/nrf52/nrf52832-mdk/src/nrf52832-mdk.h index 8189ffba688..c73a0f9db04 100644 --- a/boards/arm/nrf52/nrf52832-mdk/src/nrf52832-mdk.h +++ b/boards/arm/nrf52/nrf52832-mdk/src/nrf52832-mdk.h @@ -69,7 +69,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 * ****************************************************************************/ diff --git a/boards/arm/nrf52/nrf52832-mdk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52832-mdk/src/nrf52_bringup.c index fcfa59eca52..0dfb4cd0b49 100644 --- a/boards/arm/nrf52/nrf52832-mdk/src/nrf52_bringup.c +++ b/boards/arm/nrf52/nrf52832-mdk/src/nrf52_bringup.c @@ -56,7 +56,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 * ****************************************************************************/ diff --git a/boards/arm/nrf52/nrf52832-sparkfun/src/Makefile b/boards/arm/nrf52/nrf52832-sparkfun/src/Makefile index 77ac78e9644..0f273bc7cf0 100644 --- a/boards/arm/nrf52/nrf52832-sparkfun/src/Makefile +++ b/boards/arm/nrf52/nrf52832-sparkfun/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = nrf52_boot.c nrf52_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += nrf52_appinit.c endif diff --git a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52832-sparkfun.h b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52832-sparkfun.h index 902d692b129..ffe2bbdb390 100644 --- a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52832-sparkfun.h +++ b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52832-sparkfun.h @@ -67,7 +67,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 * ****************************************************************************/ diff --git a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_bringup.c index 1127ef09f1a..8674dfa0dd7 100644 --- a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_bringup.c +++ b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_bringup.c @@ -48,7 +48,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 * ****************************************************************************/ diff --git a/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig index 6983bfdde53..fde98911466 100644 --- a/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig +++ b/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig @@ -16,12 +16,12 @@ CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_RAMVECTORS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STDARG_H=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_MKRD=y CONFIG_BOARD_LOOPSPERMSEC=5500 CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y -CONFIG_LIB_BOARDCTL=y CONFIG_MM_REGIONS=2 CONFIG_NRF52840DK_HIGHPRI=y CONFIG_NRF52_TIMER0=y diff --git a/boards/arm/nrf52/nrf52840-dk/src/Makefile b/boards/arm/nrf52/nrf52840-dk/src/Makefile index 4d653fe773b..964389eb6a5 100644 --- a/boards/arm/nrf52/nrf52840-dk/src/Makefile +++ b/boards/arm/nrf52/nrf52840-dk/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = nrf52_boot.c nrf52_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += nrf52_appinit.c endif diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h b/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h index 16be54dabeb..69cf23a5104 100644 --- a/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h +++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h @@ -85,7 +85,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 * ****************************************************************************/ diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c index 2cc84946549..4a96237bf64 100644 --- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c +++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c @@ -104,7 +104,7 @@ static void nrf52_i2ctool(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 * ****************************************************************************/ diff --git a/boards/arm/nrf52/nrf52840-dongle/src/Makefile b/boards/arm/nrf52/nrf52840-dongle/src/Makefile index 6e4690d8b84..7a809a66b95 100644 --- a/boards/arm/nrf52/nrf52840-dongle/src/Makefile +++ b/boards/arm/nrf52/nrf52840-dongle/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = nrf52_boot.c nrf52_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += nrf52_appinit.c endif diff --git a/boards/arm/nrf52/nrf52840-dongle/src/nrf52840-dongle.h b/boards/arm/nrf52/nrf52840-dongle/src/nrf52840-dongle.h index e8e18178bc5..e2f688fb5a8 100644 --- a/boards/arm/nrf52/nrf52840-dongle/src/nrf52840-dongle.h +++ b/boards/arm/nrf52/nrf52840-dongle/src/nrf52840-dongle.h @@ -75,7 +75,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 * ****************************************************************************/ diff --git a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_bringup.c index b4d0709a4fc..1ad015a4175 100644 --- a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_bringup.c +++ b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_bringup.c @@ -44,7 +44,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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/src/Makefile b/boards/arm/s32k1xx/rddrone-uavcan144/src/Makefile index 1a16535c2dd..dc5369e9a0c 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan144/src/Makefile +++ b/boards/arm/s32k1xx/rddrone-uavcan144/src/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += s32k1xx_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += s32k1xx_appinit.c endif diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/src/rddrone-uavcan144.h b/boards/arm/s32k1xx/rddrone-uavcan144/src/rddrone-uavcan144.h index 5947d7e2a20..89a2d757917 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan144/src/rddrone-uavcan144.h +++ b/boards/arm/s32k1xx/rddrone-uavcan144/src/rddrone-uavcan144.h @@ -100,7 +100,7 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[]; * 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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_bringup.c index dc553e540fd..a4455bfff39 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_bringup.c +++ b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_bringup.c @@ -62,7 +62,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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/Makefile b/boards/arm/s32k1xx/rddrone-uavcan146/src/Makefile index 80d300a4231..aba9a82da6c 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan146/src/Makefile +++ b/boards/arm/s32k1xx/rddrone-uavcan146/src/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += s32k1xx_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += s32k1xx_appinit.c endif diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/rddrone-uavcan146.h b/boards/arm/s32k1xx/rddrone-uavcan146/src/rddrone-uavcan146.h index e14cd7537b5..d20327b525d 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan146/src/rddrone-uavcan146.h +++ b/boards/arm/s32k1xx/rddrone-uavcan146/src/rddrone-uavcan146.h @@ -98,7 +98,7 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[]; * 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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c index e449d5c071a..9a2eaab57f5 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c +++ b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c @@ -62,7 +62,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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/s32k118evb/src/Makefile b/boards/arm/s32k1xx/s32k118evb/src/Makefile index a221160ed9a..5205831ab1d 100644 --- a/boards/arm/s32k1xx/s32k118evb/src/Makefile +++ b/boards/arm/s32k1xx/s32k118evb/src/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += s32k1xx_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += s32k1xx_appinit.c endif diff --git a/boards/arm/s32k1xx/s32k118evb/src/s32k118evb.h b/boards/arm/s32k1xx/s32k118evb/src/s32k118evb.h index ecec80fc528..38b25f2f5db 100644 --- a/boards/arm/s32k1xx/s32k118evb/src/s32k118evb.h +++ b/boards/arm/s32k1xx/s32k118evb/src/s32k118evb.h @@ -96,7 +96,7 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[]; * 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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_bringup.c index 0da50ac701d..ddd6f400577 100644 --- a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_bringup.c +++ b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_bringup.c @@ -56,7 +56,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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/s32k144evb/src/Makefile b/boards/arm/s32k1xx/s32k144evb/src/Makefile index 1fd10e41d1e..62945e995aa 100644 --- a/boards/arm/s32k1xx/s32k144evb/src/Makefile +++ b/boards/arm/s32k1xx/s32k144evb/src/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += s32k1xx_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += s32k1xx_appinit.c endif diff --git a/boards/arm/s32k1xx/s32k144evb/src/s32k144evb.h b/boards/arm/s32k1xx/s32k144evb/src/s32k144evb.h index 700617066ba..eec9107ef1b 100644 --- a/boards/arm/s32k1xx/s32k144evb/src/s32k144evb.h +++ b/boards/arm/s32k1xx/s32k144evb/src/s32k144evb.h @@ -96,7 +96,7 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[]; * 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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_bringup.c index 2ea5dfb5efd..4bae76ccca7 100644 --- a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_bringup.c +++ b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_bringup.c @@ -61,7 +61,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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/s32k146evb/src/Makefile b/boards/arm/s32k1xx/s32k146evb/src/Makefile index 9008c3c2e2b..f57a8f73d67 100644 --- a/boards/arm/s32k1xx/s32k146evb/src/Makefile +++ b/boards/arm/s32k1xx/s32k146evb/src/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += s32k1xx_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += s32k1xx_appinit.c endif diff --git a/boards/arm/s32k1xx/s32k146evb/src/s32k146evb.h b/boards/arm/s32k1xx/s32k146evb/src/s32k146evb.h index 88564e360c3..6d69213f684 100644 --- a/boards/arm/s32k1xx/s32k146evb/src/s32k146evb.h +++ b/boards/arm/s32k1xx/s32k146evb/src/s32k146evb.h @@ -96,7 +96,7 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[]; * 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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_bringup.c index 2e67204b3d7..a37f828f56d 100644 --- a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_bringup.c +++ b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_bringup.c @@ -61,7 +61,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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/s32k148evb/src/Makefile b/boards/arm/s32k1xx/s32k148evb/src/Makefile index e243c54a94a..fbfba905a54 100644 --- a/boards/arm/s32k1xx/s32k148evb/src/Makefile +++ b/boards/arm/s32k1xx/s32k148evb/src/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += s32k1xx_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += s32k1xx_appinit.c endif diff --git a/boards/arm/s32k1xx/s32k148evb/src/s32k148evb.h b/boards/arm/s32k1xx/s32k148evb/src/s32k148evb.h index b5b6fee97a1..6ec7aaf99d8 100644 --- a/boards/arm/s32k1xx/s32k148evb/src/s32k148evb.h +++ b/boards/arm/s32k1xx/s32k148evb/src/s32k148evb.h @@ -96,7 +96,7 @@ extern const struct peripheral_clock_config_s g_peripheral_clockconfig0[]; * 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 * ****************************************************************************/ diff --git a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_bringup.c index 3dec9b390c5..9dda898183b 100644 --- a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_bringup.c +++ b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_bringup.c @@ -60,7 +60,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 * ****************************************************************************/ diff --git a/boards/arm/sam34/arduino-due/src/Makefile b/boards/arm/sam34/arduino-due/src/Makefile index c8f5a6dd92b..37665e80ccd 100644 --- a/boards/arm/sam34/arduino-due/src/Makefile +++ b/boards/arm/sam34/arduino-due/src/Makefile @@ -45,7 +45,7 @@ CSRCS += sam_lcd.c endif endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/sam34/arduino-due/src/arduino-due.h b/boards/arm/sam34/arduino-due/src/arduino-due.h index 2867f9d96af..a6d1543687e 100644 --- a/boards/arm/sam34/arduino-due/src/arduino-due.h +++ b/boards/arm/sam34/arduino-due/src/arduino-due.h @@ -346,7 +346,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 * ****************************************************************************/ diff --git a/boards/arm/sam34/arduino-due/src/sam_bringup.c b/boards/arm/sam34/arduino-due/src/sam_bringup.c index 21bc79f3fe2..7641ac32c3a 100644 --- a/boards/arm/sam34/arduino-due/src/sam_bringup.c +++ b/boards/arm/sam34/arduino-due/src/sam_bringup.c @@ -69,7 +69,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 * ****************************************************************************/ diff --git a/boards/arm/sam34/flipnclick-sam3x/src/Makefile b/boards/arm/sam34/flipnclick-sam3x/src/Makefile index afe9642e30d..f5514896fc0 100644 --- a/boards/arm/sam34/flipnclick-sam3x/src/Makefile +++ b/boards/arm/sam34/flipnclick-sam3x/src/Makefile @@ -28,7 +28,7 @@ else CSRCS += sam_userleds.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h b/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h index 30baefc0cec..399236b333c 100644 --- a/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h +++ b/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h @@ -239,7 +239,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 * ****************************************************************************/ diff --git a/boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c index 27e94e57f48..b4a3f8a777a 100644 --- a/boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c +++ b/boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c @@ -49,7 +49,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 * ****************************************************************************/ diff --git a/boards/arm/sam34/sam3u-ek/src/Makefile b/boards/arm/sam34/sam3u-ek/src/Makefile index c7102bbbeab..be0e2b33ebe 100644 --- a/boards/arm/sam34/sam3u-ek/src/Makefile +++ b/boards/arm/sam34/sam3u-ek/src/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG_LCD),y) CSRCS += sam_lcd.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/sam34/sam4cmp-db/src/Makefile b/boards/arm/sam34/sam4cmp-db/src/Makefile index feab33a0fa8..16d58f8552f 100644 --- a/boards/arm/sam34/sam4cmp-db/src/Makefile +++ b/boards/arm/sam34/sam4cmp-db/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = sam_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c sam_bringup.c else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += sam_bringup.c diff --git a/boards/arm/sam34/sam4cmp-db/src/sam4cmp-db.h b/boards/arm/sam34/sam4cmp-db/src/sam4cmp-db.h index b08c72c6901..02805216411 100644 --- a/boards/arm/sam34/sam4cmp-db/src/sam4cmp-db.h +++ b/boards/arm/sam34/sam4cmp-db/src/sam4cmp-db.h @@ -57,7 +57,7 @@ * ****************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) +#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int sam_bringup(void); #endif diff --git a/boards/arm/sam34/sam4cmp-db/src/sam_appinit.c b/boards/arm/sam34/sam4cmp-db/src/sam_appinit.c index 7029d1fec7d..cc172985110 100644 --- a/boards/arm/sam34/sam4cmp-db/src/sam_appinit.c +++ b/boards/arm/sam34/sam4cmp-db/src/sam_appinit.c @@ -28,7 +28,7 @@ #include "sam4cmp-db.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Public Functions @@ -70,4 +70,4 @@ int board_app_initialize(uintptr_t arg) #endif } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/arm/sam34/sam4e-ek/src/Makefile b/boards/arm/sam34/sam4e-ek/src/Makefile index 03251a7f6f4..98d5d8460cf 100644 --- a/boards/arm/sam34/sam4e-ek/src/Makefile +++ b/boards/arm/sam34/sam4e-ek/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = sam_boot.c sam_leds.c sam_buttons.c sam_udp.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/sam34/sam4e-ek/src/sam_boot.c b/boards/arm/sam34/sam4e-ek/src/sam_boot.c index df9a94e3321..8071638b916 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_boot.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_boot.c @@ -133,7 +133,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 } diff --git a/boards/arm/sam34/sam4l-xplained/src/Makefile b/boards/arm/sam34/sam4l-xplained/src/Makefile index 0b89fa6e09a..3689d8e6a89 100644 --- a/boards/arm/sam34/sam4l-xplained/src/Makefile +++ b/boards/arm/sam34/sam4l-xplained/src/Makefile @@ -36,7 +36,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += sam_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/Makefile b/boards/arm/sam34/sam4s-xplained-pro/src/Makefile index 7d9e127931d..0d7b6a5fd95 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/src/Makefile +++ b/boards/arm/sam34/sam4s-xplained-pro/src/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG_MMCSD_SPI),y) CSRCS += sam_spi.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/sama5/giant-board/src/Makefile b/boards/arm/sama5/giant-board/src/Makefile index 4b4fd9f4f80..15ebdd1e83e 100644 --- a/boards/arm/sama5/giant-board/src/Makefile +++ b/boards/arm/sama5/giant-board/src/Makefile @@ -58,7 +58,7 @@ CSRCS += sam_usb.c endif endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c CSRCS += sam_bringup.c endif diff --git a/boards/arm/sama5/sama5d2-xult/src/Makefile b/boards/arm/sama5/sama5d2-xult/src/Makefile index a7c29a3d027..d31528ac9f6 100644 --- a/boards/arm/sama5/sama5d2-xult/src/Makefile +++ b/boards/arm/sama5/sama5d2-xult/src/Makefile @@ -76,7 +76,7 @@ CSRCS += sam_ethernet.c endif endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c CSRCS += sam_bringup.c endif diff --git a/boards/arm/sama5/sama5d3-xplained/src/Makefile b/boards/arm/sama5/sama5d3-xplained/src/Makefile index 58936e0a16c..74dd01f0de2 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/Makefile +++ b/boards/arm/sama5/sama5d3-xplained/src/Makefile @@ -68,7 +68,7 @@ CSRCS += sam_ethernet.c endif endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c CSRCS += sam_bringup.c endif diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_boot.c b/boards/arm/sama5/sama5d3-xplained/src/sam_boot.c index 9fe13b4ee67..521b6cab6d6 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_boot.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_boot.c @@ -138,7 +138,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 } diff --git a/boards/arm/sama5/sama5d3x-ek/src/Makefile b/boards/arm/sama5/sama5d3x-ek/src/Makefile index ba574783237..6c6b035a282 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/Makefile +++ b/boards/arm/sama5/sama5d3x-ek/src/Makefile @@ -90,7 +90,7 @@ endif endif endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_boot.c b/boards/arm/sama5/sama5d3x-ek/src/sam_boot.c index a0ba8e45dbb..0c62177ff9a 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_boot.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_boot.c @@ -142,7 +142,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 } diff --git a/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig b/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig index b233920575d..071956f6ed9 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig @@ -29,6 +29,7 @@ CONFIG_ARCH_PGPOOL_VBASE=0x28000000 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_TEXT_VBASE=0x80000000 +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=65775 @@ -48,7 +49,6 @@ CONFIG_HOST_WINDOWS=y CONFIG_I2C=y CONFIG_I2C_RESET=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_LIB_SYSCALL=y CONFIG_MM_PGALLOC=y CONFIG_PREALLOC_TIMERS=4 diff --git a/boards/arm/sama5/sama5d4-ek/src/Makefile b/boards/arm/sama5/sama5d4-ek/src/Makefile index 3da9b806b9e..9388bb3fd37 100644 --- a/boards/arm/sama5/sama5d4-ek/src/Makefile +++ b/boards/arm/sama5/sama5d4-ek/src/Makefile @@ -96,7 +96,7 @@ ifeq ($(CONFIG_INPUT_MXT),y) CSRCS += sam_maxtouch.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c sam_bringup.c else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_appinit.c b/boards/arm/sama5/sama5d4-ek/src/sam_appinit.c index 1bc942ca83c..998a3032873 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_appinit.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_appinit.c @@ -28,7 +28,7 @@ #include "sama5d4-ek.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Pre-processor Definitions @@ -74,4 +74,4 @@ int board_app_initialize(uintptr_t arg) #endif } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/arm/samd2l2/arduino-m0/src/Makefile b/boards/arm/samd2l2/arduino-m0/src/Makefile index 0c7ec78ada2..471fa1311cb 100644 --- a/boards/arm/samd2l2/arduino-m0/src/Makefile +++ b/boards/arm/samd2l2/arduino-m0/src/Makefile @@ -40,7 +40,7 @@ ifeq ($(CONFIG_SAMD2L2_ADC),y) CSRCS += sam_adc.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/samd2l2/arduino-m0/src/arduino_m0.h b/boards/arm/samd2l2/arduino-m0/src/arduino_m0.h index a4e57108205..a27f835fac6 100644 --- a/boards/arm/samd2l2/arduino-m0/src/arduino_m0.h +++ b/boards/arm/samd2l2/arduino-m0/src/arduino_m0.h @@ -91,7 +91,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 * ****************************************************************************/ diff --git a/boards/arm/samd2l2/circuit-express/src/Makefile b/boards/arm/samd2l2/circuit-express/src/Makefile index e210f706aea..c1384990a54 100644 --- a/boards/arm/samd2l2/circuit-express/src/Makefile +++ b/boards/arm/samd2l2/circuit-express/src/Makefile @@ -30,7 +30,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += sam_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/samd2l2/circuit-express/src/circuit_express.h b/boards/arm/samd2l2/circuit-express/src/circuit_express.h index 6967e179b97..124e63fdb14 100644 --- a/boards/arm/samd2l2/circuit-express/src/circuit_express.h +++ b/boards/arm/samd2l2/circuit-express/src/circuit_express.h @@ -91,7 +91,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 * ****************************************************************************/ diff --git a/boards/arm/samd2l2/samd20-xplained/src/Makefile b/boards/arm/samd2l2/samd20-xplained/src/Makefile index 9bb79c2f0d3..44673450ffc 100644 --- a/boards/arm/samd2l2/samd20-xplained/src/Makefile +++ b/boards/arm/samd2l2/samd20-xplained/src/Makefile @@ -36,7 +36,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += sam_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/samd2l2/samd21-xplained/src/Makefile b/boards/arm/samd2l2/samd21-xplained/src/Makefile index 38582935a36..2e31673bdc6 100644 --- a/boards/arm/samd2l2/samd21-xplained/src/Makefile +++ b/boards/arm/samd2l2/samd21-xplained/src/Makefile @@ -36,7 +36,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += sam_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/samd2l2/saml21-xplained/src/Makefile b/boards/arm/samd2l2/saml21-xplained/src/Makefile index a03264b03a5..897533cccbb 100644 --- a/boards/arm/samd2l2/saml21-xplained/src/Makefile +++ b/boards/arm/samd2l2/saml21-xplained/src/Makefile @@ -36,7 +36,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += sam_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/samd5e5/metro-m4/src/Makefile b/boards/arm/samd5e5/metro-m4/src/Makefile index 4e05e48193e..ce13f2c6e7a 100644 --- a/boards/arm/samd5e5/metro-m4/src/Makefile +++ b/boards/arm/samd5e5/metro-m4/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = sam_boot.c sam_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/samd5e5/metro-m4/src/metro-m4.h b/boards/arm/samd5e5/metro-m4/src/metro-m4.h index 2c8bf1860de..8aef6db2a42 100644 --- a/boards/arm/samd5e5/metro-m4/src/metro-m4.h +++ b/boards/arm/samd5e5/metro-m4/src/metro-m4.h @@ -118,7 +118,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 * ****************************************************************************/ diff --git a/boards/arm/samd5e5/metro-m4/src/sam_bringup.c b/boards/arm/samd5e5/metro-m4/src/sam_bringup.c index 9087999e7a8..6761d6c2152 100644 --- a/boards/arm/samd5e5/metro-m4/src/sam_bringup.c +++ b/boards/arm/samd5e5/metro-m4/src/sam_bringup.c @@ -74,7 +74,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 * ****************************************************************************/ diff --git a/boards/arm/samd5e5/same54-xplained-pro/src/Makefile b/boards/arm/samd5e5/same54-xplained-pro/src/Makefile index 43ff0d517e0..dc3b6d42db3 100644 --- a/boards/arm/samd5e5/same54-xplained-pro/src/Makefile +++ b/boards/arm/samd5e5/same54-xplained-pro/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = sam_boot.c sam_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c endif diff --git a/boards/arm/samd5e5/same54-xplained-pro/src/sam_bringup.c b/boards/arm/samd5e5/same54-xplained-pro/src/sam_bringup.c index a513062b8ed..e0b4338a43d 100644 --- a/boards/arm/samd5e5/same54-xplained-pro/src/sam_bringup.c +++ b/boards/arm/samd5e5/same54-xplained-pro/src/sam_bringup.c @@ -52,7 +52,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 * ****************************************************************************/ diff --git a/boards/arm/samd5e5/same54-xplained-pro/src/same54-xplained-pro.h b/boards/arm/samd5e5/same54-xplained-pro/src/same54-xplained-pro.h index 526dc75d55d..aba88630d9e 100644 --- a/boards/arm/samd5e5/same54-xplained-pro/src/same54-xplained-pro.h +++ b/boards/arm/samd5e5/same54-xplained-pro/src/same54-xplained-pro.h @@ -91,7 +91,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 * ****************************************************************************/ diff --git a/boards/arm/samv7/same70-xplained/src/Makefile b/boards/arm/samv7/same70-xplained/src/Makefile index 8a0e9a87f2e..3a726b8691d 100644 --- a/boards/arm/samv7/same70-xplained/src/Makefile +++ b/boards/arm/samv7/same70-xplained/src/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG_SAMV7_SDRAMC),y) CSRCS += sam_sdram.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c sam_bringup.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += sam_reset.c diff --git a/boards/arm/samv7/same70-xplained/src/sam_appinit.c b/boards/arm/samv7/same70-xplained/src/sam_appinit.c index 4d851c5dec3..51a41aad7a5 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_appinit.c +++ b/boards/arm/samv7/same70-xplained/src/sam_appinit.c @@ -33,7 +33,7 @@ #include "sam_uid.h" #include "same70-xplained.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Public Functions @@ -102,4 +102,4 @@ int board_uniqueid(uint8_t *uniqueid) } #endif -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/arm/samv7/same70-xplained/src/same70-xplained.h b/boards/arm/samv7/same70-xplained/src/same70-xplained.h index 1a18d066183..b1827729d76 100644 --- a/boards/arm/samv7/same70-xplained/src/same70-xplained.h +++ b/boards/arm/samv7/same70-xplained/src/same70-xplained.h @@ -446,7 +446,7 @@ void sam_sdram_config(void); * ****************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) +#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int sam_bringup(void); #endif diff --git a/boards/arm/samv7/samv71-xult/src/Makefile b/boards/arm/samv7/samv71-xult/src/Makefile index 3099fb59b38..fa452cde7bc 100644 --- a/boards/arm/samv7/samv71-xult/src/Makefile +++ b/boards/arm/samv7/samv71-xult/src/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG_SAMV7_SDRAMC),y) CSRCS += sam_sdram.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sam_appinit.c sam_bringup.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += sam_reset.c diff --git a/boards/arm/samv7/samv71-xult/src/sam_appinit.c b/boards/arm/samv7/samv71-xult/src/sam_appinit.c index 7c23f7893ea..33ccd4d5672 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_appinit.c +++ b/boards/arm/samv7/samv71-xult/src/sam_appinit.c @@ -33,7 +33,7 @@ #include "sam_uid.h" #include "samv71-xult.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Public Functions @@ -102,4 +102,4 @@ int board_uniqueid(uint8_t *uniqueid) } #endif -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/arm/samv7/samv71-xult/src/samv71-xult.h b/boards/arm/samv7/samv71-xult/src/samv71-xult.h index 343f0068d46..f00c4dbf5a4 100644 --- a/boards/arm/samv7/samv71-xult/src/samv71-xult.h +++ b/boards/arm/samv7/samv71-xult/src/samv71-xult.h @@ -678,7 +678,7 @@ void sam_sdram_config(void); * ****************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) +#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int sam_bringup(void); #endif diff --git a/boards/arm/stm32/axoloti/src/Make.defs b/boards/arm/stm32/axoloti/src/Make.defs index c7ee161afc0..a0ce185aed3 100644 --- a/boards/arm/stm32/axoloti/src/Make.defs +++ b/boards/arm/stm32/axoloti/src/Make.defs @@ -37,7 +37,7 @@ include $(TOPDIR)/Make.defs CSRCS = stm32_boot.c stm32_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/axoloti/src/axoloti.h b/boards/arm/stm32/axoloti/src/axoloti.h index 2045ff2c407..d8a356b4825 100644 --- a/boards/arm/stm32/axoloti/src/axoloti.h +++ b/boards/arm/stm32/axoloti/src/axoloti.h @@ -179,7 +179,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/axoloti/src/stm32_bringup.c b/boards/arm/stm32/axoloti/src/stm32_bringup.c index d69fa084568..71c9e376819 100644 --- a/boards/arm/stm32/axoloti/src/stm32_bringup.c +++ b/boards/arm/stm32/axoloti/src/stm32_bringup.c @@ -79,7 +79,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/b-g431b-esc1/src/Make.defs b/boards/arm/stm32/b-g431b-esc1/src/Make.defs index c1a08b29ef9..88fbd4dafcf 100644 --- a/boards/arm/stm32/b-g431b-esc1/src/Make.defs +++ b/boards/arm/stm32/b-g431b-esc1/src/Make.defs @@ -33,7 +33,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/b-g431b-esc1/src/b-g431b-esc1.h b/boards/arm/stm32/b-g431b-esc1/src/b-g431b-esc1.h index be372df84da..450ba85a38b 100644 --- a/boards/arm/stm32/b-g431b-esc1/src/b-g431b-esc1.h +++ b/boards/arm/stm32/b-g431b-esc1/src/b-g431b-esc1.h @@ -84,7 +84,7 @@ * Description: * Perform architecture specific initialization * - * CONFIG_LIB_BOARDCTL=y: + * CONFIG_BOARDCTL=y: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherwise, assumed to be called from some other application. diff --git a/boards/arm/stm32/b-g431b-esc1/src/stm32_bringup.c b/boards/arm/stm32/b-g431b-esc1/src/stm32_bringup.c index edd66adcf88..166e3e3ed2c 100644 --- a/boards/arm/stm32/b-g431b-esc1/src/stm32_bringup.c +++ b/boards/arm/stm32/b-g431b-esc1/src/stm32_bringup.c @@ -62,7 +62,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/b-g474e-dpow1/src/Make.defs b/boards/arm/stm32/b-g474e-dpow1/src/Make.defs index adee74a39ec..5788944f14f 100644 --- a/boards/arm/stm32/b-g474e-dpow1/src/Make.defs +++ b/boards/arm/stm32/b-g474e-dpow1/src/Make.defs @@ -29,7 +29,7 @@ else CSRCS += stm32_userleds.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig index c9a79b9793e..c9725528b42 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_MPU=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y @@ -22,7 +23,6 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_NSH_DISABLE_DD=y CONFIG_NSH_DISABLE_GET=y CONFIG_NSH_DISABLE_IFUPDOWN=y diff --git a/boards/arm/stm32/clicker2-stm32/src/Make.defs b/boards/arm/stm32/clicker2-stm32/src/Make.defs index 7f442d7a363..bab3b6e35a9 100644 --- a/boards/arm/stm32/clicker2-stm32/src/Make.defs +++ b/boards/arm/stm32/clicker2-stm32/src/Make.defs @@ -36,7 +36,7 @@ ifeq ($(CONFIG_STM32_OTGFS),y) CSRCS += stm32_usb.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h b/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h index 605e305227b..2c894a09bfd 100644 --- a/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h +++ b/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h @@ -272,7 +272,7 @@ void weak_function stm32_spidev_initialize(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 * ****************************************************************************/ diff --git a/boards/arm/stm32/clicker2-stm32/src/stm32_appinit.c b/boards/arm/stm32/clicker2-stm32/src/stm32_appinit.c index 4f709b266bd..f2e13490c99 100644 --- a/boards/arm/stm32/clicker2-stm32/src/stm32_appinit.c +++ b/boards/arm/stm32/clicker2-stm32/src/stm32_appinit.c @@ -35,7 +35,7 @@ #include "clicker2-stm32.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Public Functions @@ -49,11 +49,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: @@ -109,4 +109,4 @@ int board_app_initialize(uintptr_t arg) return OK; } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/arm/stm32/clicker2-stm32/src/stm32_bringup.c b/boards/arm/stm32/clicker2-stm32/src/stm32_bringup.c index 499161f9d13..6a9e42ae2a5 100644 --- a/boards/arm/stm32/clicker2-stm32/src/stm32_bringup.c +++ b/boards/arm/stm32/clicker2-stm32/src/stm32_bringup.c @@ -68,7 +68,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/cloudctrl/src/Make.defs b/boards/arm/stm32/cloudctrl/src/Make.defs index b218e28e0be..abb672623da 100644 --- a/boards/arm/stm32/cloudctrl/src/Make.defs +++ b/boards/arm/stm32/cloudctrl/src/Make.defs @@ -56,7 +56,7 @@ ifeq ($(CONFIG_STM32_OTGFS),y) CSRCS += stm32_usb.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/emw3162/src/Make.defs b/boards/arm/stm32/emw3162/src/Make.defs index 9fa6e5d517e..cc0ea856022 100644 --- a/boards/arm/stm32/emw3162/src/Make.defs +++ b/boards/arm/stm32/emw3162/src/Make.defs @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = stm32_boot.c stm32_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/emw3162/src/emw3162.h b/boards/arm/stm32/emw3162/src/emw3162.h index d9189cf551e..7e4bbf78550 100644 --- a/boards/arm/stm32/emw3162/src/emw3162.h +++ b/boards/arm/stm32/emw3162/src/emw3162.h @@ -74,13 +74,13 @@ * * Description: * Called either by board_initialize() if CONFIG_BOARD_LATE_INITIALIZE or - * by board_app_initialize if CONFIG_LIB_BOARDCTL is selected. This + * by board_app_initialize if CONFIG_BOARDCTL is selected. This * function initializes and configures all on-board features appropriate * for the selected configuration. * ****************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) +#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int stm32_bringup(void); #endif diff --git a/boards/arm/stm32/emw3162/src/stm32_appinit.c b/boards/arm/stm32/emw3162/src/stm32_appinit.c index 1b49e154f1c..bade330e08e 100644 --- a/boards/arm/stm32/emw3162/src/stm32_appinit.c +++ b/boards/arm/stm32/emw3162/src/stm32_appinit.c @@ -30,7 +30,7 @@ #include "emw3162.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 */ diff --git a/boards/arm/stm32/emw3162/src/stm32_bringup.c b/boards/arm/stm32/emw3162/src/stm32_bringup.c index eead0c2cdd5..13213c1f9e3 100644 --- a/boards/arm/stm32/emw3162/src/stm32_bringup.c +++ b/boards/arm/stm32/emw3162/src/stm32_bringup.c @@ -44,7 +44,7 @@ * * Description: * Called either by board_initialize() if CONFIG_BOARD_LATE_INITIALIZE or - * by board_app_initialize if CONFIG_LIB_BOARDCTL is selected. + * by board_app_initialize if CONFIG_BOARDCTL is selected. * This function initializes and configures all on-board features * appropriate for the selected configuration. * diff --git a/boards/arm/stm32/et-stm32-stamp/src/Make.defs b/boards/arm/stm32/et-stm32-stamp/src/Make.defs index 11ef7edce3f..5c94ee06200 100644 --- a/boards/arm/stm32/et-stm32-stamp/src/Make.defs +++ b/boards/arm/stm32/et-stm32-stamp/src/Make.defs @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = stm32_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) endif ifeq ($(CONFIG_INPUT),y) @@ -31,7 +31,7 @@ endif ifeq ($(CONFIG_USBMSC),y) endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/fire-stm32v2/src/Make.defs b/boards/arm/stm32/fire-stm32v2/src/Make.defs index 6be0441e038..4bac11df232 100644 --- a/boards/arm/stm32/fire-stm32v2/src/Make.defs +++ b/boards/arm/stm32/fire-stm32v2/src/Make.defs @@ -36,7 +36,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig index 937006154fe..1915bf50e16 100644 --- a/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig @@ -14,8 +14,8 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=5483 -CONFIG_LIB_BOARDCTL=y CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y CONFIG_PREALLOC_TIMERS=4 diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig index 7e8dddd4bc3..df5c24d134d 100644 --- a/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig @@ -12,10 +12,10 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DISABLE_MOUNTPOINT=y CONFIG_EXAMPLES_USBSERIAL=y -CONFIG_LIB_BOARDCTL=y CONFIG_PL2303=y CONFIG_PL2303_PRODUCTSTR="USBdev Serial" CONFIG_PL2303_RXBUFSIZE=512 diff --git a/boards/arm/stm32/hymini-stm32v/src/Make.defs b/boards/arm/stm32/hymini-stm32v/src/Make.defs index 1ee0c6bf219..e05baf85522 100644 --- a/boards/arm/stm32/hymini-stm32v/src/Make.defs +++ b/boards/arm/stm32/hymini-stm32v/src/Make.defs @@ -30,7 +30,7 @@ CSRCS += stm32_r61505u.c endif endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/maple/src/Make.defs b/boards/arm/stm32/maple/src/Make.defs index bbc78eb0d8f..7bec4d12387 100644 --- a/boards/arm/stm32/maple/src/Make.defs +++ b/boards/arm/stm32/maple/src/Make.defs @@ -42,7 +42,7 @@ ifeq ($(CONFIG_NX_LCDDRIVER),y) CSRCS += stm32_lcd.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) endif ifeq ($(CONFIG_INPUT),y) @@ -51,7 +51,7 @@ endif ifeq ($(CONFIG_USBMSC),y) endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/mikroe-stm32f4/src/Make.defs b/boards/arm/stm32/mikroe-stm32f4/src/Make.defs index 8ff620dfcca..faf66cd73ac 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/Make.defs +++ b/boards/arm/stm32/mikroe-stm32f4/src/Make.defs @@ -34,7 +34,7 @@ ifeq ($(CONFIG_PWM),y) CSRCS += stm32_pwm.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/nucleo-f103rb/src/Make.defs b/boards/arm/stm32/nucleo-f103rb/src/Make.defs index fd710c4c74b..b926e54a24c 100644 --- a/boards/arm/stm32/nucleo-f103rb/src/Make.defs +++ b/boards/arm/stm32/nucleo-f103rb/src/Make.defs @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/nucleo-f103rb/src/nucleo-f103rb.h b/boards/arm/stm32/nucleo-f103rb/src/nucleo-f103rb.h index 9465f55cb40..c719bea4f03 100644 --- a/boards/arm/stm32/nucleo-f103rb/src/nucleo-f103rb.h +++ b/boards/arm/stm32/nucleo-f103rb/src/nucleo-f103rb.h @@ -87,7 +87,7 @@ * Description: * Perform architecture specific initialization * - * CONFIG_LIB_BOARDCTL=y: + * CONFIG_BOARDCTL=y: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherwise, assumed to be called from some other application. diff --git a/boards/arm/stm32/nucleo-f103rb/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_bringup.c index 148bca4cb90..32b97595306 100644 --- a/boards/arm/stm32/nucleo-f103rb/src/stm32_bringup.c +++ b/boards/arm/stm32/nucleo-f103rb/src/stm32_bringup.c @@ -62,7 +62,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/nucleo-f207zg/src/Make.defs b/boards/arm/stm32/nucleo-f207zg/src/Make.defs index 42565e5f27e..a401b2453a1 100644 --- a/boards/arm/stm32/nucleo-f207zg/src/Make.defs +++ b/boards/arm/stm32/nucleo-f207zg/src/Make.defs @@ -36,7 +36,7 @@ ifeq ($(CONFIG_STM32_OTGFS),y) CSRCS += stm32_usb.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c index 7bfe030de03..4b5e8ddad88 100644 --- a/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c @@ -80,7 +80,7 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) +#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) /* Perform board bring-up here instead of from the * board_app_initialize(). */ diff --git a/boards/arm/stm32/nucleo-f207zg/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_bringup.c index 56ed037bcad..898242da390 100644 --- a/boards/arm/stm32/nucleo-f207zg/src/stm32_bringup.c +++ b/boards/arm/stm32/nucleo-f207zg/src/stm32_bringup.c @@ -47,7 +47,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 && * CONFIG_NSH_ARCHINIT: * Called from the NSH library * diff --git a/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig index 6c1664d949e..50a05fe31b3 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_CHIP_STM32F302R8=y CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_RAMVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_ENVIRON=y @@ -26,7 +27,6 @@ CONFIG_FDCLONE_STDIO=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y -CONFIG_LIB_BOARDCTL=y CONFIG_NAME_MAX=16 CONFIG_NUCLEOF302R8_HIGHPRI=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 diff --git a/boards/arm/stm32/nucleo-f302r8/src/Make.defs b/boards/arm/stm32/nucleo-f302r8/src/Make.defs index aee173753bb..1a8896280fa 100644 --- a/boards/arm/stm32/nucleo-f302r8/src/Make.defs +++ b/boards/arm/stm32/nucleo-f302r8/src/Make.defs @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/nucleo-f302r8/src/nucleo-f302r8.h b/boards/arm/stm32/nucleo-f302r8/src/nucleo-f302r8.h index 224be0a894f..066cf5b9be6 100644 --- a/boards/arm/stm32/nucleo-f302r8/src/nucleo-f302r8.h +++ b/boards/arm/stm32/nucleo-f302r8/src/nucleo-f302r8.h @@ -108,7 +108,7 @@ * Description: * Perform architecture specific initialization * - * CONFIG_LIB_BOARDCTL=y: + * CONFIG_BOARDCTL=y: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherwise, assumed to be called from some other application. diff --git a/boards/arm/stm32/nucleo-f302r8/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_bringup.c index 1a3285eb0c0..81d69eb7f41 100644 --- a/boards/arm/stm32/nucleo-f302r8/src/stm32_bringup.c +++ b/boards/arm/stm32/nucleo-f302r8/src/stm32_bringup.c @@ -67,7 +67,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/nucleo-f303re/configs/can/defconfig b/boards/arm/stm32/nucleo-f303re/configs/can/defconfig index be0f65e9d4e..fcccc9b7b9d 100644 --- a/boards/arm/stm32/nucleo-f303re/configs/can/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/can/defconfig @@ -16,11 +16,11 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_EXAMPLES_CAN=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MM_REGIONS=2 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=65536 diff --git a/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig b/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig index 9d818b7e7e8..b742456dbdd 100644 --- a/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig @@ -17,12 +17,12 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_EXAMPLES_SERIALRX=y CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MM_REGIONS=2 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=65536 diff --git a/boards/arm/stm32/nucleo-f303re/src/Make.defs b/boards/arm/stm32/nucleo-f303re/src/Make.defs index 83d48b50077..3dedaf0d485 100644 --- a/boards/arm/stm32/nucleo-f303re/src/Make.defs +++ b/boards/arm/stm32/nucleo-f303re/src/Make.defs @@ -49,7 +49,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32/nucleo-f303ze/src/Make.defs b/boards/arm/stm32/nucleo-f303ze/src/Make.defs index 529be69aca1..7ef7dcc6058 100644 --- a/boards/arm/stm32/nucleo-f303ze/src/Make.defs +++ b/boards/arm/stm32/nucleo-f303ze/src/Make.defs @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c index 952b914a7d9..5dba0567d9f 100644 --- a/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c @@ -74,7 +74,7 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) +#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) /* Perform board bring-up here instead of from the * board_app_initialize(). */ diff --git a/boards/arm/stm32/nucleo-f303ze/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_bringup.c index bc98d8818a1..5e43c74d1d9 100644 --- a/boards/arm/stm32/nucleo-f303ze/src/stm32_bringup.c +++ b/boards/arm/stm32/nucleo-f303ze/src/stm32_bringup.c @@ -47,7 +47,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 && * CONFIG_NSH_ARCHINIT: * Called from the NSH library * diff --git a/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig index 175823c11e0..99ecead7df5 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_CHIP_STM32F334R8=y CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_RAMVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_ENVIRON=y @@ -26,7 +27,6 @@ CONFIG_FDCLONE_STDIO=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y -CONFIG_LIB_BOARDCTL=y CONFIG_NAME_MAX=16 CONFIG_NUCLEOF334R8_HIGHPRI=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 diff --git a/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig index bb5371d613c..092b3ffd76d 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_CHIP_STM32F334R8=y CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_RAMVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_ENVIRON=y @@ -26,7 +27,6 @@ CONFIG_FDCLONE_STDIO=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y -CONFIG_LIB_BOARDCTL=y CONFIG_NAME_MAX=16 CONFIG_NUCLEOF334R8_SPWM=y CONFIG_NUCLEOF334R8_SPWM_PHASE_NUM=3 diff --git a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig index 32a1ad309a7..49f7e6faa89 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_CHIP_STM32F334R8=y CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_RAMVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y @@ -28,7 +29,6 @@ CONFIG_FDCLONE_STDIO=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y -CONFIG_LIB_BOARDCTL=y CONFIG_NAME_MAX=16 CONFIG_NUCLEOF334R8_SPWM=y CONFIG_NUCLEOF334R8_SPWM_PHASE_NUM=4 diff --git a/boards/arm/stm32/nucleo-f334r8/src/Make.defs b/boards/arm/stm32/nucleo-f334r8/src/Make.defs index c8ab2879ce4..e7552c1af2a 100644 --- a/boards/arm/stm32/nucleo-f334r8/src/Make.defs +++ b/boards/arm/stm32/nucleo-f334r8/src/Make.defs @@ -26,7 +26,7 @@ ifeq ($(CONFIG_ARCH_LEDS),y) CSRCS += stm32_autoleds.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/nucleo-f410rb/src/Make.defs b/boards/arm/stm32/nucleo-f410rb/src/Make.defs index 93962c1ea45..c3f8d7c6a6f 100644 --- a/boards/arm/stm32/nucleo-f410rb/src/Make.defs +++ b/boards/arm/stm32/nucleo-f410rb/src/Make.defs @@ -36,7 +36,7 @@ ifeq ($(CONFIG_ADC),y) CSRCS += stm32_adc.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/nucleo-f410rb/src/nucleo-f410rb.h b/boards/arm/stm32/nucleo-f410rb/src/nucleo-f410rb.h index 08e51fc45df..a2c8477004c 100644 --- a/boards/arm/stm32/nucleo-f410rb/src/nucleo-f410rb.h +++ b/boards/arm/stm32/nucleo-f410rb/src/nucleo-f410rb.h @@ -73,7 +73,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c index 27e23ee34df..41864521456 100644 --- a/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c @@ -88,7 +88,7 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) +#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) /* Perform board-specific initialization */ stm32_bringup(); diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_bringup.c index 05bcbf5f7a5..422c76fedb5 100644 --- a/boards/arm/stm32/nucleo-f410rb/src/stm32_bringup.c +++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_bringup.c @@ -47,7 +47,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/nucleo-f412zg/src/nucleo-f412zg.h b/boards/arm/stm32/nucleo-f412zg/src/nucleo-f412zg.h index fb0bb1f4ea3..ba8edb72d75 100644 --- a/boards/arm/stm32/nucleo-f412zg/src/nucleo-f412zg.h +++ b/boards/arm/stm32/nucleo-f412zg/src/nucleo-f412zg.h @@ -170,7 +170,7 @@ int stm32_usbhost_initialize(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 * ****************************************************************************/ diff --git a/boards/arm/stm32/nucleo-f412zg/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f412zg/src/stm32_bringup.c index c40fb82b088..fe60328057e 100644 --- a/boards/arm/stm32/nucleo-f412zg/src/stm32_bringup.c +++ b/boards/arm/stm32/nucleo-f412zg/src/stm32_bringup.c @@ -48,7 +48,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/nucleo-f429zi/src/Make.defs b/boards/arm/stm32/nucleo-f429zi/src/Make.defs index 296fed8d713..1dbf2801abd 100644 --- a/boards/arm/stm32/nucleo-f429zi/src/Make.defs +++ b/boards/arm/stm32/nucleo-f429zi/src/Make.defs @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c index b47d2e4affe..44a77786091 100644 --- a/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c @@ -83,7 +83,7 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) +#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in * user-space but the initialization function must run in kernel space. diff --git a/boards/arm/stm32/nucleo-f446re/src/Make.defs b/boards/arm/stm32/nucleo-f446re/src/Make.defs index 7e8267c02bd..2b19ab7c059 100644 --- a/boards/arm/stm32/nucleo-f446re/src/Make.defs +++ b/boards/arm/stm32/nucleo-f446re/src/Make.defs @@ -61,7 +61,7 @@ ifeq ($(CONFIG_DAC),y) CSRCS += stm32_dac.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/nucleo-f446re/src/nucleo-f446re.h b/boards/arm/stm32/nucleo-f446re/src/nucleo-f446re.h index f503727d02f..e77b4e06a03 100644 --- a/boards/arm/stm32/nucleo-f446re/src/nucleo-f446re.h +++ b/boards/arm/stm32/nucleo-f446re/src/nucleo-f446re.h @@ -261,7 +261,7 @@ extern struct sdio_dev_s *g_sdio; * Description: * Perform architecture specific initialization * - * CONFIG_LIB_BOARDCTL=y: + * CONFIG_BOARDCTL=y: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherwise, assumed to be called from some other application. diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c index 118429ee1ed..773e1ff6e6e 100644 --- a/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c +++ b/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c @@ -66,7 +66,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/nucleo-f4x1re/src/Make.defs b/boards/arm/stm32/nucleo-f4x1re/src/Make.defs index 5a5daae9d20..8c693d2e14e 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/Make.defs +++ b/boards/arm/stm32/nucleo-f4x1re/src/Make.defs @@ -43,7 +43,7 @@ ifeq ($(CONFIG_CAN_MCP2515),y) CSRCS += stm32_mcp2515.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/nucleo-f4x1re/src/nucleo-f4x1re.h b/boards/arm/stm32/nucleo-f4x1re/src/nucleo-f4x1re.h index cd0469789a2..9e3283353f2 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/nucleo-f4x1re.h +++ b/boards/arm/stm32/nucleo-f4x1re/src/nucleo-f4x1re.h @@ -241,7 +241,7 @@ extern struct sdio_dev_s *g_sdio; * Description: * Perform architecture specific initialization * - * CONFIG_LIB_BOARDCTL=y: + * CONFIG_BOARDCTL=y: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherwise, assumed to be called from some other application. diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c index 1983d26dc32..33d30903c6b 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c +++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c @@ -58,7 +58,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/nucleo-g431kb/src/Make.defs b/boards/arm/stm32/nucleo-g431kb/src/Make.defs index fce06a22325..80b207a94be 100755 --- a/boards/arm/stm32/nucleo-g431kb/src/Make.defs +++ b/boards/arm/stm32/nucleo-g431kb/src/Make.defs @@ -33,7 +33,7 @@ ifeq ($(CONFIG_PWM),y) CSRCS += stm32_pwm.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/nucleo-g431kb/src/nucleo-g431kb.h b/boards/arm/stm32/nucleo-g431kb/src/nucleo-g431kb.h index 609d10c5a6e..30584786f7e 100755 --- a/boards/arm/stm32/nucleo-g431kb/src/nucleo-g431kb.h +++ b/boards/arm/stm32/nucleo-g431kb/src/nucleo-g431kb.h @@ -76,7 +76,7 @@ * Description: * Perform architecture specific initialization * - * CONFIG_LIB_BOARDCTL=y: + * CONFIG_BOARDCTL=y: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherwise, assumed to be called from some other application. diff --git a/boards/arm/stm32/nucleo-g431kb/src/stm32_bringup.c b/boards/arm/stm32/nucleo-g431kb/src/stm32_bringup.c index fa504d7c271..40f7b86ab12 100755 --- a/boards/arm/stm32/nucleo-g431kb/src/stm32_bringup.c +++ b/boards/arm/stm32/nucleo-g431kb/src/stm32_bringup.c @@ -58,7 +58,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/nucleo-g431rb/src/Make.defs b/boards/arm/stm32/nucleo-g431rb/src/Make.defs index 586119505d0..679a48cd6ae 100644 --- a/boards/arm/stm32/nucleo-g431rb/src/Make.defs +++ b/boards/arm/stm32/nucleo-g431rb/src/Make.defs @@ -33,7 +33,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/nucleo-g431rb/src/nucleo-g431rb.h b/boards/arm/stm32/nucleo-g431rb/src/nucleo-g431rb.h index 92154be09fb..ab9b29380c2 100644 --- a/boards/arm/stm32/nucleo-g431rb/src/nucleo-g431rb.h +++ b/boards/arm/stm32/nucleo-g431rb/src/nucleo-g431rb.h @@ -93,7 +93,7 @@ * Description: * Perform architecture specific initialization * - * CONFIG_LIB_BOARDCTL=y: + * CONFIG_BOARDCTL=y: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherwise, assumed to be called from some other application. diff --git a/boards/arm/stm32/nucleo-g431rb/src/stm32_bringup.c b/boards/arm/stm32/nucleo-g431rb/src/stm32_bringup.c index 7e7ad766030..2b79dea9fc7 100644 --- a/boards/arm/stm32/nucleo-g431rb/src/stm32_bringup.c +++ b/boards/arm/stm32/nucleo-g431rb/src/stm32_bringup.c @@ -62,7 +62,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/nucleo-l152re/src/Make.defs b/boards/arm/stm32/nucleo-l152re/src/Make.defs index c0f56f74e00..aa427c4c212 100644 --- a/boards/arm/stm32/nucleo-l152re/src/Make.defs +++ b/boards/arm/stm32/nucleo-l152re/src/Make.defs @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32/olimex-stm32-e407/src/Make.defs b/boards/arm/stm32/olimex-stm32-e407/src/Make.defs index f6d81dfaccd..a7bb9d375bb 100644 --- a/boards/arm/stm32/olimex-stm32-e407/src/Make.defs +++ b/boards/arm/stm32/olimex-stm32-e407/src/Make.defs @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h b/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h index 92592a9073f..bb4f1eb4bed 100644 --- a/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h +++ b/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h @@ -229,7 +229,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c index 68cf2bc5107..68646de44cb 100644 --- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c +++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c @@ -177,7 +177,7 @@ static void stm32_i2ctool(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 * ****************************************************************************/ diff --git a/boards/arm/stm32/olimex-stm32-h405/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_appinit.c index 3f1010588a6..5ca11201f85 100644 --- a/boards/arm/stm32/olimex-stm32-h405/src/stm32_appinit.c +++ b/boards/arm/stm32/olimex-stm32-h405/src/stm32_appinit.c @@ -62,11 +62,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: diff --git a/boards/arm/stm32/olimex-stm32-h405/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_boot.c index f7b2ea7d2df..2a0ca28fe27 100644 --- a/boards/arm/stm32/olimex-stm32-h405/src/stm32_boot.c +++ b/boards/arm/stm32/olimex-stm32-h405/src/stm32_boot.c @@ -96,7 +96,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 } diff --git a/boards/arm/stm32/olimex-stm32-h407/src/Make.defs b/boards/arm/stm32/olimex-stm32-h407/src/Make.defs index ddcf2b5adfa..309cde316bb 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/Make.defs +++ b/boards/arm/stm32/olimex-stm32-h407/src/Make.defs @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h b/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h index 05ff939b2ba..9df8f5a9145 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h +++ b/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h @@ -195,7 +195,7 @@ * Description: * Perform architecture specific initialization * - * CONFIG_LIB_BOARDCTL=y: + * CONFIG_BOARDCTL=y: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherse, assumed to be called from some other application. diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_appinit.c index eb19f866936..71a30894f7a 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_appinit.c +++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_appinit.c @@ -42,7 +42,7 @@ #include "stm32.h" #include "olimex-stm32-h407.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Public Functions @@ -56,7 +56,7 @@ * 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: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherse, assumed to be called from some other application. @@ -83,4 +83,4 @@ int board_app_initialize(uintptr_t arg) return stm32_bringup(); } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c index 2efa47e4ec1..8a0a2b53ae5 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c +++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c @@ -93,10 +93,10 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#ifndef CONFIG_LIB_BOARDCTL +#ifndef CONFIG_BOARDCTL /* Perform NSH initialization here instead of from the * board_app_initialize. - * If CONFIG_LIB_BOARDCTL=y we assume that come application will perform + * If CONFIG_BOARDCTL=y we assume that come application will perform * the initialization by calling board_app_initialize indirectly through * boardctl(). */ diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_bringup.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_bringup.c index 7cc5dc6455c..b205c70d93f 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_bringup.c +++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_bringup.c @@ -63,7 +63,7 @@ * Description: * Perform architecture specific initialization * - * CONFIG_LIB_BOARDCTL=y: + * CONFIG_BOARDCTL=y: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherse, assumed to be called from some other application. diff --git a/boards/arm/stm32/olimex-stm32-p107/src/Make.defs b/boards/arm/stm32/olimex-stm32-p107/src/Make.defs index 5d568a0493b..d9fab81cf03 100644 --- a/boards/arm/stm32/olimex-stm32-p107/src/Make.defs +++ b/boards/arm/stm32/olimex-stm32-p107/src/Make.defs @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = stm32_boot.c stm32_spi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/olimex-stm32-p107/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_appinit.c index 2310731dfad..c2f8f224829 100644 --- a/boards/arm/stm32/olimex-stm32-p107/src/stm32_appinit.c +++ b/boards/arm/stm32/olimex-stm32-p107/src/stm32_appinit.c @@ -33,7 +33,7 @@ #include "stm32.h" #include "olimex-stm32-p107.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Public Functions @@ -47,7 +47,7 @@ * 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: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherse, assumed to be called from some other application. @@ -87,4 +87,4 @@ int board_app_initialize(uintptr_t arg) return OK; } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c index 081a9e9716f..52d0b936a6a 100644 --- a/boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c +++ b/boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c @@ -102,11 +102,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: diff --git a/boards/arm/stm32/olimex-stm32-p207/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_boot.c index 3e228ed4ec2..e5cab482603 100644 --- a/boards/arm/stm32/olimex-stm32-p207/src/stm32_boot.c +++ b/boards/arm/stm32/olimex-stm32-p207/src/stm32_boot.c @@ -96,7 +96,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 } diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig index 0f05ee3f73e..e2456502f9a 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_ARM_MPU=y CONFIG_BINFMT_CONSTRUCTORS=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 @@ -32,7 +33,6 @@ CONFIG_FS_FAT=y CONFIG_HAVE_CXX=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y -CONFIG_LIB_BOARDCTL=y CONFIG_MM_KERNEL_HEAPSIZE=16384 CONFIG_MM_REGIONS=2 CONFIG_NUTTX_USERSPACE=0x08020000 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig index 953a8225ee1..772bd5533f1 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_ARM_MPU=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 @@ -29,7 +30,6 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MM_KERNEL_HEAPSIZE=16384 CONFIG_MM_REGIONS=2 CONFIG_MODULE=y diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig index f7b04216a97..45cffc4c07b 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_MPU=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y @@ -22,7 +23,6 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MM_KERNEL_HEAPSIZE=16384 CONFIG_NSH_DISABLE_DD=y CONFIG_NSH_DISABLE_GET=y diff --git a/boards/arm/stm32/olimex-stm32-p407/src/Make.defs b/boards/arm/stm32/olimex-stm32-p407/src/Make.defs index 48d23d1b491..b2fee252ddf 100644 --- a/boards/arm/stm32/olimex-stm32-p407/src/Make.defs +++ b/boards/arm/stm32/olimex-stm32-p407/src/Make.defs @@ -40,7 +40,7 @@ ifeq ($(CONFIG_STM32_OTGFS),y) CSRCS += stm32_usb.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h b/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h index 415b1b59509..8dd84b094d0 100644 --- a/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h +++ b/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h @@ -221,7 +221,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/olimex-stm32-p407/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_appinit.c index 3bb8bb7d2d0..5f9be9d3017 100644 --- a/boards/arm/stm32/olimex-stm32-p407/src/stm32_appinit.c +++ b/boards/arm/stm32/olimex-stm32-p407/src/stm32_appinit.c @@ -31,7 +31,7 @@ #include "olimex-stm32-p407.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 */ diff --git a/boards/arm/stm32/olimex-stm32-p407/src/stm32_bringup.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_bringup.c index e33963c2b42..3c2aee281e9 100644 --- a/boards/arm/stm32/olimex-stm32-p407/src/stm32_bringup.c +++ b/boards/arm/stm32/olimex-stm32-p407/src/stm32_bringup.c @@ -76,7 +76,7 @@ extern const int MODSYMS_NSYMBOLS_VAR; * 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 * ****************************************************************************/ diff --git a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig index 5ec5973ab29..bd95d709707 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_INTERRUPTSTACK=340 CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y @@ -35,7 +36,6 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=300 CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MM_SMALL=y CONFIG_NAME_MAX=8 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=5 diff --git a/boards/arm/stm32/olimexino-stm32/src/Make.defs b/boards/arm/stm32/olimexino-stm32/src/Make.defs index 95cd24b0a45..634e052f1bf 100644 --- a/boards/arm/stm32/olimexino-stm32/src/Make.defs +++ b/boards/arm/stm32/olimexino-stm32/src/Make.defs @@ -26,7 +26,7 @@ ifeq ($(CONFIG_CAN),y) CSRCS += stm32_can.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/olimexino-stm32/src/stm32_boot.c b/boards/arm/stm32/olimexino-stm32/src/stm32_boot.c index be64b9bfe1e..b7fd62bd864 100644 --- a/boards/arm/stm32/olimexino-stm32/src/stm32_boot.c +++ b/boards/arm/stm32/olimexino-stm32/src/stm32_boot.c @@ -115,7 +115,7 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) +#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in user- * space but the initialization function must run in kernel space. diff --git a/boards/arm/stm32/omnibusf4/src/Make.defs b/boards/arm/stm32/omnibusf4/src/Make.defs index 9af3a12832e..4bfdbaaf564 100644 --- a/boards/arm/stm32/omnibusf4/src/Make.defs +++ b/boards/arm/stm32/omnibusf4/src/Make.defs @@ -64,7 +64,7 @@ ifeq ($(CONFIG_PWM),y) CSRCS += stm32_pwm.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += stm32_reset.c diff --git a/boards/arm/stm32/omnibusf4/src/omnibusf4.h b/boards/arm/stm32/omnibusf4/src/omnibusf4.h index 2f2045dbf16..a7b897dc22a 100644 --- a/boards/arm/stm32/omnibusf4/src/omnibusf4.h +++ b/boards/arm/stm32/omnibusf4/src/omnibusf4.h @@ -110,7 +110,7 @@ * CONFIG_BOARD_INITIALIZE=y : * Called from board_initialize(). * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : + * CONFIG_BOARD_INITIALIZE=y && CONFIG_BOARDCTL=y : * Called from the NSH library * ****************************************************************************/ diff --git a/boards/arm/stm32/omnibusf4/src/stm32_bringup.c b/boards/arm/stm32/omnibusf4/src/stm32_bringup.c index 8f125e4cc07..020d45b6206 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_bringup.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_bringup.c @@ -145,7 +145,7 @@ static void stm32_i2ctool(void) * 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 * ****************************************************************************/ diff --git a/boards/arm/stm32/photon/src/Make.defs b/boards/arm/stm32/photon/src/Make.defs index 1e4b6237302..f3bd1c4d05b 100644 --- a/boards/arm/stm32/photon/src/Make.defs +++ b/boards/arm/stm32/photon/src/Make.defs @@ -26,7 +26,7 @@ ifeq ($(CONFIG_PHOTON_DFU_BOOTLOADER),y) CSRCS += dfu_signature.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/photon/src/photon.h b/boards/arm/stm32/photon/src/photon.h index 257dde61f35..7993af97a02 100644 --- a/boards/arm/stm32/photon/src/photon.h +++ b/boards/arm/stm32/photon/src/photon.h @@ -94,13 +94,13 @@ * * Description: * Called either by board_initialize() if CONFIG_BOARD_LATE_INITIALIZE or - * by board_app_initialize if CONFIG_LIB_BOARDCTL is selected. This + * by board_app_initialize if CONFIG_BOARDCTL is selected. This * function initializes and configures all on-board features appropriate * for the selected configuration. * ****************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) +#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int stm32_bringup(void); #endif diff --git a/boards/arm/stm32/photon/src/stm32_appinit.c b/boards/arm/stm32/photon/src/stm32_appinit.c index e54abf2cd8c..19878ca6af1 100644 --- a/boards/arm/stm32/photon/src/stm32_appinit.c +++ b/boards/arm/stm32/photon/src/stm32_appinit.c @@ -30,7 +30,7 @@ #include "photon.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 */ diff --git a/boards/arm/stm32/photon/src/stm32_bringup.c b/boards/arm/stm32/photon/src/stm32_bringup.c index 9f10a60f06f..d1093276adb 100644 --- a/boards/arm/stm32/photon/src/stm32_bringup.c +++ b/boards/arm/stm32/photon/src/stm32_bringup.c @@ -65,7 +65,7 @@ * * Description: * Called either by board_initialize() if CONFIG_BOARD_LATE_INITIALIZE or - * by board_app_initialize if CONFIG_LIB_BOARDCTL is selected. + * by board_app_initialize if CONFIG_BOARDCTL is selected. * This function initializes and configures all on-board features * appropriate for the selected configuration. * diff --git a/boards/arm/stm32/shenzhou/src/Make.defs b/boards/arm/stm32/shenzhou/src/Make.defs index bd27dafe09f..d3a175df1d9 100644 --- a/boards/arm/stm32/shenzhou/src/Make.defs +++ b/boards/arm/stm32/shenzhou/src/Make.defs @@ -40,7 +40,7 @@ ifeq ($(CONFIG_STM32_OTGFS),y) CSRCS += stm32_usb.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig b/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig index 623213128af..e450d9be241 100644 --- a/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_CDCACM=y CONFIG_CDCACM_COMPOSITE=y @@ -27,7 +28,6 @@ CONFIG_COMPOSITE_SERIALSTR="12345" CONFIG_COMPOSITE_VENDORID=0x03eb CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y CONFIG_MTD=y diff --git a/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig b/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig index fa8bf046ee7..95f8c262adb 100644 --- a/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig @@ -15,9 +15,9 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y CONFIG_PREALLOC_TIMERS=4 diff --git a/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig b/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig index de20f94af44..3441b64c5fb 100644 --- a/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig @@ -14,11 +14,11 @@ CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DISABLE_MOUNTPOINT=y CONFIG_EXAMPLES_USBSERIAL=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_PL2303=y CONFIG_PL2303_PRODUCTSTR="USBdev Serial" CONFIG_PL2303_RXBUFSIZE=512 diff --git a/boards/arm/stm32/stm3210e-eval/src/Make.defs b/boards/arm/stm32/stm3210e-eval/src/Make.defs index 5412c598d7d..74a533e32e3 100644 --- a/boards/arm/stm32/stm3210e-eval/src/Make.defs +++ b/boards/arm/stm32/stm3210e-eval/src/Make.defs @@ -28,7 +28,7 @@ CSRCS += stm32_deselectnor.c stm32_selectsram.c stm32_deselectsram.c CSRCS += stm32_selectlcd.c stm32_deselectlcd.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/stm3210e-eval/src/stm3210e-eval.h b/boards/arm/stm32/stm3210e-eval/src/stm3210e-eval.h index 15f7fbe1264..6903daf347a 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm3210e-eval.h +++ b/boards/arm/stm32/stm3210e-eval/src/stm3210e-eval.h @@ -173,7 +173,7 @@ extern const uint16_t g_commonconfig[NCOMMON_CONFIG]; * 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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c b/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c index ac137847f55..ef1d138316d 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c @@ -172,7 +172,7 @@ static void stm32_i2ctool(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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_usbmsc.c b/boards/arm/stm32/stm3210e-eval/src/stm32_usbmsc.c index b49064ecb15..0b69a85d78f 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_usbmsc.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_usbmsc.c @@ -72,7 +72,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm3220g-eval/src/Make.defs b/boards/arm/stm32/stm3220g-eval/src/Make.defs index 68c3f4cbd17..bc3ce6a347f 100644 --- a/boards/arm/stm32/stm3220g-eval/src/Make.defs +++ b/boards/arm/stm32/stm3220g-eval/src/Make.defs @@ -52,7 +52,7 @@ ifeq ($(CONFIG_CAN),y) CSRCS += stm32_can.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig index a04dd951bd6..fb3ec1e4ae9 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig @@ -21,6 +21,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_ARM_MPU=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y CONFIG_FAT_LCNAMES=y @@ -37,7 +38,6 @@ CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_NOGETRUN=y CONFIG_LIBC_USRWORK=y -CONFIG_LIB_BOARDCTL=y CONFIG_MM_REGIONS=2 CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NUTTX_USERSPACE=0x08040000 diff --git a/boards/arm/stm32/stm3240g-eval/src/Make.defs b/boards/arm/stm32/stm3240g-eval/src/Make.defs index d752b848821..cfc00e8e7c4 100644 --- a/boards/arm/stm32/stm3240g-eval/src/Make.defs +++ b/boards/arm/stm32/stm3240g-eval/src/Make.defs @@ -53,7 +53,7 @@ ifeq ($(CONFIG_CAN),y) CSRCS += stm32_can.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/stm3240g-eval/src/stm3240g-eval.h b/boards/arm/stm32/stm3240g-eval/src/stm3240g-eval.h index d241100395f..274bd07c210 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm3240g-eval.h +++ b/boards/arm/stm32/stm3240g-eval/src/stm3240g-eval.h @@ -223,7 +223,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c b/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c index 68a5336027d..345e8b509d3 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c @@ -206,7 +206,7 @@ static void stm32_i2ctool(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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32_tiny/src/Make.defs b/boards/arm/stm32/stm32_tiny/src/Make.defs index ee4bd50f21d..ec592b61c6a 100644 --- a/boards/arm/stm32/stm32_tiny/src/Make.defs +++ b/boards/arm/stm32/stm32_tiny/src/Make.defs @@ -26,7 +26,7 @@ ifeq ($(CONFIG_PWM),y) CSRCS += stm32_pwm.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/stm32f103-minimum/src/Make.defs b/boards/arm/stm32/stm32f103-minimum/src/Make.defs index 92a61e2f48f..10587b44bcd 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/Make.defs +++ b/boards/arm/stm32/stm32f103-minimum/src/Make.defs @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = stm32_boot.c stm32_bringup.c stm32_spi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += stm32_reset.c diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c index 590f3f40ac1..ccec2ef26b9 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c @@ -94,7 +94,7 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#ifndef CONFIG_LIB_BOARDCTL +#ifndef CONFIG_BOARDCTL /* Perform board initialization here instead of from the * board_app_initialize(). */ diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c index 65f51fe1bd6..15983fad193 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c @@ -193,7 +193,7 @@ static int g_sensor_devno; * 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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h b/boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h index 27db124d5c2..ba05cbdbc61 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h @@ -211,7 +211,7 @@ * Description: * Perform architecture specific initialization * - * CONFIG_LIB_BOARDCTL=y: + * CONFIG_BOARDCTL=y: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherwise, assumed to be called from some other application. diff --git a/boards/arm/stm32/stm32f334-disco/src/Make.defs b/boards/arm/stm32/stm32f334-disco/src/Make.defs index 7ae87bea9f5..8b8f06bb941 100644 --- a/boards/arm/stm32/stm32f334-disco/src/Make.defs +++ b/boards/arm/stm32/stm32f334-disco/src/Make.defs @@ -26,7 +26,7 @@ ifeq ($(CONFIG_ARCH_LEDS),y) CSRCS += stm32_autoleds.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/stm32f3discovery/src/Make.defs b/boards/arm/stm32/stm32f3discovery/src/Make.defs index d8df63d938a..12ecf9516fa 100644 --- a/boards/arm/stm32/stm32f3discovery/src/Make.defs +++ b/boards/arm/stm32/stm32f3discovery/src/Make.defs @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = stm32_boot.c stm32_bringup.c stm32_spi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c b/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c index bb120cf9c40..89be1eb2f55 100644 --- a/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c +++ b/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c @@ -96,7 +96,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32f3discovery.h b/boards/arm/stm32/stm32f3discovery/src/stm32f3discovery.h index 1a13b3e0cfa..63cf065feef 100644 --- a/boards/arm/stm32/stm32f3discovery/src/stm32f3discovery.h +++ b/boards/arm/stm32/stm32f3discovery/src/stm32f3discovery.h @@ -142,7 +142,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32f411-minimum/src/stm32_bringup.c b/boards/arm/stm32/stm32f411-minimum/src/stm32_bringup.c index d3af59f13ab..a73416e280a 100644 --- a/boards/arm/stm32/stm32f411-minimum/src/stm32_bringup.c +++ b/boards/arm/stm32/stm32f411-minimum/src/stm32_bringup.c @@ -49,7 +49,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32f411-minimum/src/stm32f411-minimum.h b/boards/arm/stm32/stm32f411-minimum/src/stm32f411-minimum.h index 824c26ed9f3..3406d8da1dd 100644 --- a/boards/arm/stm32/stm32f411-minimum/src/stm32f411-minimum.h +++ b/boards/arm/stm32/stm32f411-minimum/src/stm32f411-minimum.h @@ -160,7 +160,7 @@ int stm32_usbhost_initialize(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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32f411e-disco/src/stm32_bringup.c b/boards/arm/stm32/stm32f411e-disco/src/stm32_bringup.c index a880cb1a543..7aefa12e233 100644 --- a/boards/arm/stm32/stm32f411e-disco/src/stm32_bringup.c +++ b/boards/arm/stm32/stm32f411e-disco/src/stm32_bringup.c @@ -49,7 +49,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32f411e-disco/src/stm32f411e-disco.h b/boards/arm/stm32/stm32f411e-disco/src/stm32f411e-disco.h index f889feb3fa5..f58d84d8a3c 100644 --- a/boards/arm/stm32/stm32f411e-disco/src/stm32f411e-disco.h +++ b/boards/arm/stm32/stm32f411e-disco/src/stm32f411e-disco.h @@ -181,7 +181,7 @@ int stm32_usbhost_initialize(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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32f429i-disco/README.txt b/boards/arm/stm32/stm32f429i-disco/README.txt index 8e6c8df1903..260b1729c99 100644 --- a/boards/arm/stm32/stm32f429i-disco/README.txt +++ b/boards/arm/stm32/stm32f429i-disco/README.txt @@ -849,7 +849,7 @@ Where is one of the following: CONFIG_FS_FAT=y : Needed by the USB host mass storage class. Board Selection -> - CONFIG_LIB_BOARDCTL=y : Needed for CONFIG_NSH_ARCHINIT + CONFIG_BOARDCTL=y : Needed for CONFIG_NSH_ARCHINIT Application Configuration -> NSH Library CONFIG_NSH_ARCHINIT=y : Architecture specific USB initialization diff --git a/boards/arm/stm32/stm32f429i-disco/src/Make.defs b/boards/arm/stm32/stm32f429i-disco/src/Make.defs index f8686c64081..9d15d35b6c4 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/Make.defs +++ b/boards/arm/stm32/stm32f429i-disco/src/Make.defs @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_appinit.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_appinit.c index 90cbde14de9..3c453165b6e 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_appinit.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_appinit.c @@ -30,7 +30,7 @@ #include "stm32f429i-disco.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Public Functions @@ -74,4 +74,4 @@ int board_app_initialize(uintptr_t arg) #endif } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c index 31d1e1fc382..8c74e25f441 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c @@ -83,7 +83,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h b/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h index 5647acb2cac..a89185e2464 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h @@ -196,7 +196,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32f4discovery/README.txt b/boards/arm/stm32/stm32f4discovery/README.txt index b5841775bed..ddb99c2035a 100644 --- a/boards/arm/stm32/stm32f4discovery/README.txt +++ b/boards/arm/stm32/stm32f4discovery/README.txt @@ -1928,7 +1928,7 @@ Configuration Sub-directories CONFIG_FS_FAT=y : Needed by the USB host mass storage class. Board Selection -> - CONFIG_LIB_BOARDCTL=y : Needed for CONFIG_NSH_ARCHINIT + CONFIG_BOARDCTL=y : Needed for CONFIG_NSH_ARCHINIT Application Configuration -> NSH Library CONFIG_NSH_ARCHINIT=y : Architecture specific USB initialization diff --git a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig index 76f5d26d488..4d2d6dea007 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_BINFMT_CONSTRUCTORS=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 @@ -26,7 +27,6 @@ CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y -CONFIG_LIB_BOARDCTL=y CONFIG_MM_REGIONS=2 CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PREALLOC_TIMERS=4 diff --git a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig index 7fc316bf3c3..0376d0a13f1 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y CONFIG_BINFMT_CONSTRUCTORS=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_APP_SYMTAB=y CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LOOPSPERMSEC=16717 @@ -28,7 +29,6 @@ CONFIG_HAVE_CXX=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIB_BOARDCTL=y CONFIG_MM_REGIONS=2 CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PREALLOC_TIMERS=4 diff --git a/boards/arm/stm32/stm32f4discovery/src/Make.defs b/boards/arm/stm32/stm32f4discovery/src/Make.defs index fae7279db13..9b118e1a698 100644 --- a/boards/arm/stm32/stm32f4discovery/src/Make.defs +++ b/boards/arm/stm32/stm32f4discovery/src/Make.defs @@ -96,7 +96,7 @@ ifeq ($(CONFIG_PWM),y) CSRCS += stm32_pwm.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += stm32_reset.c diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c b/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c index cafe505c0cb..3d4c47b7f5b 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c @@ -182,7 +182,7 @@ static void stm32_i2ctool(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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h b/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h index 417fd02167e..8bd7100f6c3 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h +++ b/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h @@ -405,7 +405,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32ldiscovery/src/Make.defs b/boards/arm/stm32/stm32ldiscovery/src/Make.defs index 71fe3cde3f4..ef39d0e1448 100644 --- a/boards/arm/stm32/stm32ldiscovery/src/Make.defs +++ b/boards/arm/stm32/stm32ldiscovery/src/Make.defs @@ -40,7 +40,7 @@ ifeq ($(CONFIG_PWM),y) CSRCS += stm32_pwm.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_bringup.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_bringup.c index 3de08262b94..168002d85e9 100644 --- a/boards/arm/stm32/stm32ldiscovery/src/stm32_bringup.c +++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32ldiscovery.h b/boards/arm/stm32/stm32ldiscovery/src/stm32ldiscovery.h index 6d2ec4f4d67..74cd7ae4971 100644 --- a/boards/arm/stm32/stm32ldiscovery/src/stm32ldiscovery.h +++ b/boards/arm/stm32/stm32ldiscovery/src/stm32ldiscovery.h @@ -235,7 +235,7 @@ * Description: * Perform architecture specific initialization * - * CONFIG_LIB_BOARDCTL=y: + * CONFIG_BOARDCTL=y: * If CONFIG_NSH_ARCHINITIALIZE=y: * Called from the NSH library (or other application) * Otherwise, assumed to be called from some other application. diff --git a/boards/arm/stm32/stm32vldiscovery/src/Make.defs b/boards/arm/stm32/stm32vldiscovery/src/Make.defs index 827a6bcaae0..83f1e154188 100644 --- a/boards/arm/stm32/stm32vldiscovery/src/Make.defs +++ b/boards/arm/stm32/stm32vldiscovery/src/Make.defs @@ -38,7 +38,7 @@ include $(TOPDIR)/Make.defs CSRCS = stm32_boot.c stm32_bringup.c stm32_leds.c stm32_buttons.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/stm32vldiscovery/src/stm32_bringup.c b/boards/arm/stm32/stm32vldiscovery/src/stm32_bringup.c index b018ecb8fb3..ff53631f240 100644 --- a/boards/arm/stm32/stm32vldiscovery/src/stm32_bringup.c +++ b/boards/arm/stm32/stm32vldiscovery/src/stm32_bringup.c @@ -54,7 +54,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 * ****************************************************************************/ diff --git a/boards/arm/stm32/stm32vldiscovery/src/stm32vldiscovery.h b/boards/arm/stm32/stm32vldiscovery/src/stm32vldiscovery.h index cbeed782458..b392e8f9852 100644 --- a/boards/arm/stm32/stm32vldiscovery/src/stm32vldiscovery.h +++ b/boards/arm/stm32/stm32vldiscovery/src/stm32vldiscovery.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 * ****************************************************************************/ diff --git a/boards/arm/stm32/viewtool-stm32f107/src/Make.defs b/boards/arm/stm32/viewtool-stm32f107/src/Make.defs index 4dff107f84c..9590568f574 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/Make.defs +++ b/boards/arm/stm32/viewtool-stm32f107/src/Make.defs @@ -46,7 +46,7 @@ ifeq ($(CONFIG_LCD_SSD1289),y) # F103 CSRCS += stm32_ssd1289.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c index f76db4d2431..0b0a853f5c4 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c +++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c @@ -118,7 +118,7 @@ static int rtc_driver_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 * ****************************************************************************/ diff --git a/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h b/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h index c03579e0c17..9c83c4b20e6 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h +++ b/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h @@ -362,7 +362,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Makefile b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Makefile index 9d8dab60b56..0f20f013967 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Makefile +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Makefile @@ -36,7 +36,7 @@ ifeq ($(CONFIG_STM32F0L0G0_SPI),y) CSRCS += stm32_spi.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/b-l072z-lrwan1.h b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/b-l072z-lrwan1.h index a58dd6a0e06..473cf70a1fd 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/b-l072z-lrwan1.h +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/b-l072z-lrwan1.h @@ -122,7 +122,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c index cc5c828d67b..75fc1d9740e 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c @@ -120,7 +120,7 @@ static void stm32_i2ctool(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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt b/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt index 413902e7e59..d4ec1b91f2a 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt @@ -312,7 +312,7 @@ Configurations CONFIG_FS_PROCFS=y CONFIG_NSH_PROC_MOUNTPOINT="/proc" - CONFIG_LIB_BOARDCTL=y + CONFIG_BOARDCTL=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/Makefile index b6dc96afd61..f2a5b8753d6 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/Makefile +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/Makefile @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/nucleo-f072rb.h b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/nucleo-f072rb.h index c4b0017c4f2..a3a43afe801 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/nucleo-f072rb.h +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/nucleo-f072rb.h @@ -99,7 +99,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c index 7d1508f1350..ab32f3c678a 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt b/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt index df31b1ce709..4284ea7d5a4 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt @@ -298,7 +298,7 @@ Configurations CONFIG_FS_PROCFS=y CONFIG_NSH_PROC_MOUNTPOINT="/proc" - CONFIG_LIB_BOARDCTL=y + CONFIG_BOARDCTL=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/Makefile index f9ffd9184e1..0b841f82db3 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/Makefile +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/Makefile @@ -36,7 +36,7 @@ ifeq ($(CONFIG_STM32F0L0G0_SPI),y) CSRCS += stm32_spi.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/nucleo-f091rc.h b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/nucleo-f091rc.h index 6da1198bef0..8d0da56d3db 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/nucleo-f091rc.h +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/nucleo-f091rc.h @@ -111,7 +111,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_bringup.c index 58685da10c9..df10d9584a3 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_bringup.c +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_bringup.c @@ -44,7 +44,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/Makefile index 45bc6e162d0..a7a93c155b4 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/Makefile +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/Makefile @@ -54,7 +54,7 @@ ifeq ($(CONFIG_DEV_GPIO),y) CSRCS += stm32_gpio.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h index 2c004c42666..2f1d79763a7 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h @@ -172,7 +172,7 @@ int stm32_timer_driver_setup(FAR const char *devpath, int timer); * 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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_bringup.c index 023b6ce97ba..cf199b706ce 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_bringup.c +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_bringup.c @@ -143,7 +143,7 @@ static void stm32_i2ctool(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 * && CONFIG_NSH_ARCHINIT: * Called from the NSH library * diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/Makefile index b6ffbdaaddb..80efb272d99 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/Makefile +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/Makefile @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/nucleo-g071rb.h b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/nucleo-g071rb.h index 0809a151443..dc90db16a06 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/nucleo-g071rb.h +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/nucleo-g071rb.h @@ -91,7 +91,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_bringup.c index 425fc42dc2b..e1a4a6f0616 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_bringup.c +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_bringup.c @@ -61,7 +61,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/Makefile index 983e29f2e08..d5b7529c301 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/Makefile +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/Makefile @@ -36,7 +36,7 @@ ifeq ($(CONFIG_STM32F0L0G0_SPI),y) CSRCS += stm32_spi.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h index 36e5e2ca6ac..fbe3a161909 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h @@ -125,7 +125,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_bringup.c index 21fdc77b03a..b67acf6c5dd 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_bringup.c +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_bringup.c @@ -61,7 +61,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile index a31910389d1..7c1d8ee7d8d 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile @@ -44,7 +44,7 @@ ifeq ($(CONFIG_SENSORS_QENCODER),y) CSRCS += stm32_qencoder.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_bringup.c index cad3c4fd92d..538ac1bf8ea 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_bringup.c +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_bringup.c @@ -43,7 +43,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32f051-discovery.h b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32f051-discovery.h index b0ec7084c16..c03b193c383 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32f051-discovery.h +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32f051-discovery.h @@ -119,7 +119,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/Makefile b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/Makefile index 468f0dbaec3..888aed933bb 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/Makefile +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/Makefile @@ -44,7 +44,7 @@ ifeq ($(CONFIG_SENSORS_QENCODER),y) CSRCS += stm32_qencoder.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_bringup.c index 08d2f4b809b..927432a9723 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_bringup.c +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_bringup.c @@ -43,7 +43,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32f072-discovery.h b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32f072-discovery.h index ed59b8eb043..6625409e3a6 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32f072-discovery.h +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32f072-discovery.h @@ -123,7 +123,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f7/nucleo-144/README.txt b/boards/arm/stm32f7/nucleo-144/README.txt index 4ee4da3e5fa..3f2412100a4 100644 --- a/boards/arm/stm32f7/nucleo-144/README.txt +++ b/boards/arm/stm32f7/nucleo-144/README.txt @@ -495,7 +495,7 @@ SPI Test +CONFIG_NUCLEO_SPI3_TEST_BITS=8 +CONFIG_NUCLEO_SPI3_TEST_MODE3=y - +CONFIG_LIB_BOARDCTL=y + +CONFIG_BOARDCTL=y +CONFIG_NSH_ARCHINIT=y Configurations diff --git a/boards/arm/stm32f7/nucleo-144/src/Makefile b/boards/arm/stm32f7/nucleo-144/src/Makefile index 2bb346d01cd..da813a67c07 100644 --- a/boards/arm/stm32f7/nucleo-144/src/Makefile +++ b/boards/arm/stm32f7/nucleo-144/src/Makefile @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c b/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c index 3a16c763040..4364c5e4ea9 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c @@ -83,7 +83,7 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) +#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in * user-space but the initialization function must run in kernel space. diff --git a/boards/arm/stm32f7/stm32f746-ws/src/Makefile b/boards/arm/stm32f7/stm32f746-ws/src/Makefile index 463753b1603..0c6ff396fe6 100644 --- a/boards/arm/stm32f7/stm32f746-ws/src/Makefile +++ b/boards/arm/stm32f7/stm32f746-ws/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = stm32_boot.c stm32_spi.c stm32_dma_alloc.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c index 0aaed5f38c6..9d0eb6a4382 100644 --- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c +++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c @@ -79,7 +79,7 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) +#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in * user-space but the initialization function must run in kernel space. diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/Makefile b/boards/arm/stm32f7/stm32f746g-disco/src/Makefile index 296c50720c4..cf5120f6ea9 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/Makefile +++ b/boards/arm/stm32f7/stm32f746g-disco/src/Makefile @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_appinitialize.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_appinitialize.c index dd70c64525d..29f88446abc 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_appinitialize.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_appinitialize.c @@ -27,7 +27,7 @@ #include "stm32f746g-disco.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Public Functions diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c index f4f27890008..c4857b1cc52 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_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 * ****************************************************************************/ diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h b/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h index b04036d9c34..aa6b18acc92 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h @@ -122,7 +122,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/Makefile b/boards/arm/stm32f7/stm32f769i-disco/src/Makefile index 60d280b5f45..7df48a10a90 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/Makefile +++ b/boards/arm/stm32f7/stm32f769i-disco/src/Makefile @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_bringup.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_bringup.c index e94ae21c897..925902786a0 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_bringup.c +++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_bringup.c @@ -47,7 +47,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 * ****************************************************************************/ diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h b/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h index 797b87602c0..d3ee740c782 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h +++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h @@ -108,7 +108,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 * ****************************************************************************/ diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/Makefile b/boards/arm/stm32h7/nucleo-h743zi/src/Makefile index fedb48e839f..674d5b2ede8 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/Makefile +++ b/boards/arm/stm32h7/nucleo-h743zi/src/Makefile @@ -72,7 +72,7 @@ ifeq ($(CONFIG_LCD_SSD1306),y) CSRCS += stm32_ssd1306.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h b/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h index ff0a057fa6e..dd380c86837 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h +++ b/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h @@ -211,7 +211,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 * ****************************************************************************/ diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c index ff12e3be2a1..c2335a5fec1 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c @@ -86,7 +86,7 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) +#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) /* Perform board bring-up here instead of from the * board_app_initialize(). */ diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_bringup.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_bringup.c index 1bffd62c541..4f16cbf2ead 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_bringup.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_bringup.c @@ -130,7 +130,7 @@ static void stm32_i2ctool(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 && * CONFIG_NSH_ARCHINIT: * Called from the NSH library * diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/Makefile b/boards/arm/stm32h7/nucleo-h743zi2/src/Makefile index 408f325a358..609fd1701f3 100644 --- a/boards/arm/stm32h7/nucleo-h743zi2/src/Makefile +++ b/boards/arm/stm32h7/nucleo-h743zi2/src/Makefile @@ -32,7 +32,7 @@ ifeq ($(CONFIG_STM32H7_OTGFS),y) CSRCS += stm32_usb.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h b/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h index 28ea554d8f3..a93dbb745b4 100644 --- a/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h +++ b/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h @@ -114,7 +114,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 * ****************************************************************************/ diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c index 1bae26fb0a9..8d0ba135424 100644 --- a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c +++ b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c @@ -80,7 +80,7 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) +#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) /* Perform board bring-up here instead of from the * board_app_initialize(). */ diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_bringup.c b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_bringup.c index 5d81cc4d04d..7a59423a5a4 100644 --- a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_bringup.c +++ b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_bringup.c @@ -56,7 +56,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 && * CONFIG_NSH_ARCHINIT: * Called from the NSH library * diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/Makefile b/boards/arm/stm32h7/stm32h747i-disco/src/Makefile index 7f7beed0897..76ad1323cd1 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/Makefile +++ b/boards/arm/stm32h7/stm32h747i-disco/src/Makefile @@ -48,7 +48,7 @@ ifeq ($(CONFIG_BOARDCTL_UNIQUEID),y) CSRCS += stm32_uid.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c index 19d57c21bb6..02ca7ed5848 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c @@ -86,7 +86,7 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) +#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) /* Perform board bring-up here instead of from the * board_app_initialize(). */ diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_bringup.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_bringup.c index 95aeb13a329..f33e03ef08b 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_bringup.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_bringup.c @@ -116,7 +116,7 @@ static void stm32_i2ctool(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 && * CONFIG_NSH_ARCHINIT: * Called from the NSH library * diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32h747i-disco.h b/boards/arm/stm32h7/stm32h747i-disco/src/stm32h747i-disco.h index a57364a886b..dfa8a4d2204 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32h747i-disco.h +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32h747i-disco.h @@ -115,7 +115,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 * ****************************************************************************/ diff --git a/boards/arm/stm32l4/b-l475e-iot01a/src/Makefile b/boards/arm/stm32l4/b-l475e-iot01a/src/Makefile index 3876008b68e..62a122b85f8 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/src/Makefile +++ b/boards/arm/stm32l4/b-l475e-iot01a/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = stm32_boot.c stm32_bringup.c stm32_spi.c stm32_timer.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32l4/b-l475e-iot01a/src/b-l475e-iot01a.h b/boards/arm/stm32l4/b-l475e-iot01a/src/b-l475e-iot01a.h index e86970003a0..1ff5f5189b1 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/src/b-l475e-iot01a.h +++ b/boards/arm/stm32l4/b-l475e-iot01a/src/b-l475e-iot01a.h @@ -150,13 +150,13 @@ * * Description: * Called either by board_initialize() if CONFIG_BOARD_LATE_INITIALIZE or - * by board_app_initialize if CONFIG_LIB_BOARDCTL is selected. This + * by board_app_initialize if CONFIG_BOARDCTL is selected. This * function initializes and configures all on-board features appropriate * for the selected configuration. * ****************************************************************************/ -#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) +#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int stm32l4_bringup(void); #endif diff --git a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_appinit.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_appinit.c index 11e4029dd0f..a17654baf13 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_appinit.c +++ b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_appinit.c @@ -30,7 +30,7 @@ #include "b-l475e-iot01a.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 */ diff --git a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c index a6cb501be60..3b42ce70dde 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c +++ b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c @@ -66,7 +66,7 @@ * * Description: * Called either by board_initialize() if CONFIG_BOARD_LATE_INITIALIZE or - * by board_app_initialize if CONFIG_LIB_BOARDCTL is selected. This + * by board_app_initialize if CONFIG_BOARDCTL is selected. This * function initializes and configures all on-board features appropriate * for the selected configuration. * diff --git a/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig b/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig index fb55a2b3fdc..83a4d06242e 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig +++ b/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RAMVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_MKRD=y CONFIG_BOARD_LOOPSPERMSEC=8499 CONFIG_BUILTIN=y @@ -24,7 +25,6 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBM=y -CONFIG_LIB_BOARDCTL=y CONFIG_MM_REGIONS=2 CONFIG_NUCLEOL432KC_SPWM=y CONFIG_NUCLEOL432KC_SPWM_PWM_FREQ=200000 diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/Makefile b/boards/arm/stm32l4/nucleo-l432kc/src/Makefile index 962340cb532..a06236118b0 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/Makefile +++ b/boards/arm/stm32l4/nucleo-l432kc/src/Makefile @@ -72,7 +72,7 @@ ifeq ($(CONFIG_TIMER),y) CSRCS += stm32_timer.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32l4/nucleo-l452re/src/Makefile b/boards/arm/stm32l4/nucleo-l452re/src/Makefile index fc6fdcd884b..236b7edc5f1 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/Makefile +++ b/boards/arm/stm32l4/nucleo-l452re/src/Makefile @@ -40,7 +40,7 @@ ifeq ($(CONFIG_DAC),y) CSRCS += stm32_dac.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32l4/nucleo-l452re/src/nucleo-l452re.h b/boards/arm/stm32l4/nucleo-l452re/src/nucleo-l452re.h index c9d2e42de24..82ee078190e 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/nucleo-l452re.h +++ b/boards/arm/stm32l4/nucleo-l452re/src/nucleo-l452re.h @@ -156,7 +156,7 @@ int stm32l4_dac_setup(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 * ****************************************************************************/ diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c index aa25c3c081a..2541ac8d667 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c +++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c @@ -60,7 +60,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 * ****************************************************************************/ diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/Makefile b/boards/arm/stm32l4/nucleo-l476rg/src/Makefile index 0014486d7c7..7ada3fd7314 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/Makefile +++ b/boards/arm/stm32l4/nucleo-l476rg/src/Makefile @@ -93,7 +93,7 @@ ifeq ($(CONFIG_TIMER),y) CSRCS += stm32_timer.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/Makefile b/boards/arm/stm32l4/nucleo-l496zg/src/Makefile index e47755b4a9d..558da628cbc 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/src/Makefile +++ b/boards/arm/stm32l4/nucleo-l496zg/src/Makefile @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c index 2c7f56d4bc2..8800a5b43b2 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c +++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c @@ -83,7 +83,7 @@ void stm32l4_board_initialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL) +#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) /* Perform NSH initialization here instead of from the NSH. This * alternative NSH initialization is necessary when NSH is ran in * user-space but the initialization function must run in kernel space. diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/Makefile b/boards/arm/stm32l4/stm32l476-mdk/src/Makefile index ec336c11fa8..87fcfb59412 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/Makefile +++ b/boards/arm/stm32l4/stm32l476-mdk/src/Makefile @@ -49,7 +49,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_appinit.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_appinit.c index 57232d61d25..dcbbcde5290 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_appinit.c +++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_appinit.c @@ -28,7 +28,7 @@ #include "stm32l476-mdk.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 */ diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_bringup.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_bringup.c index 7e4fee97e4d..b13b7cafb9b 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_bringup.c +++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_bringup.c @@ -86,7 +86,7 @@ * ****************************************************************************/ -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL int board_app_initialize(uintptr_t arg) { #ifdef HAVE_RTC_DRIVER @@ -150,7 +150,7 @@ int board_app_initialize(uintptr_t arg) UNUSED(ret); return OK; } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ #if defined(CONFIG_BOARDCTL_UNIQUEID) int board_uniqueid(uint8_t *uniqueid) diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h b/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h index 4085c6187e9..402792028e8 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h +++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h @@ -156,7 +156,7 @@ extern struct spi_dev_s *g_spi2; * 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 * ****************************************************************************/ diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/Makefile b/boards/arm/stm32l4/stm32l476vg-disco/src/Makefile index c6329079bbe..be88bbcbea0 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/Makefile +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/Makefile @@ -59,7 +59,7 @@ ifeq ($(CONFIG_ADC),y) #CSRCS += stm32_adc.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c index e6b14ba9a19..dc92dfe3397 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c @@ -106,7 +106,7 @@ FAR struct mtd_dev_s *g_mtd_fs; * ****************************************************************************/ -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL int board_app_initialize(uintptr_t arg) { #ifdef HAVE_RTC_DRIVER @@ -295,7 +295,7 @@ int board_app_initialize(uintptr_t arg) return ret; } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ #ifdef CONFIG_BOARDCTL_IOCTL int board_ioctl(unsigned int cmd, uintptr_t arg) diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/Makefile b/boards/arm/stm32l4/stm32l4r9ai-disco/src/Makefile index 590a82134a6..cc03a827933 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/Makefile +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/Makefile @@ -72,7 +72,7 @@ ifeq ($(CONFIG_STM32L4_OTGFS),y) CSRCS += stm32_usb.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c index 9455a1c230d..b7ace74daf9 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c @@ -100,7 +100,7 @@ static struct i2c_master_s *g_i2c3; * ****************************************************************************/ -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL int board_app_initialize(uintptr_t arg) { #ifdef HAVE_RTC_DRIVER @@ -210,7 +210,7 @@ int board_app_initialize(uintptr_t arg) return ret; } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ #ifdef CONFIG_BOARDCTL_IOCTL int board_ioctl(unsigned int cmd, uintptr_t arg) diff --git a/boards/arm/stm32l5/nucleo-l552ze/src/Makefile b/boards/arm/stm32l5/nucleo-l552ze/src/Makefile index 68385375526..d36d70faa8f 100644 --- a/boards/arm/stm32l5/nucleo-l552ze/src/Makefile +++ b/boards/arm/stm32l5/nucleo-l552ze/src/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32l5/nucleo-l552ze/src/nucleo-l552ze.h b/boards/arm/stm32l5/nucleo-l552ze/src/nucleo-l552ze.h index a91b8ede552..53e480c867d 100644 --- a/boards/arm/stm32l5/nucleo-l552ze/src/nucleo-l552ze.h +++ b/boards/arm/stm32l5/nucleo-l552ze/src/nucleo-l552ze.h @@ -109,7 +109,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 * ****************************************************************************/ diff --git a/boards/arm/stm32l5/nucleo-l552ze/src/stm32_bringup.c b/boards/arm/stm32l5/nucleo-l552ze/src/stm32_bringup.c index 7120a372881..24e84fe2e08 100644 --- a/boards/arm/stm32l5/nucleo-l552ze/src/stm32_bringup.c +++ b/boards/arm/stm32l5/nucleo-l552ze/src/stm32_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 * ****************************************************************************/ diff --git a/boards/arm/stm32l5/stm32l562e-dk/src/Makefile b/boards/arm/stm32l5/stm32l562e-dk/src/Makefile index 2dfd9230516..f85d33e4e58 100644 --- a/boards/arm/stm32l5/stm32l562e-dk/src/Makefile +++ b/boards/arm/stm32l5/stm32l562e-dk/src/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += stm32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinit.c endif diff --git a/boards/arm/stm32l5/stm32l562e-dk/src/stm32_bringup.c b/boards/arm/stm32l5/stm32l562e-dk/src/stm32_bringup.c index 9012b185360..efb855d8de4 100644 --- a/boards/arm/stm32l5/stm32l562e-dk/src/stm32_bringup.c +++ b/boards/arm/stm32l5/stm32l562e-dk/src/stm32_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 * ****************************************************************************/ diff --git a/boards/arm/stm32l5/stm32l562e-dk/src/stm32l562e-dk.h b/boards/arm/stm32l5/stm32l562e-dk/src/stm32l562e-dk.h index 23e30aaa98a..583d96ba114 100644 --- a/boards/arm/stm32l5/stm32l562e-dk/src/stm32l562e-dk.h +++ b/boards/arm/stm32l5/stm32l562e-dk/src/stm32l562e-dk.h @@ -106,7 +106,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 * ****************************************************************************/ diff --git a/boards/arm/str71x/olimex-strp711/src/Makefile b/boards/arm/str71x/olimex-strp711/src/Makefile index 717113dfa17..0caf1821e25 100644 --- a/boards/arm/str71x/olimex-strp711/src/Makefile +++ b/boards/arm/str71x/olimex-strp711/src/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/Make.defs CSRCS = str71_spi.c str71_leds.c str71_buttons.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += str71_appinit.c endif ifeq ($(CONFIG_ENC28J60),y) diff --git a/boards/arm/tiva/dk-tm4c129x/src/Makefile b/boards/arm/tiva/dk-tm4c129x/src/Makefile index 8259a3cefa6..e269a3d9207 100644 --- a/boards/arm/tiva/dk-tm4c129x/src/Makefile +++ b/boards/arm/tiva/dk-tm4c129x/src/Makefile @@ -40,7 +40,7 @@ ifeq ($(CONFIG_DK_TM4C129X_TIMER),y) CSRCS += tm4c_timer.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += tm4c_appinit.c endif diff --git a/boards/arm/tiva/eagle100/configs/nxflat/defconfig b/boards/arm/tiva/eagle100/configs/nxflat/defconfig index c1680d81fe3..0618569dbc7 100644 --- a/boards/arm/tiva/eagle100/configs/nxflat/defconfig +++ b/boards/arm/tiva/eagle100/configs/nxflat/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_CONSOLE_SYSLOG=y @@ -20,7 +21,6 @@ CONFIG_DISABLE_ENVIRON=y CONFIG_EXAMPLES_NXFLAT=y CONFIG_FS_ROMFS=y CONFIG_LIBM=y -CONFIG_LIB_BOARDCTL=y CONFIG_NXFLAT=y CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=65536 diff --git a/boards/arm/tiva/eagle100/src/Makefile b/boards/arm/tiva/eagle100/src/Makefile index 58803feeb4b..8b11940b29a 100644 --- a/boards/arm/tiva/eagle100/src/Makefile +++ b/boards/arm/tiva/eagle100/src/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/Make.defs CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lm_appinit.c endif diff --git a/boards/arm/tiva/ekk-lm3s9b96/src/Makefile b/boards/arm/tiva/ekk-lm3s9b96/src/Makefile index ac7fd494716..8140a55ddbf 100644 --- a/boards/arm/tiva/ekk-lm3s9b96/src/Makefile +++ b/boards/arm/tiva/ekk-lm3s9b96/src/Makefile @@ -37,7 +37,7 @@ include $(TOPDIR)/Make.defs CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lm_appinit.c endif diff --git a/boards/arm/tiva/launchxl-cc1310/src/Makefile b/boards/arm/tiva/launchxl-cc1310/src/Makefile index 388d3943f53..0d4fbe28e70 100644 --- a/boards/arm/tiva/launchxl-cc1310/src/Makefile +++ b/boards/arm/tiva/launchxl-cc1310/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = cc1310_boot.c cc1310_pinconfig.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += cc1310_appinit.c cc1310_bringup.c else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += cc1310_bringup.c diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_appinit.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_appinit.c index f8e02a2eb9a..c29e6af1762 100644 --- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_appinit.c +++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_appinit.c @@ -30,7 +30,7 @@ #include "launchxl-cc1310.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 */ diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_bringup.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_bringup.c index e0a8bdf74a4..2becfe2a632 100644 --- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_bringup.c +++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_bringup.c @@ -49,7 +49,7 @@ * from board_late_initialize(). * * If CONFIG_BOARD_LATE_INITIALIZE is not selected, - * but CONFIG_LIB_BOARDCTL=y + * but CONFIG_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/boards/arm/tiva/launchxl-cc1310/src/launchxl-cc1310.h b/boards/arm/tiva/launchxl-cc1310/src/launchxl-cc1310.h index 91d45738c63..ef0288019f6 100644 --- a/boards/arm/tiva/launchxl-cc1310/src/launchxl-cc1310.h +++ b/boards/arm/tiva/launchxl-cc1310/src/launchxl-cc1310.h @@ -79,7 +79,7 @@ extern const struct cc13xx_pinconfig_s g_gpio_sw2; * from board_late_initialize(). * * If CONFIG_BOARD_LATE_INITIALIZE is not selected, - * but CONFIG_LIB_BOARDCTL=y + * but CONFIG_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/Makefile b/boards/arm/tiva/launchxl-cc1312r1/src/Makefile index 3ae81f22378..4a4dc259222 100644 --- a/boards/arm/tiva/launchxl-cc1312r1/src/Makefile +++ b/boards/arm/tiva/launchxl-cc1312r1/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = cc1312_boot.c cc1312_pinconfig.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += cc1312_appinit.c cc1312_bringup.c else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += cc1312_bringup.c diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_appinit.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_appinit.c index 4f679206eaa..6e8ef178530 100644 --- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_appinit.c +++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_appinit.c @@ -30,7 +30,7 @@ #include "launchxl-cc1312r1.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 */ diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_bringup.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_bringup.c index 49f4238ed06..cfc25182ff7 100644 --- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_bringup.c +++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_bringup.c @@ -49,7 +49,7 @@ * from board_late_initialize(). * * If CONFIG_BOARD_LATE_INITIALIZE is not selected, - * but CONFIG_LIB_BOARDCTL=y + * but CONFIG_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/launchxl-cc1312r1.h b/boards/arm/tiva/launchxl-cc1312r1/src/launchxl-cc1312r1.h index 1d397a872fd..ea445e70afe 100644 --- a/boards/arm/tiva/launchxl-cc1312r1/src/launchxl-cc1312r1.h +++ b/boards/arm/tiva/launchxl-cc1312r1/src/launchxl-cc1312r1.h @@ -79,7 +79,7 @@ extern const struct cc13xx_pinconfig_s g_gpio_sw2; * from board_late_initialize(). * * If CONFIG_BOARD_LATE_INITIALIZE is not selected, - * but CONFIG_LIB_BOARDCTL=y + * but CONFIG_BOARDCTL=y * then this function will *probably* be called from application logic via * boardctl(). * diff --git a/boards/arm/tiva/lm3s6432-s2e/src/Makefile b/boards/arm/tiva/lm3s6432-s2e/src/Makefile index 4c1c59e361c..0d3724f44ab 100644 --- a/boards/arm/tiva/lm3s6432-s2e/src/Makefile +++ b/boards/arm/tiva/lm3s6432-s2e/src/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/Make.defs CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lm_appinit.c endif diff --git a/boards/arm/tiva/lm3s6965-ek/configs/qemu-nxflat/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/qemu-nxflat/defconfig index acfcacebb98..e60ed356c28 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/qemu-nxflat/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/qemu-nxflat/defconfig @@ -16,13 +16,13 @@ CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_CLOCK_MONOTONIC=y CONFIG_EXAMPLES_NXFLAT=y CONFIG_FS_ROMFS=y CONFIG_LIBM=y -CONFIG_LIB_BOARDCTL=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSCLIENT_NAMESIZE=64 diff --git a/boards/arm/tiva/lm3s6965-ek/src/Makefile b/boards/arm/tiva/lm3s6965-ek/src/Makefile index 7b92457232e..714b5e89a9b 100644 --- a/boards/arm/tiva/lm3s6965-ek/src/Makefile +++ b/boards/arm/tiva/lm3s6965-ek/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lm_appinit.c endif @@ -32,7 +32,7 @@ endif ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += lm_bringup.c -else ifeq ($(CONFIG_LIB_BOARDCTL),y) +else ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lm_bringup.c endif diff --git a/boards/arm/tiva/lm3s8962-ek/src/Makefile b/boards/arm/tiva/lm3s8962-ek/src/Makefile index a68636b26c6..320996b8b39 100644 --- a/boards/arm/tiva/lm3s8962-ek/src/Makefile +++ b/boards/arm/tiva/lm3s8962-ek/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lm_appinit.c endif diff --git a/boards/arm/tiva/lm4f120-launchpad/src/Makefile b/boards/arm/tiva/lm4f120-launchpad/src/Makefile index 4a8c9d9dc1b..fc409011ea4 100644 --- a/boards/arm/tiva/lm4f120-launchpad/src/Makefile +++ b/boards/arm/tiva/lm4f120-launchpad/src/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG_ARCH_LEDS),y) CSRCS += lm4f_autoleds.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += lm4f_appinit.c endif diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/Makefile b/boards/arm/tiva/tm4c123g-launchpad/src/Makefile index 7022d59ed35..9497bb9424e 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/src/Makefile +++ b/boards/arm/tiva/tm4c123g-launchpad/src/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG_ARCH_LEDS),y) CSRCS += tm4c_autoleds.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += tm4c_appinit.c endif diff --git a/boards/arm/tiva/tm4c1294-launchpad/src/Makefile b/boards/arm/tiva/tm4c1294-launchpad/src/Makefile index 52ea9ccd47a..87e34524925 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/src/Makefile +++ b/boards/arm/tiva/tm4c1294-launchpad/src/Makefile @@ -40,7 +40,7 @@ ifeq ($(CONFIG_DK_TM4C129X_TIMER),y) CSRCS += tm4c_timer.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += tm4c_appinit.c endif diff --git a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_appinit.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_appinit.c index 3bf3538b57a..b9dc71f6493 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_appinit.c +++ b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_appinit.c @@ -28,7 +28,7 @@ #include "tm4c1294-launchpad.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 */ diff --git a/boards/arm/tms570/launchxl-tms57004/src/Makefile b/boards/arm/tms570/launchxl-tms57004/src/Makefile index f04de59acf3..10843f2744c 100644 --- a/boards/arm/tms570/launchxl-tms57004/src/Makefile +++ b/boards/arm/tms570/launchxl-tms57004/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = tms570_initialize.c tms570_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += tms570_appinit.c endif diff --git a/boards/arm/tms570/launchxl-tms57004/src/tms570_appinit.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_appinit.c index 0bffd3fe36e..ad8d9850360 100644 --- a/boards/arm/tms570/launchxl-tms57004/src/tms570_appinit.c +++ b/boards/arm/tms570/launchxl-tms57004/src/tms570_appinit.c @@ -54,7 +54,7 @@ * ****************************************************************************/ -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL int board_app_initialize(uintptr_t arg) { #ifndef CONFIG_BOARD_LATE_INITIALIZE @@ -67,4 +67,4 @@ int board_app_initialize(uintptr_t arg) return 0; } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/Makefile b/boards/arm/tms570/tms570ls31x-usb-kit/src/Makefile index 40fc60b79ca..c781dd380d8 100644 --- a/boards/arm/tms570/tms570ls31x-usb-kit/src/Makefile +++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = tms570_initialize.c tms570_bringup.c tms570_spi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += tms570_appinit.c endif diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_appinit.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_appinit.c index e6e28d04031..89351840f57 100644 --- a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_appinit.c +++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_appinit.c @@ -54,7 +54,7 @@ * ****************************************************************************/ -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL int board_app_initialize(uintptr_t arg) { #ifndef CONFIG_BOARD_LATE_INITIALIZE @@ -67,4 +67,4 @@ int board_app_initialize(uintptr_t arg) return 0; } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/arm/xmc4/xmc4500-relax/src/Makefile b/boards/arm/xmc4/xmc4500-relax/src/Makefile index e438de87aee..463afc99a6e 100644 --- a/boards/arm/xmc4/xmc4500-relax/src/Makefile +++ b/boards/arm/xmc4/xmc4500-relax/src/Makefile @@ -40,7 +40,7 @@ ifeq ($(CONFIG_SENSORS_MAX6675),y) CSRCS += xmc4_max6675.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += xmc4_appinit.c endif diff --git a/boards/arm/xmc4/xmc4700-relax/src/Makefile b/boards/arm/xmc4/xmc4700-relax/src/Makefile index ecdbcca2e06..38ec1525a3d 100644 --- a/boards/arm/xmc4/xmc4700-relax/src/Makefile +++ b/boards/arm/xmc4/xmc4700-relax/src/Makefile @@ -32,7 +32,7 @@ else CSRCS += xmc4_userleds.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += xmc4_appinit.c endif diff --git a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig index d047ad94f41..ff337085d41 100644 --- a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig +++ b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig @@ -18,13 +18,13 @@ CONFIG_AVR_LINUXGCC_TOOLCHAIN=y CONFIG_AVR_SPI=y CONFIG_AVR_USART1=y CONFIG_AVR_USBDEV=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=864 CONFIG_CONSOLE_SYSLOG=y CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MQUEUE=y CONFIG_IDLETHREAD_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MMCSD=y CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 diff --git a/boards/avr/at90usb/teensy-2.0/src/Makefile b/boards/avr/at90usb/teensy-2.0/src/Makefile index 9494c4a551e..0ffda848589 100644 --- a/boards/avr/at90usb/teensy-2.0/src/Makefile +++ b/boards/avr/at90usb/teensy-2.0/src/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG_ARCH_LEDS),y) CSRCS += at90usb_leds.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += at90usb_appinit.c endif diff --git a/boards/avr/at90usb/teensy-2.0/src/at90usb_appinit.c b/boards/avr/at90usb/teensy-2.0/src/at90usb_appinit.c index caeef629a8c..c3812f35aa4 100644 --- a/boards/avr/at90usb/teensy-2.0/src/at90usb_appinit.c +++ b/boards/avr/at90usb/teensy-2.0/src/at90usb_appinit.c @@ -27,7 +27,7 @@ #include #include -#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 */ diff --git a/boards/boardctl.c b/boards/boardctl.c index 9fe0b186147..5151f2927bf 100644 --- a/boards/boardctl.c +++ b/boards/boardctl.c @@ -58,7 +58,7 @@ # include #endif -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Private Functions @@ -325,7 +325,7 @@ int boardctl(unsigned int cmd, uintptr_t arg) * data read from a file or serial FLASH, or whatever * you would like to do with it. Every implementation * should accept zero/NULL as a default configuration. - * CONFIGURATION: CONFIG_LIB_BOARDCTL + * CONFIGURATION: CONFIG_BOARDCTL * DEPENDENCIES: Board logic must provide board_app_initialization */ @@ -590,7 +590,7 @@ int boardctl(unsigned int cmd, uintptr_t arg) * DESCRIPTION: Manage USB device classes * ARG: A pointer to an instance of struct * boardioc_usbdev_ctrl_s - * CONFIGURATION: CONFIG_LIB_BOARDCTL && CONFIG_BOARDCTL_USBDEVCTRL + * CONFIGURATION: CONFIG_BOARDCTL && CONFIG_BOARDCTL_USBDEVCTRL * DEPENDENCIES: Board logic must provide board__initialize() */ @@ -780,4 +780,4 @@ int boardctl(unsigned int cmd, uintptr_t arg) return OK; } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/hc/m9s12/demo9s12ne64/src/Makefile b/boards/hc/m9s12/demo9s12ne64/src/Makefile index 1a6ffe0e6cf..9b38bf214b9 100644 --- a/boards/hc/m9s12/demo9s12ne64/src/Makefile +++ b/boards/hc/m9s12/demo9s12ne64/src/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/Make.defs CSRCS = m9s12_boot.c m9s12_leds.c m9s12_buttons.c m9s12_spi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += m9s12_appinit.c endif diff --git a/boards/hc/m9s12/ne64badge/src/Makefile b/boards/hc/m9s12/ne64badge/src/Makefile index f3cabde1024..221cea6d3bf 100644 --- a/boards/hc/m9s12/ne64badge/src/Makefile +++ b/boards/hc/m9s12/ne64badge/src/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/Make.defs CSRCS = m9s12_boot.c m9s12_leds.c m9s12_buttons.c m9s12_spi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += m9s12_appinit.c endif diff --git a/boards/mips/pic32mx/mirtoo/src/Makefile b/boards/mips/pic32mx/mirtoo/src/Makefile index 0890125b556..4c6e50a4f0a 100644 --- a/boards/mips/pic32mx/mirtoo/src/Makefile +++ b/boards/mips/pic32mx/mirtoo/src/Makefile @@ -30,7 +30,7 @@ ifeq ($(CONFIG_PIC32MX_ADC),y) CSRCS += pic32_adc.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += pic32_appinit.c endif diff --git a/boards/mips/pic32mx/pic32mx-starterkit/src/Makefile b/boards/mips/pic32mx/pic32mx-starterkit/src/Makefile index 6d5a4828f9a..110d61667bf 100644 --- a/boards/mips/pic32mx/pic32mx-starterkit/src/Makefile +++ b/boards/mips/pic32mx/pic32mx-starterkit/src/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y) CSRCS += pic32mx_usbdev.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += pic32mx_appinit.c endif diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/Makefile b/boards/mips/pic32mx/pic32mx7mmb/src/Makefile index fdf2380b895..414532c2344 100644 --- a/boards/mips/pic32mx/pic32mx7mmb/src/Makefile +++ b/boards/mips/pic32mx/pic32mx7mmb/src/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y) CSRCS += pic32_usbdev.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += pic32_appinit.c endif diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_appinit.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_appinit.c index dc7f5f01ab6..be83b542c6b 100644 --- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_appinit.c +++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_appinit.c @@ -31,7 +31,7 @@ #include "pic32mx7mmb.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 */ diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_bringup.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_bringup.c index 8f05de033e7..5de25d95320 100644 --- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_bringup.c +++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_bringup.c @@ -362,7 +362,7 @@ static int nsh_usbdevinitialize(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 * ****************************************************************************/ diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32mx7mmb.h b/boards/mips/pic32mx/pic32mx7mmb/src/pic32mx7mmb.h index b6299f3f192..ac98a58d8a4 100644 --- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32mx7mmb.h +++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32mx7mmb.h @@ -143,7 +143,7 @@ void pic32mx_led_initialize(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 * ****************************************************************************/ diff --git a/boards/mips/pic32mx/sure-pic32mx/src/Makefile b/boards/mips/pic32mx/sure-pic32mx/src/Makefile index 5931024d18c..bbb49df3bb8 100644 --- a/boards/mips/pic32mx/sure-pic32mx/src/Makefile +++ b/boards/mips/pic32mx/sure-pic32mx/src/Makefile @@ -43,7 +43,7 @@ ifeq ($(CONFIG_LCD_LCD1602),y) CSRCS += pic32mx_lcd1602.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += pic32mx_appinit.c endif diff --git a/boards/mips/pic32mx/ubw32/src/Makefile b/boards/mips/pic32mx/ubw32/src/Makefile index 84194666a85..5c423587a65 100644 --- a/boards/mips/pic32mx/ubw32/src/Makefile +++ b/boards/mips/pic32mx/ubw32/src/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += pic32_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += pic32_appinit.c endif diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/src/Makefile b/boards/mips/pic32mz/flipnclick-pic32mz/src/Makefile index 34ae8af0be8..12970920716 100644 --- a/boards/mips/pic32mz/flipnclick-pic32mz/src/Makefile +++ b/boards/mips/pic32mz/flipnclick-pic32mz/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = pic32mz_boot.c pic32mz_bringup.c pic32mz_userleds.c pic32mz_spi.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += pic32mz_appinit.c endif diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_appinit.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_appinit.c index d289e104310..e03904a2f25 100644 --- a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_appinit.c +++ b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_appinit.c @@ -28,7 +28,7 @@ #include "flipnclick-pic32mz.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 */ diff --git a/boards/mips/pic32mz/pic32mz-starterkit/src/Makefile b/boards/mips/pic32mz/pic32mz-starterkit/src/Makefile index 17e9f3f1b93..bbb49bc9ef5 100644 --- a/boards/mips/pic32mz/pic32mz-starterkit/src/Makefile +++ b/boards/mips/pic32mz/pic32mz-starterkit/src/Makefile @@ -32,7 +32,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += pic32mz_buttons.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += pic32mz_appinit.c endif diff --git a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz-starterkit.h b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz-starterkit.h index 4c9dba4ca25..f59019328b7 100644 --- a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz-starterkit.h +++ b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz-starterkit.h @@ -63,7 +63,7 @@ /* Make sure that the NSH configuration will support the SD card */ -#if defined(PIC32MZ_HAVE_MMCSD) && defined(CONFIG_LIB_BOARDCTL) +#if defined(PIC32MZ_HAVE_MMCSD) && defined(CONFIG_BOARDCTL) /* Make sure that the NSH configuration uses the correct SPI */ diff --git a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_appinit.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_appinit.c index 49b815faa7e..9f462b90ea1 100644 --- a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_appinit.c +++ b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_appinit.c @@ -28,7 +28,7 @@ #include "pic32mz-starterkit.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 */ diff --git a/boards/or1k/mor1kx/or1k/src/Makefile b/boards/or1k/mor1kx/or1k/src/Makefile index 0a525027318..3f7daeb6ce2 100644 --- a/boards/or1k/mor1kx/or1k/src/Makefile +++ b/boards/or1k/mor1kx/or1k/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = or1k_boot.c or1k_bringup.c or1k_autoled.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += or1k_appinit.c endif diff --git a/boards/or1k/mor1kx/or1k/src/or1k.h b/boards/or1k/mor1kx/or1k/src/or1k.h index f362cfe469e..199179e3dc8 100644 --- a/boards/or1k/mor1kx/or1k/src/or1k.h +++ b/boards/or1k/mor1kx/or1k/src/or1k.h @@ -34,7 +34,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 * ****************************************************************************/ diff --git a/boards/or1k/mor1kx/or1k/src/or1k_bringup.c b/boards/or1k/mor1kx/or1k/src/or1k_bringup.c index faada664b41..f2fbcd0c018 100644 --- a/boards/or1k/mor1kx/or1k/src/or1k_bringup.c +++ b/boards/or1k/mor1kx/or1k/src/or1k_bringup.c @@ -57,7 +57,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 * ****************************************************************************/ diff --git a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_appinit.c b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_appinit.c index 47e0cfeca14..a26b2abf848 100644 --- a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_appinit.c +++ b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_appinit.c @@ -30,7 +30,7 @@ #include #include "rx65n_grrose.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Public Functions @@ -44,11 +44,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: @@ -79,4 +79,4 @@ int board_app_initialize(uintptr_t arg) #endif } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c index 5794c871945..740ecf021ed 100644 --- a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c +++ b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c @@ -40,7 +40,7 @@ #include "rx65n_usbhost.h" #include "rx65n_grrose.h" #include -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL #ifdef HAVE_RTC_DRIVER # include @@ -349,7 +349,7 @@ static int rtc_driver_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 * ****************************************************************************/ diff --git a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_grrose.h b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_grrose.h index 6d274048efd..7391c58e7a0 100644 --- a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_grrose.h +++ b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_grrose.h @@ -52,7 +52,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 * ****************************************************************************/ diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_appinit.c b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_appinit.c index 17e26a934b8..212e827a9e3 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_appinit.c +++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_appinit.c @@ -30,7 +30,7 @@ #include #include "rx65n_rsk2mb.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Public Functions @@ -44,11 +44,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: @@ -79,4 +79,4 @@ int board_app_initialize(uintptr_t arg) #endif } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c index e5a33f0c6f8..613b7cc8e57 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c +++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c @@ -39,7 +39,7 @@ #include "rx65n_usbhost.h" #include "rx65n_rsk2mb.h" #include -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL #ifdef HAVE_RTC_DRIVER # include @@ -344,7 +344,7 @@ static int rtc_driver_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 * ****************************************************************************/ diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h index 4a9e100931f..9ca33e97499 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h +++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h @@ -52,7 +52,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 * ****************************************************************************/ diff --git a/boards/risc-v/bl602/bl602evb/src/Makefile b/boards/risc-v/bl602/bl602evb/src/Makefile index 020b705fb25..0fd6eb42751 100644 --- a/boards/risc-v/bl602/bl602evb/src/Makefile +++ b/boards/risc-v/bl602/bl602evb/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = bl602_bringup.c bl602_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += bl602_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += bl602_reset.c diff --git a/boards/risc-v/c906/smartl-c906/src/Makefile b/boards/risc-v/c906/smartl-c906/src/Makefile index 4b5f2c7253c..86dffec6b37 100644 --- a/boards/risc-v/c906/smartl-c906/src/Makefile +++ b/boards/risc-v/c906/smartl-c906/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = c906_bringup.c c906_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += c906_appinit.c endif diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/src/Makefile b/boards/risc-v/esp32c3/esp32c3-devkit/src/Makefile index 661da923f46..a9921e84480 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/src/Makefile +++ b/boards/risc-v/esp32c3/esp32c3-devkit/src/Makefile @@ -26,7 +26,7 @@ CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h CSRCS = esp32c3_boot.c esp32c3_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += esp32c3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32c3_reset.c diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h index de523f7679d..0d5f4e73c08 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h +++ b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.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 via board_app_initialize() * ****************************************************************************/ diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_appinit.c b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_appinit.c index 91789a75330..4f683dc85c8 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_appinit.c +++ b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_appinit.c @@ -29,7 +29,7 @@ #include "esp32c3-devkit.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Pre-processor Definitions @@ -77,4 +77,4 @@ int board_app_initialize(uintptr_t arg) #endif } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c index 320753fdca9..606946e7839 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c +++ b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c @@ -128,7 +128,7 @@ static int esp32c3_init_wifi_storage(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 * ****************************************************************************/ diff --git a/boards/risc-v/fe310/hifive1-revb/src/Makefile b/boards/risc-v/fe310/hifive1-revb/src/Makefile index bc4d129599e..a6982047cfe 100644 --- a/boards/risc-v/fe310/hifive1-revb/src/Makefile +++ b/boards/risc-v/fe310/hifive1-revb/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = fe310_bringup.c fe310_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += fe310_appinit.c endif diff --git a/boards/risc-v/k210/maix-bit/configs/elf/defconfig b/boards/risc-v/k210/maix-bit/configs/elf/defconfig index 28918244775..a4a3eaa652f 100644 --- a/boards/risc-v/k210/maix-bit/configs/elf/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/elf/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH_CHIP_K210=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_APP_SYMTAB=y CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LOOPSPERMSEC=46000 @@ -32,7 +33,6 @@ CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_BOARDCTL=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 e02419c5ce4..3c124d84de5 100644 --- a/boards/risc-v/k210/maix-bit/configs/module/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/module/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH_CHIP_K210=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_APP_SYMTAB=y CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LOOPSPERMSEC=46000 @@ -33,7 +34,6 @@ CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_BOARDCTL=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 7f37c25e343..1c23c0a7098 100644 --- a/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH_CHIP_K210=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_APP_SYMTAB=y CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LOOPSPERMSEC=46000 @@ -31,7 +32,6 @@ CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_LIB_BOARDCTL=y CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 diff --git a/boards/risc-v/k210/maix-bit/src/Makefile b/boards/risc-v/k210/maix-bit/src/Makefile index 3810b26be45..e70a4d1374c 100644 --- a/boards/risc-v/k210/maix-bit/src/Makefile +++ b/boards/risc-v/k210/maix-bit/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = k210_bringup.c k210_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += k210_appinit.c endif diff --git a/boards/risc-v/litex/arty_a7/src/Makefile b/boards/risc-v/litex/arty_a7/src/Makefile index d3ef7201b2b..7b9f5bfbbd7 100644 --- a/boards/risc-v/litex/arty_a7/src/Makefile +++ b/boards/risc-v/litex/arty_a7/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = litex_bringup.c litex_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += litex_appinit.c endif diff --git a/boards/risc-v/mpfs/icicle/src/Makefile b/boards/risc-v/mpfs/icicle/src/Makefile index fc6753297b8..8dc195e8b4c 100755 --- a/boards/risc-v/mpfs/icicle/src/Makefile +++ b/boards/risc-v/mpfs/icicle/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = mpfs_bringup.c mpfs_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += mpfs_appinit.c endif diff --git a/boards/risc-v/rv32m1/rv32m1-vega/src/Makefile b/boards/risc-v/rv32m1/rv32m1-vega/src/Makefile index 426d902ed59..02ae18cf992 100644 --- a/boards/risc-v/rv32m1/rv32m1-vega/src/Makefile +++ b/boards/risc-v/rv32m1/rv32m1-vega/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = rv32m1_bringup.c rv32m1_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += rv32m1_appinit.c endif diff --git a/boards/sim/sim/sim/configs/lvgl/defconfig b/boards/sim/sim/sim/configs/lvgl/defconfig index b860855ad22..eb0e9a43394 100644 --- a/boards/sim/sim/sim/configs/lvgl/defconfig +++ b/boards/sim/sim/sim/configs/lvgl/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y CONFIG_ARCH_CHIP="sim" CONFIG_ARCH_SIM=y +CONFIG_BOARDCTL=y CONFIG_BUILTIN=y CONFIG_DEBUG_ASSERTIONS=y CONFIG_DEBUG_ERROR=y @@ -28,7 +29,6 @@ CONFIG_EXAMPLES_LVGLDEMO_STACKSIZE=32768 CONFIG_GRAPHICS_LVGL=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_INPUT=y -CONFIG_LIB_BOARDCTL=y CONFIG_LV_COLOR_DEPTH=32 CONFIG_LV_HOR_RES=640 CONFIG_LV_VER_RES=480 diff --git a/boards/sim/sim/sim/configs/ostest/defconfig b/boards/sim/sim/sim/configs/ostest/defconfig index 7cc4399c054..c05ded0832d 100644 --- a/boards/sim/sim/sim/configs/ostest/defconfig +++ b/boards/sim/sim/sim/configs/ostest/defconfig @@ -10,13 +10,13 @@ CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y CONFIG_ARCH_CHIP="sim" CONFIG_ARCH_SIM=y +CONFIG_BOARDCTL=y CONFIG_BOARDCTL_POWEROFF=y CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_CANCELLATION_POINTS=y CONFIG_DEBUG_SYMBOLS=y CONFIG_FS_NAMED_SEMAPHORES=y CONFIG_IDLETHREAD_STACKSIZE=4096 -CONFIG_LIB_BOARDCTL=y CONFIG_PTHREAD_CLEANUP=y CONFIG_PTHREAD_CLEANUP_STACKSIZE=3 CONFIG_PTHREAD_MUTEX_TYPES=y diff --git a/boards/sim/sim/sim/configs/touchscreen/defconfig b/boards/sim/sim/sim/configs/touchscreen/defconfig index ca3eaa441d3..92a6692b1f7 100644 --- a/boards/sim/sim/sim/configs/touchscreen/defconfig +++ b/boards/sim/sim/sim/configs/touchscreen/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y CONFIG_ARCH_CHIP="sim" CONFIG_ARCH_SIM=y +CONFIG_BOARDCTL=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y @@ -21,7 +22,6 @@ CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25 CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_INPUT=y -CONFIG_LIB_BOARDCTL=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y diff --git a/boards/sim/sim/sim/src/Makefile b/boards/sim/sim/sim/src/Makefile index fc87cdd3dfa..80bad72b870 100644 --- a/boards/sim/sim/sim/src/Makefile +++ b/boards/sim/sim/sim/src/Makefile @@ -28,7 +28,7 @@ ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) CSRCS += sim_boot.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sim_appinit.c endif @@ -37,7 +37,7 @@ ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y) CSRCS += sim_zoneinfo.c endif -else ifeq ($(CONFIG_LIB_BOARDCTL),y) +else ifeq ($(CONFIG_BOARDCTL),y) CSRCS += sim_bringup.c ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y) CSRCS += sim_zoneinfo.c diff --git a/boards/sim/sim/sim/src/sim_appinit.c b/boards/sim/sim/sim/src/sim_appinit.c index a7b40b4064f..f74e614d55e 100644 --- a/boards/sim/sim/sim/src/sim_appinit.c +++ b/boards/sim/sim/sim/src/sim_appinit.c @@ -56,7 +56,7 @@ * ****************************************************************************/ -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL int board_app_initialize(uintptr_t arg) { #ifndef CONFIG_BOARD_LATE_INITIALIZE @@ -65,4 +65,4 @@ int board_app_initialize(uintptr_t arg) return 0; } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/x86/qemu/qemu-i486/src/Makefile b/boards/x86/qemu/qemu-i486/src/Makefile index e2bb0db45ee..d1903aef708 100644 --- a/boards/x86/qemu/qemu-i486/src/Makefile +++ b/boards/x86/qemu/qemu-i486/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = qemu_boot.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += qemu_appinit.c endif diff --git a/boards/x86/qemu/qemu-i486/src/qemu_appinit.c b/boards/x86/qemu/qemu-i486/src/qemu_appinit.c index 578e5846c63..188a06c1ff3 100644 --- a/boards/x86/qemu/qemu-i486/src/qemu_appinit.c +++ b/boards/x86/qemu/qemu-i486/src/qemu_appinit.c @@ -60,7 +60,7 @@ * ****************************************************************************/ -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL int board_app_initialize(uintptr_t arg) { int ret = OK; @@ -77,4 +77,4 @@ int board_app_initialize(uintptr_t arg) return ret; } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/x86_64/intel64/qemu-intel64/src/Makefile b/boards/x86_64/intel64/qemu-intel64/src/Makefile index 22c3cd465a6..7bdacd1f3cc 100644 --- a/boards/x86_64/intel64/qemu-intel64/src/Makefile +++ b/boards/x86_64/intel64/qemu-intel64/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = qemu_boot.c qemu_bringup.c qemu_freq.c qemu_net.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += qemu_appinit.c endif diff --git a/boards/xtensa/esp32/esp32-devkitc/src/Make.defs b/boards/xtensa/esp32/esp32-devkitc/src/Make.defs index a30a0c3e9db..839b9a5b2af 100644 --- a/boards/xtensa/esp32/esp32-devkitc/src/Make.defs +++ b/boards/xtensa/esp32/esp32-devkitc/src/Make.defs @@ -26,7 +26,7 @@ CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h CSRCS = esp32_boot.c esp32_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h b/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h index 7f75261d2a4..f32b33e6380 100644 --- a/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h @@ -85,7 +85,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 via board_app_initialize() * ****************************************************************************/ diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c index 37b66223015..4f51ea7914c 100644 --- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c @@ -29,7 +29,7 @@ #include "esp32-devkitc.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Pre-processor Definitions @@ -77,4 +77,4 @@ int board_app_initialize(uintptr_t arg) #endif } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c index ca844a6c3ab..a7d63a420fb 100644 --- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c @@ -109,7 +109,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 * ****************************************************************************/ diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs b/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs index f0d4593874e..cf7a4c63a67 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs +++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs @@ -26,7 +26,7 @@ CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h CSRCS = esp32_boot.c esp32_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h index cb426aaa010..83107c3b0cf 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h +++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h @@ -74,7 +74,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 via board_app_initialize() * ****************************************************************************/ diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_appinit.c index 8d38c04a6b0..4366443aa04 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_appinit.c +++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_appinit.c @@ -29,7 +29,7 @@ #include "esp32-ethernet-kit.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Pre-processor Definitions @@ -77,4 +77,4 @@ int board_app_initialize(uintptr_t arg) #endif } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c index e1875b5e41c..a830c3c9611 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c @@ -89,7 +89,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 * ****************************************************************************/ diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs b/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs index 968ff30e517..c48ae6a8312 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs +++ b/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs @@ -32,7 +32,7 @@ else CSRCS += esp32_userleds.c endif -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32-wrover-kit.h b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32-wrover-kit.h index 63da3167647..6d54a5c6ad8 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32-wrover-kit.h +++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32-wrover-kit.h @@ -80,7 +80,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 via board_app_initialize() * ****************************************************************************/ diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_appinit.c index 8016b7c47b2..d8eb27deb7e 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_appinit.c +++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_appinit.c @@ -29,7 +29,7 @@ #include "esp32-wrover-kit.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Pre-processor Definitions @@ -77,4 +77,4 @@ int board_app_initialize(uintptr_t arg) #endif } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c index a9ee883427a..b7517d225dc 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c @@ -109,7 +109,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 * ****************************************************************************/ diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/Make.defs b/boards/xtensa/esp32s2/esp32s2-saola-1/src/Make.defs index cf1df5706b1..0a6cda99e47 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/Make.defs +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/Make.defs @@ -26,7 +26,7 @@ CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)config.h CSRCS = esp32s2_boot.c esp32s2_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += esp32s2_appinit.c endif diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h index c51409441d7..4361e4ae416 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h @@ -62,7 +62,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 via board_app_initialize() * ****************************************************************************/ diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_appinit.c b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_appinit.c index 94eef2d5d4b..ee5ea3524c3 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_appinit.c +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_appinit.c @@ -29,7 +29,7 @@ #include "esp32s2-saola-1.h" -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Pre-processor Definitions @@ -77,4 +77,4 @@ int board_app_initialize(uintptr_t arg) #endif } -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c index 171172eb672..92a7c657c12 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c @@ -61,7 +61,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 * ****************************************************************************/ diff --git a/boards/z16/z16f/z16f2800100zcog/src/Makefile b/boards/z16/z16f/z16f2800100zcog/src/Makefile index 395a71bb0a6..e7d511e76f8 100644 --- a/boards/z16/z16f/z16f2800100zcog/src/Makefile +++ b/boards/z16/z16f/z16f2800100zcog/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = z16f_boot.c z16f_leds.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += z16f_appinit.c endif diff --git a/boards/z80/ez80/makerlisp/src/Makefile b/boards/z80/ez80/makerlisp/src/Makefile index 91de3203646..5e31c745966 100644 --- a/boards/z80/ez80/makerlisp/src/Makefile +++ b/boards/z80/ez80/makerlisp/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = ez80_boot.c ez80_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += ez80_appinit.c endif diff --git a/boards/z80/ez80/makerlisp/src/ez80_bringup.c b/boards/z80/ez80/makerlisp/src/ez80_bringup.c index d1d76dd096f..263c7568b0d 100644 --- a/boards/z80/ez80/makerlisp/src/ez80_bringup.c +++ b/boards/z80/ez80/makerlisp/src/ez80_bringup.c @@ -44,7 +44,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 * ****************************************************************************/ diff --git a/boards/z80/ez80/makerlisp/src/makerlisp.h b/boards/z80/ez80/makerlisp/src/makerlisp.h index 0a6a80d938b..b9205ffd5c8 100644 --- a/boards/z80/ez80/makerlisp/src/makerlisp.h +++ b/boards/z80/ez80/makerlisp/src/makerlisp.h @@ -96,7 +96,7 @@ extern "C" * 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 * ****************************************************************************/ diff --git a/boards/z80/ez80/z20x/src/Makefile b/boards/z80/ez80/z20x/src/Makefile index 317f10cfaa4..7f79a50c26c 100644 --- a/boards/z80/ez80/z20x/src/Makefile +++ b/boards/z80/ez80/z20x/src/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs CSRCS = ez80_boot.c ez80_bringup.c -ifeq ($(CONFIG_LIB_BOARDCTL),y) +ifeq ($(CONFIG_BOARDCTL),y) CSRCS += ez80_appinit.c endif diff --git a/boards/z80/ez80/z20x/src/ez80_bringup.c b/boards/z80/ez80/z20x/src/ez80_bringup.c index dbd2a6f3930..e780ded5067 100644 --- a/boards/z80/ez80/z20x/src/ez80_bringup.c +++ b/boards/z80/ez80/z20x/src/ez80_bringup.c @@ -44,7 +44,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 * ****************************************************************************/ diff --git a/boards/z80/ez80/z20x/src/z20x.h b/boards/z80/ez80/z20x/src/z20x.h index 38c71c34123..7c8b1276ccf 100644 --- a/boards/z80/ez80/z20x/src/z20x.h +++ b/boards/z80/ez80/z20x/src/z20x.h @@ -177,7 +177,7 @@ extern "C" * 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 * ****************************************************************************/ diff --git a/include/nuttx/board.h b/include/nuttx/board.h index c5df4245e11..895d44fd6d0 100644 --- a/include/nuttx/board.h +++ b/include/nuttx/board.h @@ -428,7 +428,7 @@ FAR struct fb_vtable_s *board_graphics_setup(unsigned int devno); * Name: board_ioctl * * Description: - * If CONFIG_LIB_BOARDCTL=y, boards may also select CONFIG_BOARDCTL_IOCTL=y + * If CONFIG_BOARDCTL=y, boards may also select CONFIG_BOARDCTL_IOCTL=y * enable board specific commands. In this case, all commands not * recognized by boardctl() will be forwarded to the board-provided * board_ioctl() function. diff --git a/include/sys/boardctl.h b/include/sys/boardctl.h index 6b2d584e721..43320a01e33 100644 --- a/include/sys/boardctl.h +++ b/include/sys/boardctl.h @@ -42,7 +42,7 @@ # include #endif -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL /**************************************************************************** * Pre-processor Definitions @@ -63,7 +63,7 @@ * whatever you would like to do with it. Every * implementation should accept zero/NULL as a default * configuration. - * CONFIGURATION: CONFIG_LIB_BOARDCTL + * CONFIGURATION: CONFIG_BOARDCTL * DEPENDENCIES: Board logic must provide board_app_initialize() * * CMD: BOARDIOC_POWEROFF @@ -141,7 +141,7 @@ * CMD: BOARDIOC_USBDEV_CONTROL * DESCRIPTION: Manage USB device classes * ARG: A pointer to an instance of struct boardioc_usbdev_ctrl_s - * CONFIGURATION: CONFIG_LIB_BOARDCTL && CONFIG_BOARDCTL_USBDEVCTRL + * CONFIGURATION: CONFIG_BOARDCTL && CONFIG_BOARDCTL_USBDEVCTRL * DEPENDENCIES: Board logic must provide board__initialize() * * CMD: BOARDIOC_NX_START @@ -445,5 +445,5 @@ int boardctl(unsigned int cmd, uintptr_t arg); } #endif -#endif /* CONFIG_LIB_BOARDCTL */ +#endif /* CONFIG_BOARDCTL */ #endif /* __INCLUDE_SYS_BOARDCTL_H */ diff --git a/include/sys/syscall_lookup.h b/include/sys/syscall_lookup.h index c266f729a4b..b520a2f5089 100644 --- a/include/sys/syscall_lookup.h +++ b/include/sys/syscall_lookup.h @@ -224,7 +224,7 @@ SYSCALL_LOOKUP(pwrite, 4) /* Board support */ -#ifdef CONFIG_LIB_BOARDCTL +#ifdef CONFIG_BOARDCTL SYSCALL_LOOKUP(boardctl, 2) #endif diff --git a/libs/libc/pthread/Kconfig b/libs/libc/pthread/Kconfig index 868e1ab423b..306d80600da 100644 --- a/libs/libc/pthread/Kconfig +++ b/libs/libc/pthread/Kconfig @@ -9,7 +9,7 @@ menu "pthread support" config PTHREAD_SPINLOCKS bool "pthread spinlock support" default n - depends on SPINLOCK && LIB_BOARDCTL + depends on SPINLOCK && BOARDCTL select BOARDCTL_TESTSET ---help--- Enable support for pthread spinlocks. diff --git a/syscall/syscall.csv b/syscall/syscall.csv index 44266c1bd2b..adcafe53133 100644 --- a/syscall/syscall.csv +++ b/syscall/syscall.csv @@ -8,7 +8,7 @@ "arc4random_buf","stdlib.h","defined(CONFIG_CRYPTO_RANDOM_POOL)","void","FAR void *","size_t" "atexit","stdlib.h","defined(CONFIG_SCHED_ATEXIT)","int","void (*)(void)" "bind","sys/socket.h","defined(CONFIG_NET)","int","int","FAR const struct sockaddr *","socklen_t" -"boardctl","sys/boardctl.h","defined(CONFIG_LIB_BOARDCTL)","int","unsigned int","uintptr_t" +"boardctl","sys/boardctl.h","defined(CONFIG_BOARDCTL)","int","unsigned int","uintptr_t" "chmod","sys/stat.h","","int","FAR const char *","mode_t" "chown","unistd.h","","int","FAR const char *","uid_t","gid_t" "clearenv","stdlib.h","!defined(CONFIG_DISABLE_ENVIRON)","int"