From b12f5881402594587d444878c0d0e3a310197120 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 1 Aug 2021 15:00:54 +0800 Subject: [PATCH] Rename CONFIG_LIB_BOARDCTL to CONFIG_BOARDCTL since boardctl isn't a libc feature Signed-off-by: Xiang Xiao --- Documentation/reference/user/13_boardctl.rst | 2 +- ReleaseNotes | 4 ++-- boards/Kconfig | 6 +++--- boards/Makefile | 2 +- boards/arm/a1x/pcduino-a10/src/Makefile | 2 +- boards/arm/a1x/pcduino-a10/src/a1x_bringup.c | 2 +- boards/arm/a1x/pcduino-a10/src/pcduino_a10.h | 2 +- boards/arm/am335x/beaglebone-black/src/Makefile | 2 +- boards/arm/am335x/beaglebone-black/src/am335x_bringup.c | 2 +- boards/arm/am335x/beaglebone-black/src/beaglebone-black.h | 2 +- boards/arm/cxd56xx/spresense/configs/elf/defconfig | 2 +- boards/arm/cxd56xx/spresense/configs/module/defconfig | 2 +- .../arm/cxd56xx/spresense/configs/posix_spawn/defconfig | 2 +- boards/arm/cxd56xx/spresense/src/Make.defs | 2 +- boards/arm/cxd56xx/spresense/src/cxd56_bringup.c | 2 +- boards/arm/cxd56xx/spresense/src/cxd56_ioctl.c | 2 +- boards/arm/cxd56xx/spresense/src/spresense.h | 2 +- boards/arm/dm320/ntosd-dm320/src/Makefile | 2 +- boards/arm/eoss3/quickfeather/src/eoss3_appinit.c | 4 ++-- boards/arm/eoss3/quickfeather/src/eoss3_bringup.c | 2 +- boards/arm/eoss3/quickfeather/src/quickfeather.h | 2 +- boards/arm/imx6/sabre-6quad/configs/elf/defconfig | 2 +- boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig | 2 +- boards/arm/imx6/sabre-6quad/src/Makefile | 2 +- boards/arm/imx6/sabre-6quad/src/imx_appinit.c | 4 ++-- boards/arm/imx6/sabre-6quad/src/sabre-6quad.h | 2 +- boards/arm/imxrt/imxrt1020-evk/src/Makefile | 2 +- boards/arm/imxrt/imxrt1020-evk/src/imxrt1020-evk.h | 2 +- boards/arm/imxrt/imxrt1020-evk/src/imxrt_appinit.c | 4 ++-- boards/arm/imxrt/imxrt1050-evk/src/Makefile | 2 +- boards/arm/imxrt/imxrt1050-evk/src/imxrt1050-evk.h | 2 +- boards/arm/imxrt/imxrt1050-evk/src/imxrt_appinit.c | 4 ++-- boards/arm/imxrt/imxrt1060-evk/src/Makefile | 2 +- boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h | 2 +- boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c | 4 ++-- boards/arm/imxrt/imxrt1064-evk/src/Makefile | 2 +- boards/arm/imxrt/imxrt1064-evk/src/imxrt1064-evk.h | 2 +- boards/arm/imxrt/imxrt1064-evk/src/imxrt_appinit.c | 4 ++-- boards/arm/imxrt/teensy-4.x/src/Makefile | 2 +- boards/arm/imxrt/teensy-4.x/src/imxrt_appinit.c | 4 ++-- boards/arm/imxrt/teensy-4.x/src/teensy-4.h | 2 +- boards/arm/kinetis/freedom-k28f/src/Makefile | 2 +- boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h | 2 +- boards/arm/kinetis/freedom-k28f/src/k28_bringup.c | 2 +- boards/arm/kinetis/freedom-k64f/README.txt | 2 +- boards/arm/kinetis/freedom-k64f/src/Makefile | 2 +- boards/arm/kinetis/freedom-k64f/src/freedom-k64f.h | 2 +- boards/arm/kinetis/freedom-k64f/src/k64_appinit.c | 4 ++-- boards/arm/kinetis/freedom-k64f/src/k64_bringup.c | 4 ++-- boards/arm/kinetis/freedom-k66f/README.txt | 2 +- boards/arm/kinetis/freedom-k66f/src/Makefile | 2 +- boards/arm/kinetis/freedom-k66f/src/freedom-k66f.h | 2 +- boards/arm/kinetis/freedom-k66f/src/k66_appinit.c | 4 ++-- boards/arm/kinetis/freedom-k66f/src/k66_bringup.c | 4 ++-- boards/arm/kinetis/kwikstik-k40/src/Makefile | 2 +- boards/arm/kinetis/teensy-3.x/src/Makefile | 2 +- boards/arm/kinetis/twr-k60n512/src/Makefile | 2 +- boards/arm/kinetis/twr-k64f120m/src/Makefile | 2 +- boards/arm/kinetis/twr-k64f120m/src/twrk64.h | 2 +- boards/arm/kl/freedom-kl25z/configs/nsh/defconfig | 2 +- boards/arm/kl/freedom-kl25z/src/Makefile | 2 +- boards/arm/kl/freedom-kl25z/src/kl_appinit.c | 4 ++-- boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c | 2 +- boards/arm/kl/freedom-kl26z/configs/nsh/defconfig | 2 +- boards/arm/kl/freedom-kl26z/src/Makefile | 2 +- boards/arm/kl/freedom-kl26z/src/kl_appinit.c | 4 ++-- boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c | 2 +- boards/arm/kl/teensy-lc/configs/nsh/defconfig | 2 +- boards/arm/kl/teensy-lc/src/Makefile | 2 +- boards/arm/kl/teensy-lc/src/kl_appinit.c | 4 ++-- boards/arm/kl/teensy-lc/src/kl_boardinitialize.c | 2 +- boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig | 2 +- .../lc823450/lc823450-xgevk/configs/posix_spawn/defconfig | 2 +- boards/arm/lc823450/lc823450-xgevk/src/Makefile | 2 +- boards/arm/lc823450/lc823450-xgevk/src/lc823450-xgevk.h | 2 +- boards/arm/lc823450/lc823450-xgevk/src/lc823450_appinit.c | 4 ++-- boards/arm/lpc17xx_40xx/lincoln60/src/Makefile | 2 +- boards/arm/lpc17xx_40xx/lpc4088-devkit/src/Makefile | 2 +- .../lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_bringup.c | 2 +- .../arm/lpc17xx_40xx/lpc4088-devkit/src/lpc4088-devkit.h | 2 +- boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/Makefile | 2 +- .../lpc4088-quickstart/src/lpc17_40_bringup.c | 2 +- .../lpc4088-quickstart/src/lpc4088-quickstart.h | 2 +- .../lpcxpresso-lpc1768/configs/usbmsc/defconfig | 2 +- boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/Makefile | 2 +- .../lpcxpresso-lpc1768/src/lpc17_40_appinit.c | 4 ++-- boards/arm/lpc17xx_40xx/lx_cpu/src/Makefile | 2 +- boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_bringup.c | 2 +- boards/arm/lpc17xx_40xx/lx_cpu/src/lx_cpu.h | 2 +- boards/arm/lpc17xx_40xx/mbed/src/Makefile | 2 +- boards/arm/lpc17xx_40xx/mcb1700/src/Makefile | 2 +- boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_bringup.c | 2 +- boards/arm/lpc17xx_40xx/mcb1700/src/mcb1700.h | 2 +- .../olimex-lpc1766stk/configs/usbmsc/defconfig | 2 +- .../olimex-lpc1766stk/configs/usbserial/defconfig | 2 +- boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/Makefile | 2 +- .../arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc1766stk.h | 2 +- .../lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_appinit.c | 8 ++++---- .../lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_bringup.c | 2 +- boards/arm/lpc17xx_40xx/open1788/src/Makefile | 2 +- boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_bringup.c | 2 +- boards/arm/lpc17xx_40xx/open1788/src/open1788.h | 2 +- boards/arm/lpc17xx_40xx/pnev5180b/src/Makefile | 2 +- boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c | 2 +- boards/arm/lpc17xx_40xx/pnev5180b/src/pnev5180b.h | 2 +- boards/arm/lpc17xx_40xx/u-blox-c027/src/Makefile | 2 +- .../arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_appinit.c | 4 ++-- boards/arm/lpc17xx_40xx/zkit-arm-1769/src/Makefile | 2 +- .../lpc214x/mcu123-lpc214x/configs/composite/defconfig | 2 +- .../arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig | 2 +- .../lpc214x/mcu123-lpc214x/configs/usbserial/defconfig | 2 +- boards/arm/lpc214x/mcu123-lpc214x/src/Makefile | 2 +- boards/arm/lpc214x/zp214xpa/src/Makefile | 2 +- boards/arm/lpc214x/zp214xpa/src/lpc2148_appinit.c | 4 ++-- boards/arm/lpc2378/olimex-lpc2378/src/Makefile | 2 +- boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig | 2 +- boards/arm/lpc31xx/ea3131/src/Makefile | 2 +- boards/arm/lpc31xx/ea3152/src/Makefile | 2 +- boards/arm/lpc31xx/olimex-lpc-h3131/src/Makefile | 2 +- boards/arm/lpc43xx/bambino-200e/src/Makefile | 2 +- boards/arm/lpc43xx/lpc4330-xplorer/src/Makefile | 2 +- boards/arm/lpc43xx/lpc4337-ws/src/Makefile | 2 +- boards/arm/lpc43xx/lpc4357-evb/src/Makefile | 2 +- boards/arm/lpc43xx/lpc4370-link2/src/Makefile | 2 +- .../lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig | 2 +- boards/arm/lpc54xx/lpcxpresso-lpc54628/src/Makefile | 2 +- .../arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_bringup.c | 2 +- .../lpc54xx/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h | 2 +- boards/arm/max326xx/max32660-evsys/src/Makefile | 2 +- boards/arm/max326xx/max32660-evsys/src/max32660-evsys.h | 2 +- boards/arm/max326xx/max32660-evsys/src/max326_appinit.c | 4 ++-- boards/arm/max326xx/max32660-evsys/src/max326_bringup.c | 2 +- boards/arm/moxart/moxa/src/Makefile | 2 +- boards/arm/moxart/moxa/src/moxart_appinit.c | 4 ++-- boards/arm/nrf52/nrf52-feather/src/Makefile | 2 +- boards/arm/nrf52/nrf52-feather/src/nrf52-feather.h | 2 +- boards/arm/nrf52/nrf52-feather/src/nrf52_bringup.c | 2 +- boards/arm/nrf52/nrf52832-dk/src/Makefile | 2 +- boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h | 2 +- boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c | 2 +- boards/arm/nrf52/nrf52832-mdk/src/Makefile | 2 +- boards/arm/nrf52/nrf52832-mdk/src/nrf52832-mdk.h | 2 +- boards/arm/nrf52/nrf52832-mdk/src/nrf52_bringup.c | 2 +- boards/arm/nrf52/nrf52832-sparkfun/src/Makefile | 2 +- .../arm/nrf52/nrf52832-sparkfun/src/nrf52832-sparkfun.h | 2 +- boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_bringup.c | 2 +- boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig | 2 +- boards/arm/nrf52/nrf52840-dk/src/Makefile | 2 +- boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h | 2 +- boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c | 2 +- boards/arm/nrf52/nrf52840-dongle/src/Makefile | 2 +- boards/arm/nrf52/nrf52840-dongle/src/nrf52840-dongle.h | 2 +- boards/arm/nrf52/nrf52840-dongle/src/nrf52_bringup.c | 2 +- boards/arm/s32k1xx/rddrone-uavcan144/src/Makefile | 2 +- .../arm/s32k1xx/rddrone-uavcan144/src/rddrone-uavcan144.h | 2 +- .../arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_bringup.c | 2 +- boards/arm/s32k1xx/rddrone-uavcan146/src/Makefile | 2 +- .../arm/s32k1xx/rddrone-uavcan146/src/rddrone-uavcan146.h | 2 +- .../arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c | 2 +- boards/arm/s32k1xx/s32k118evb/src/Makefile | 2 +- boards/arm/s32k1xx/s32k118evb/src/s32k118evb.h | 2 +- boards/arm/s32k1xx/s32k118evb/src/s32k1xx_bringup.c | 2 +- boards/arm/s32k1xx/s32k144evb/src/Makefile | 2 +- boards/arm/s32k1xx/s32k144evb/src/s32k144evb.h | 2 +- boards/arm/s32k1xx/s32k144evb/src/s32k1xx_bringup.c | 2 +- boards/arm/s32k1xx/s32k146evb/src/Makefile | 2 +- boards/arm/s32k1xx/s32k146evb/src/s32k146evb.h | 2 +- boards/arm/s32k1xx/s32k146evb/src/s32k1xx_bringup.c | 2 +- boards/arm/s32k1xx/s32k148evb/src/Makefile | 2 +- boards/arm/s32k1xx/s32k148evb/src/s32k148evb.h | 2 +- boards/arm/s32k1xx/s32k148evb/src/s32k1xx_bringup.c | 2 +- boards/arm/sam34/arduino-due/src/Makefile | 2 +- boards/arm/sam34/arduino-due/src/arduino-due.h | 2 +- boards/arm/sam34/arduino-due/src/sam_bringup.c | 2 +- boards/arm/sam34/flipnclick-sam3x/src/Makefile | 2 +- boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h | 2 +- boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c | 2 +- boards/arm/sam34/sam3u-ek/src/Makefile | 2 +- boards/arm/sam34/sam4cmp-db/src/Makefile | 2 +- boards/arm/sam34/sam4cmp-db/src/sam4cmp-db.h | 2 +- boards/arm/sam34/sam4cmp-db/src/sam_appinit.c | 4 ++-- boards/arm/sam34/sam4e-ek/src/Makefile | 2 +- boards/arm/sam34/sam4e-ek/src/sam_boot.c | 2 +- boards/arm/sam34/sam4l-xplained/src/Makefile | 2 +- boards/arm/sam34/sam4s-xplained-pro/src/Makefile | 2 +- boards/arm/sama5/giant-board/src/Makefile | 2 +- boards/arm/sama5/sama5d2-xult/src/Makefile | 2 +- boards/arm/sama5/sama5d3-xplained/src/Makefile | 2 +- boards/arm/sama5/sama5d3-xplained/src/sam_boot.c | 2 +- boards/arm/sama5/sama5d3x-ek/src/Makefile | 2 +- boards/arm/sama5/sama5d3x-ek/src/sam_boot.c | 2 +- boards/arm/sama5/sama5d4-ek/configs/elf/defconfig | 2 +- boards/arm/sama5/sama5d4-ek/src/Makefile | 2 +- boards/arm/sama5/sama5d4-ek/src/sam_appinit.c | 4 ++-- boards/arm/samd2l2/arduino-m0/src/Makefile | 2 +- boards/arm/samd2l2/arduino-m0/src/arduino_m0.h | 2 +- boards/arm/samd2l2/circuit-express/src/Makefile | 2 +- boards/arm/samd2l2/circuit-express/src/circuit_express.h | 2 +- boards/arm/samd2l2/samd20-xplained/src/Makefile | 2 +- boards/arm/samd2l2/samd21-xplained/src/Makefile | 2 +- boards/arm/samd2l2/saml21-xplained/src/Makefile | 2 +- boards/arm/samd5e5/metro-m4/src/Makefile | 2 +- boards/arm/samd5e5/metro-m4/src/metro-m4.h | 2 +- boards/arm/samd5e5/metro-m4/src/sam_bringup.c | 2 +- boards/arm/samd5e5/same54-xplained-pro/src/Makefile | 2 +- boards/arm/samd5e5/same54-xplained-pro/src/sam_bringup.c | 2 +- .../samd5e5/same54-xplained-pro/src/same54-xplained-pro.h | 2 +- boards/arm/samv7/same70-xplained/src/Makefile | 2 +- boards/arm/samv7/same70-xplained/src/sam_appinit.c | 4 ++-- boards/arm/samv7/same70-xplained/src/same70-xplained.h | 2 +- boards/arm/samv7/samv71-xult/src/Makefile | 2 +- boards/arm/samv7/samv71-xult/src/sam_appinit.c | 4 ++-- boards/arm/samv7/samv71-xult/src/samv71-xult.h | 2 +- boards/arm/stm32/axoloti/src/Make.defs | 2 +- boards/arm/stm32/axoloti/src/axoloti.h | 2 +- boards/arm/stm32/axoloti/src/stm32_bringup.c | 2 +- boards/arm/stm32/b-g431b-esc1/src/Make.defs | 2 +- boards/arm/stm32/b-g431b-esc1/src/b-g431b-esc1.h | 2 +- boards/arm/stm32/b-g431b-esc1/src/stm32_bringup.c | 2 +- boards/arm/stm32/b-g474e-dpow1/src/Make.defs | 2 +- boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig | 2 +- boards/arm/stm32/clicker2-stm32/src/Make.defs | 2 +- boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h | 2 +- boards/arm/stm32/clicker2-stm32/src/stm32_appinit.c | 8 ++++---- boards/arm/stm32/clicker2-stm32/src/stm32_bringup.c | 2 +- boards/arm/stm32/cloudctrl/src/Make.defs | 2 +- boards/arm/stm32/emw3162/src/Make.defs | 2 +- boards/arm/stm32/emw3162/src/emw3162.h | 4 ++-- boards/arm/stm32/emw3162/src/stm32_appinit.c | 4 ++-- boards/arm/stm32/emw3162/src/stm32_bringup.c | 2 +- boards/arm/stm32/et-stm32-stamp/src/Make.defs | 4 ++-- boards/arm/stm32/fire-stm32v2/src/Make.defs | 2 +- boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig | 2 +- .../arm/stm32/hymini-stm32v/configs/usbserial/defconfig | 2 +- boards/arm/stm32/hymini-stm32v/src/Make.defs | 2 +- boards/arm/stm32/maple/src/Make.defs | 4 ++-- boards/arm/stm32/mikroe-stm32f4/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f103rb/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f103rb/src/nucleo-f103rb.h | 2 +- boards/arm/stm32/nucleo-f103rb/src/stm32_bringup.c | 2 +- boards/arm/stm32/nucleo-f207zg/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c | 2 +- boards/arm/stm32/nucleo-f207zg/src/stm32_bringup.c | 2 +- boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig | 2 +- boards/arm/stm32/nucleo-f302r8/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f302r8/src/nucleo-f302r8.h | 2 +- boards/arm/stm32/nucleo-f302r8/src/stm32_bringup.c | 2 +- boards/arm/stm32/nucleo-f303re/configs/can/defconfig | 2 +- boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig | 2 +- boards/arm/stm32/nucleo-f303re/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f303ze/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c | 2 +- boards/arm/stm32/nucleo-f303ze/src/stm32_bringup.c | 2 +- boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig | 2 +- boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig | 2 +- boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig | 2 +- boards/arm/stm32/nucleo-f334r8/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f410rb/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f410rb/src/nucleo-f410rb.h | 2 +- boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c | 2 +- boards/arm/stm32/nucleo-f410rb/src/stm32_bringup.c | 2 +- boards/arm/stm32/nucleo-f412zg/src/nucleo-f412zg.h | 2 +- boards/arm/stm32/nucleo-f412zg/src/stm32_bringup.c | 2 +- boards/arm/stm32/nucleo-f429zi/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c | 2 +- boards/arm/stm32/nucleo-f446re/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f446re/src/nucleo-f446re.h | 2 +- boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c | 2 +- boards/arm/stm32/nucleo-f4x1re/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f4x1re/src/nucleo-f4x1re.h | 2 +- boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c | 2 +- boards/arm/stm32/nucleo-g431kb/src/Make.defs | 2 +- boards/arm/stm32/nucleo-g431kb/src/nucleo-g431kb.h | 2 +- boards/arm/stm32/nucleo-g431kb/src/stm32_bringup.c | 2 +- boards/arm/stm32/nucleo-g431rb/src/Make.defs | 2 +- boards/arm/stm32/nucleo-g431rb/src/nucleo-g431rb.h | 2 +- boards/arm/stm32/nucleo-g431rb/src/stm32_bringup.c | 2 +- boards/arm/stm32/nucleo-l152re/src/Make.defs | 2 +- boards/arm/stm32/olimex-stm32-e407/src/Make.defs | 2 +- .../arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h | 2 +- boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c | 2 +- boards/arm/stm32/olimex-stm32-h405/src/stm32_appinit.c | 4 ++-- boards/arm/stm32/olimex-stm32-h405/src/stm32_boot.c | 2 +- boards/arm/stm32/olimex-stm32-h407/src/Make.defs | 2 +- .../arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h | 2 +- boards/arm/stm32/olimex-stm32-h407/src/stm32_appinit.c | 6 +++--- boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c | 4 ++-- boards/arm/stm32/olimex-stm32-h407/src/stm32_bringup.c | 2 +- boards/arm/stm32/olimex-stm32-p107/src/Make.defs | 2 +- boards/arm/stm32/olimex-stm32-p107/src/stm32_appinit.c | 6 +++--- boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c | 4 ++-- boards/arm/stm32/olimex-stm32-p207/src/stm32_boot.c | 2 +- boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig | 2 +- .../arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig | 2 +- boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig | 2 +- boards/arm/stm32/olimex-stm32-p407/src/Make.defs | 2 +- .../arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h | 2 +- boards/arm/stm32/olimex-stm32-p407/src/stm32_appinit.c | 8 ++++---- boards/arm/stm32/olimex-stm32-p407/src/stm32_bringup.c | 2 +- boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig | 2 +- boards/arm/stm32/olimexino-stm32/src/Make.defs | 2 +- boards/arm/stm32/olimexino-stm32/src/stm32_boot.c | 2 +- boards/arm/stm32/omnibusf4/src/Make.defs | 2 +- boards/arm/stm32/omnibusf4/src/omnibusf4.h | 2 +- boards/arm/stm32/omnibusf4/src/stm32_bringup.c | 2 +- boards/arm/stm32/photon/src/Make.defs | 2 +- boards/arm/stm32/photon/src/photon.h | 4 ++-- boards/arm/stm32/photon/src/stm32_appinit.c | 4 ++-- boards/arm/stm32/photon/src/stm32_bringup.c | 2 +- boards/arm/stm32/shenzhou/src/Make.defs | 2 +- .../arm/stm32/stm3210e-eval/configs/composite/defconfig | 2 +- boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig | 2 +- .../arm/stm32/stm3210e-eval/configs/usbserial/defconfig | 2 +- boards/arm/stm32/stm3210e-eval/src/Make.defs | 2 +- boards/arm/stm32/stm3210e-eval/src/stm3210e-eval.h | 2 +- boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c | 2 +- boards/arm/stm32/stm3210e-eval/src/stm32_usbmsc.c | 2 +- boards/arm/stm32/stm3220g-eval/src/Make.defs | 2 +- boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig | 2 +- boards/arm/stm32/stm3240g-eval/src/Make.defs | 2 +- boards/arm/stm32/stm3240g-eval/src/stm3240g-eval.h | 2 +- boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c | 2 +- boards/arm/stm32/stm32_tiny/src/Make.defs | 2 +- boards/arm/stm32/stm32f103-minimum/src/Make.defs | 2 +- boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c | 2 +- boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c | 2 +- .../arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h | 2 +- boards/arm/stm32/stm32f334-disco/src/Make.defs | 2 +- boards/arm/stm32/stm32f3discovery/src/Make.defs | 2 +- boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c | 2 +- boards/arm/stm32/stm32f3discovery/src/stm32f3discovery.h | 2 +- boards/arm/stm32/stm32f411-minimum/src/stm32_bringup.c | 2 +- .../arm/stm32/stm32f411-minimum/src/stm32f411-minimum.h | 2 +- boards/arm/stm32/stm32f411e-disco/src/stm32_bringup.c | 2 +- boards/arm/stm32/stm32f411e-disco/src/stm32f411e-disco.h | 2 +- boards/arm/stm32/stm32f429i-disco/README.txt | 2 +- boards/arm/stm32/stm32f429i-disco/src/Make.defs | 2 +- boards/arm/stm32/stm32f429i-disco/src/stm32_appinit.c | 4 ++-- boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c | 2 +- boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h | 2 +- boards/arm/stm32/stm32f4discovery/README.txt | 2 +- boards/arm/stm32/stm32f4discovery/configs/elf/defconfig | 2 +- .../stm32/stm32f4discovery/configs/posix_spawn/defconfig | 2 +- boards/arm/stm32/stm32f4discovery/src/Make.defs | 2 +- boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c | 2 +- boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h | 2 +- boards/arm/stm32/stm32ldiscovery/src/Make.defs | 2 +- boards/arm/stm32/stm32ldiscovery/src/stm32_bringup.c | 2 +- boards/arm/stm32/stm32ldiscovery/src/stm32ldiscovery.h | 2 +- boards/arm/stm32/stm32vldiscovery/src/Make.defs | 2 +- boards/arm/stm32/stm32vldiscovery/src/stm32_bringup.c | 2 +- boards/arm/stm32/stm32vldiscovery/src/stm32vldiscovery.h | 2 +- boards/arm/stm32/viewtool-stm32f107/src/Make.defs | 2 +- boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c | 2 +- .../arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h | 2 +- boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Makefile | 2 +- .../arm/stm32f0l0g0/b-l072z-lrwan1/src/b-l072z-lrwan1.h | 2 +- boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c | 2 +- boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt | 2 +- boards/arm/stm32f0l0g0/nucleo-f072rb/src/Makefile | 2 +- boards/arm/stm32f0l0g0/nucleo-f072rb/src/nucleo-f072rb.h | 2 +- boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c | 2 +- boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt | 2 +- boards/arm/stm32f0l0g0/nucleo-f091rc/src/Makefile | 2 +- boards/arm/stm32f0l0g0/nucleo-f091rc/src/nucleo-f091rc.h | 2 +- boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_bringup.c | 2 +- boards/arm/stm32f0l0g0/nucleo-g070rb/src/Makefile | 2 +- boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h | 2 +- boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_bringup.c | 2 +- boards/arm/stm32f0l0g0/nucleo-g071rb/src/Makefile | 2 +- boards/arm/stm32f0l0g0/nucleo-g071rb/src/nucleo-g071rb.h | 2 +- boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_bringup.c | 2 +- boards/arm/stm32f0l0g0/nucleo-l073rz/src/Makefile | 2 +- boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h | 2 +- boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_bringup.c | 2 +- boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile | 2 +- .../stm32f0l0g0/stm32f051-discovery/src/stm32_bringup.c | 2 +- .../stm32f051-discovery/src/stm32f051-discovery.h | 2 +- boards/arm/stm32f0l0g0/stm32f072-discovery/src/Makefile | 2 +- .../stm32f0l0g0/stm32f072-discovery/src/stm32_bringup.c | 2 +- .../stm32f072-discovery/src/stm32f072-discovery.h | 2 +- boards/arm/stm32f7/nucleo-144/README.txt | 2 +- boards/arm/stm32f7/nucleo-144/src/Makefile | 2 +- boards/arm/stm32f7/nucleo-144/src/stm32_boot.c | 2 +- boards/arm/stm32f7/stm32f746-ws/src/Makefile | 2 +- boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c | 2 +- boards/arm/stm32f7/stm32f746g-disco/src/Makefile | 2 +- .../stm32f7/stm32f746g-disco/src/stm32_appinitialize.c | 2 +- boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c | 2 +- .../arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h | 2 +- boards/arm/stm32f7/stm32f769i-disco/src/Makefile | 2 +- boards/arm/stm32f7/stm32f769i-disco/src/stm32_bringup.c | 2 +- .../arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h | 2 +- boards/arm/stm32h7/nucleo-h743zi/src/Makefile | 2 +- boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h | 2 +- boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c | 2 +- boards/arm/stm32h7/nucleo-h743zi/src/stm32_bringup.c | 2 +- boards/arm/stm32h7/nucleo-h743zi2/src/Makefile | 2 +- boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h | 2 +- boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c | 2 +- boards/arm/stm32h7/nucleo-h743zi2/src/stm32_bringup.c | 2 +- boards/arm/stm32h7/stm32h747i-disco/src/Makefile | 2 +- boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c | 2 +- boards/arm/stm32h7/stm32h747i-disco/src/stm32_bringup.c | 2 +- .../arm/stm32h7/stm32h747i-disco/src/stm32h747i-disco.h | 2 +- boards/arm/stm32l4/b-l475e-iot01a/src/Makefile | 2 +- boards/arm/stm32l4/b-l475e-iot01a/src/b-l475e-iot01a.h | 4 ++-- boards/arm/stm32l4/b-l475e-iot01a/src/stm32_appinit.c | 4 ++-- boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c | 2 +- boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig | 2 +- boards/arm/stm32l4/nucleo-l432kc/src/Makefile | 2 +- boards/arm/stm32l4/nucleo-l452re/src/Makefile | 2 +- boards/arm/stm32l4/nucleo-l452re/src/nucleo-l452re.h | 2 +- boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c | 2 +- boards/arm/stm32l4/nucleo-l476rg/src/Makefile | 2 +- boards/arm/stm32l4/nucleo-l496zg/src/Makefile | 2 +- boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c | 2 +- boards/arm/stm32l4/stm32l476-mdk/src/Makefile | 2 +- boards/arm/stm32l4/stm32l476-mdk/src/stm32_appinit.c | 4 ++-- boards/arm/stm32l4/stm32l476-mdk/src/stm32_bringup.c | 4 ++-- boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h | 2 +- boards/arm/stm32l4/stm32l476vg-disco/src/Makefile | 2 +- boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c | 4 ++-- boards/arm/stm32l4/stm32l4r9ai-disco/src/Makefile | 2 +- boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c | 4 ++-- boards/arm/stm32l5/nucleo-l552ze/src/Makefile | 2 +- boards/arm/stm32l5/nucleo-l552ze/src/nucleo-l552ze.h | 2 +- boards/arm/stm32l5/nucleo-l552ze/src/stm32_bringup.c | 2 +- boards/arm/stm32l5/stm32l562e-dk/src/Makefile | 2 +- boards/arm/stm32l5/stm32l562e-dk/src/stm32_bringup.c | 2 +- boards/arm/stm32l5/stm32l562e-dk/src/stm32l562e-dk.h | 2 +- boards/arm/str71x/olimex-strp711/src/Makefile | 2 +- boards/arm/tiva/dk-tm4c129x/src/Makefile | 2 +- boards/arm/tiva/eagle100/configs/nxflat/defconfig | 2 +- boards/arm/tiva/eagle100/src/Makefile | 2 +- boards/arm/tiva/ekk-lm3s9b96/src/Makefile | 2 +- boards/arm/tiva/launchxl-cc1310/src/Makefile | 2 +- boards/arm/tiva/launchxl-cc1310/src/cc1310_appinit.c | 4 ++-- boards/arm/tiva/launchxl-cc1310/src/cc1310_bringup.c | 2 +- boards/arm/tiva/launchxl-cc1310/src/launchxl-cc1310.h | 2 +- boards/arm/tiva/launchxl-cc1312r1/src/Makefile | 2 +- boards/arm/tiva/launchxl-cc1312r1/src/cc1312_appinit.c | 4 ++-- boards/arm/tiva/launchxl-cc1312r1/src/cc1312_bringup.c | 2 +- boards/arm/tiva/launchxl-cc1312r1/src/launchxl-cc1312r1.h | 2 +- boards/arm/tiva/lm3s6432-s2e/src/Makefile | 2 +- boards/arm/tiva/lm3s6965-ek/configs/qemu-nxflat/defconfig | 2 +- boards/arm/tiva/lm3s6965-ek/src/Makefile | 4 ++-- boards/arm/tiva/lm3s8962-ek/src/Makefile | 2 +- boards/arm/tiva/lm4f120-launchpad/src/Makefile | 2 +- boards/arm/tiva/tm4c123g-launchpad/src/Makefile | 2 +- boards/arm/tiva/tm4c1294-launchpad/src/Makefile | 2 +- boards/arm/tiva/tm4c1294-launchpad/src/tm4c_appinit.c | 4 ++-- boards/arm/tms570/launchxl-tms57004/src/Makefile | 2 +- boards/arm/tms570/launchxl-tms57004/src/tms570_appinit.c | 4 ++-- boards/arm/tms570/tms570ls31x-usb-kit/src/Makefile | 2 +- .../arm/tms570/tms570ls31x-usb-kit/src/tms570_appinit.c | 4 ++-- boards/arm/xmc4/xmc4500-relax/src/Makefile | 2 +- boards/arm/xmc4/xmc4700-relax/src/Makefile | 2 +- boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig | 2 +- boards/avr/at90usb/teensy-2.0/src/Makefile | 2 +- boards/avr/at90usb/teensy-2.0/src/at90usb_appinit.c | 4 ++-- boards/boardctl.c | 8 ++++---- boards/hc/m9s12/demo9s12ne64/src/Makefile | 2 +- boards/hc/m9s12/ne64badge/src/Makefile | 2 +- boards/mips/pic32mx/mirtoo/src/Makefile | 2 +- boards/mips/pic32mx/pic32mx-starterkit/src/Makefile | 2 +- boards/mips/pic32mx/pic32mx7mmb/src/Makefile | 2 +- boards/mips/pic32mx/pic32mx7mmb/src/pic32_appinit.c | 8 ++++---- boards/mips/pic32mx/pic32mx7mmb/src/pic32_bringup.c | 2 +- boards/mips/pic32mx/pic32mx7mmb/src/pic32mx7mmb.h | 2 +- boards/mips/pic32mx/sure-pic32mx/src/Makefile | 2 +- boards/mips/pic32mx/ubw32/src/Makefile | 2 +- boards/mips/pic32mz/chipkit-wifire/src/Makefile | 2 +- boards/mips/pic32mz/chipkit-wifire/src/pic32mz_appinit.c | 4 ++-- boards/mips/pic32mz/flipnclick-pic32mz/src/Makefile | 2 +- .../mips/pic32mz/flipnclick-pic32mz/src/pic32mz_appinit.c | 4 ++-- boards/mips/pic32mz/pic32mz-starterkit/src/Makefile | 2 +- .../pic32mz/pic32mz-starterkit/src/pic32mz-starterkit.h | 2 +- .../mips/pic32mz/pic32mz-starterkit/src/pic32mz_appinit.c | 4 ++-- boards/or1k/mor1kx/or1k/src/Makefile | 2 +- boards/or1k/mor1kx/or1k/src/or1k.h | 2 +- boards/or1k/mor1kx/or1k/src/or1k_bringup.c | 2 +- boards/renesas/rx65n/rx65n-grrose/src/rx65n_appinit.c | 8 ++++---- boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c | 4 ++-- boards/renesas/rx65n/rx65n-grrose/src/rx65n_grrose.h | 2 +- boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_appinit.c | 8 ++++---- boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c | 4 ++-- boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h | 2 +- boards/risc-v/bl602/bl602evb/src/Makefile | 2 +- boards/risc-v/c906/smartl-c906/src/Makefile | 2 +- boards/risc-v/esp32c3/esp32c3-devkit/src/Makefile | 2 +- boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h | 2 +- .../risc-v/esp32c3/esp32c3-devkit/src/esp32c3_appinit.c | 4 ++-- .../risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c | 2 +- boards/risc-v/fe310/hifive1-revb/src/Makefile | 2 +- boards/risc-v/k210/maix-bit/configs/elf/defconfig | 2 +- boards/risc-v/k210/maix-bit/configs/module/defconfig | 2 +- boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig | 2 +- boards/risc-v/k210/maix-bit/src/Makefile | 2 +- boards/risc-v/litex/arty_a7/src/Makefile | 2 +- boards/risc-v/mpfs/icicle/src/Makefile | 2 +- boards/risc-v/rv32m1/rv32m1-vega/src/Makefile | 2 +- boards/sim/sim/sim/configs/lvgl/defconfig | 2 +- boards/sim/sim/sim/configs/ostest/defconfig | 2 +- boards/sim/sim/sim/configs/touchscreen/defconfig | 2 +- boards/sim/sim/sim/src/Makefile | 4 ++-- boards/sim/sim/sim/src/sim_appinit.c | 4 ++-- boards/x86/qemu/qemu-i486/src/Makefile | 2 +- boards/x86/qemu/qemu-i486/src/qemu_appinit.c | 4 ++-- boards/x86_64/intel64/qemu-intel64/src/Makefile | 2 +- boards/xtensa/esp32/esp32-devkitc/src/Make.defs | 2 +- boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h | 2 +- boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c | 4 ++-- boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c | 2 +- boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs | 2 +- .../esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h | 2 +- .../xtensa/esp32/esp32-ethernet-kit/src/esp32_appinit.c | 4 ++-- .../xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c | 2 +- boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs | 2 +- .../xtensa/esp32/esp32-wrover-kit/src/esp32-wrover-kit.h | 2 +- boards/xtensa/esp32/esp32-wrover-kit/src/esp32_appinit.c | 4 ++-- boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c | 2 +- boards/xtensa/esp32s2/esp32s2-saola-1/src/Make.defs | 2 +- .../xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h | 2 +- .../xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_appinit.c | 4 ++-- .../xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c | 2 +- boards/z16/z16f/z16f2800100zcog/src/Makefile | 2 +- boards/z80/ez80/makerlisp/src/Makefile | 2 +- boards/z80/ez80/makerlisp/src/ez80_bringup.c | 2 +- boards/z80/ez80/makerlisp/src/makerlisp.h | 2 +- boards/z80/ez80/z20x/src/Makefile | 2 +- boards/z80/ez80/z20x/src/ez80_bringup.c | 2 +- boards/z80/ez80/z20x/src/z20x.h | 2 +- include/nuttx/board.h | 2 +- include/sys/boardctl.h | 8 ++++---- include/sys/syscall_lookup.h | 2 +- libs/libc/pthread/Kconfig | 2 +- syscall/syscall.csv | 2 +- 538 files changed, 629 insertions(+), 629 deletions(-) diff --git a/Documentation/reference/user/13_boardctl.rst b/Documentation/reference/user/13_boardctl.rst index 2e6a973bd2..2195db2283 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 d77109d301..8041637e34 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 751c0a1f34..9b01091bef 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -3316,14 +3316,14 @@ config BOARD_INITRNGSEED can then provide early entropy seed to the pool through entropy injection APIs provided at 'nuttx/random.h'. -config LIB_BOARDCTL +config BOARDCTL bool "Enable boardctl() interface" default n ---help--- Enables support for the boardctl() interface. Architecture specific logic must provide board_app_initialize() interface. -if LIB_BOARDCTL +if BOARDCTL config BOARDCTL_FINALINIT bool "Enable board app final init" @@ -3474,4 +3474,4 @@ config BOARDCTL_IOCTL Enables support for board-specific boardctl() commands. Architecture specific logic must provide board_ioctl() interface. -endif # LIB_BOARDCTL +endif # BOARDCTL diff --git a/boards/Makefile b/boards/Makefile index 40b3977ff7..2663c7e994 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 d2ed3212a1..dc88386a29 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 09c090b500..ab49d05691 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 b55c409a0c..0292d96566 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 9936bbf520..1920ec69b9 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 ad3ffccf9b..72d762b368 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 bb003319a4..cdd4585751 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 b0d32bef98..c4c2b44f0b 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 5134063f5c..a2c13552f3 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 11ebaee3df..ad39da80bd 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 d22bd8a528..1bb84d5462 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 12976b19da..b9a81a5a7b 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 92b1187655..025ff6b67c 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 4045769c49..a4ad6b8c07 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 e00b8e1d81..cc48605f55 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 aa1cfa2712..954420d700 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 013c174481..bc6130d5d3 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 2a750867cb..b969a8aaf3 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 8295c635d8..1300349ff1 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 1cf40ed9d5..7020a31015 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 4dc70ed4f8..a817775f48 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 5c4dcc32ce..0112890657 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 e67334b567..6381e1484d 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 fdfdd9ed4a..fa689f3ac2 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 531063a401..7ed1c4982e 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 91a7f15497..8df90ba5e4 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 ed36604898..9a8880b394 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 83f0af1033..d5d9daa5e6 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 3a6df23e7e..6222c28e85 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 ef6d395129..3ad472fbca 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 dcdd8fb5fe..154af50909 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 d16e498c3f..bb07ed00c7 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 45fd5f5418..bffdbca9ea 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 8376c5d1d3..17894c2365 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 fa67a2b409..31f4398b0e 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 d31beb0036..9a838f9d94 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 09cb334a47..97ba5d23e4 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 188d53d3c4..5f40526c94 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 9faaa91704..57b0bfac86 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 bd712ab63a..cd6a5b693d 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 744266dcbd..84fde55a64 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 d29d5a2d2d..b81ff18598 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 ed9777b118..0ab2c204e4 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 97d80ebe24..e9c734c0d2 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 2985282136..00ec7b2787 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 96d3224cc3..b5df56315e 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 8cf32b832c..53501be86d 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 e84563f686..5e2158e1cd 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 9fc795425a..264a40c0fb 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 08fa69df39..abc3f6452e 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 f3517d6f67..c08a0a5314 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 7cde85a092..925c4b3dc9 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 306c4227be..fa34fef660 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 b0cfe78707..c0bc7c4e04 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 265bb77d7d..679752eba9 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 0760b31a14..a83d088793 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 e36e935802..fbf0f13d4d 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 34289eff92..eaefd8e7f1 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 f5c03171af..323d3763d6 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 0bf0c13b52..ffbfb04ccc 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 6867afc192..db046e03ac 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 3bad359cd1..592894cd3b 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 b82011c4cb..b42ffaf93b 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 b607906e1a..d8b53e2d5b 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 7032e55688..fafa2397c5 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 ad17afe7ac..5eb039bb97 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 56de1a43e0..98a106350f 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 b2d57c0058..5f2ff4d4db 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 c7a1ed33d0..0f21d8a342 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 af99ffc075..1e0b1e3ce6 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 c9cb9965d2..7a03352587 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 4f9bc98e27..4c47891eda 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 09de6383e5..f366e25fb6 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 f99e0b5913..63fda698ca 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 ee96c36191..c8ba75d2d0 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 1d9c7f0e0e..4c8f17d5ed 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 2b536a0694..c2cd7f6328 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 dcb5981fc8..38f18cd447 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 0b98814a17..69fb4e59ec 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 b6d9057803..73b3eb0238 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 46bf3e7382..d17c3d74c4 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 06f55d4e5f..0b8c078e6c 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 f9dd583ed7..72d01570e0 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 97ac5ec947..93b563333e 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 7d94a014f5..50493bd42b 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 363f5b0edc..136ab78e15 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 cac2ca20b3..3d434c4d10 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 74625033bb..4911c496a7 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 db0356bda9..fe2944e29d 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 a66d9ac4cf..7044b3f0ae 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 4dfb4f6c37..f7cb77c958 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 11cede9452..4b3e822ebd 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 c47b8ff8d7..faae54bf7c 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 7de83859ec..d0944ce3c4 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 98cb024bd5..e973e403f8 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 d8273a881f..378f48088d 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 254a052f13..dd8bfe9968 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 87e85e33b4..d48fa9ff57 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 483d836f44..cd238ddc66 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 f193363d2b..469353d4f2 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 d36b61a681..fd8ce7a3cf 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 1e38412e04..83e5cde5ef 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 41ce8fc03d..f7b8a79f21 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 68415327b5..6a58c8b662 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 cfcee9f936..22ae98f15a 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/Makefile +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/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_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 7c2e9c0986..a27ab8a86b 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 6a9dc47477..d52227e634 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 26aa1ec187..2b7f08e6e9 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 4e0a1e6474..5a9274cc07 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 b686cbab37..13afbcb7c4 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 e20652bf9a..b52f071cd8 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 9d8ac25a93..fa046a0beb 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 d93ba4074e..06aa7f0e02 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 d493757bf9..1a3cdaee01 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 c158df5a3d..204429c316 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 14380ea0e9..d8b8831af5 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 aec132da3a..5f07e77ee2 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 d634610b6c..8deabf2a3a 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 5041ee757e..e402637209 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 eb1bf64423..b669b3cde4 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 208434791a..e251651d6e 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 2513ff0e63..27863c6b77 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 0ab4b62980..33e8e4e504 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 3f80e3d013..083cec7af3 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 3a393fabca..6884e3dace 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 7d5187d8b9..4d6c6802cd 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 4ec5240e50..b6ad5cbc10 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 1b9e028399..a6e2c78168 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 cfb05da18f..9fee06bff5 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 7a7af16599..ff004e119d 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 969ce3d3ff..5e32460f60 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 ee935317ef..5a478e5249 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 7303f4b251..783c7434fe 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 88d72d2316..49f67b46f6 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 71467bfa33..b92e452c57 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 8c49f8d488..e3a379be88 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 c6f194745f..43f7c7673e 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 c6c35cecc1..0ecfda0fad 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 8189ffba68..c73a0f9db0 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 fcfa59eca5..0dfb4cd0b4 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 77ac78e964..0f273bc7cf 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 902d692b12..ffe2bbdb39 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 1127ef09f1..8674dfa0dd 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 6983bfdde5..fde9891146 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 4d653fe773..964389eb6a 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 16be54dabe..69cf23a510 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 2cc8494654..4a96237bf6 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 6e4690d8b8..7a809a66b9 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 e8e18178bc..e2f688fb5a 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 b4d0709a4f..1ad015a417 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 1a16535c2d..dc5369e9a0 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 5947d7e2a2..89a2d75791 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 dc553e540f..a4455bfff3 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 80d300a423..aba9a82da6 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 e14cd7537b..d20327b525 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 e449d5c071..9a2eaab57f 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 a221160ed9..5205831ab1 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 ecec80fc52..38b25f2f5d 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 0da50ac701..ddd6f40057 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 1fd10e41d1..62945e995a 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 700617066b..eec9107ef1 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 2ea5dfb5ef..4bae76ccca 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 9008c3c2e2..f57a8f73d6 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 88564e360c..6d69213f68 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 2e67204b3d..a37f828f56 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 e243c54a94..fbfba905a5 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 b5b6fee97a..6ec7aaf99d 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 3dec9b390c..9dda898183 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 c8f5a6dd92..37665e80cc 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 2867f9d96a..a6d1543687 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 21bc79f3fe..7641ac32c3 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 afe9642e30..f5514896fc 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 30baefc0ce..399236b333 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 27e94e57f4..b4a3f8a777 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 c7102bbbea..be0e2b33eb 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 feab33a0fa..16d58f8552 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 b08c72c690..0280521641 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 7029d1fec7..cc17298511 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 03251a7f6f..98d5d8460c 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 df9a94e332..8071638b91 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 0b89fa6e09..3689d8e6a8 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 7d9e127931..0d7b6a5fd9 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 4b4fd9f4f8..15ebdd1e83 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 a7c29a3d02..d31528ac9f 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 58936e0a16..74dd01f0de 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 9fe13b4ee6..521b6cab6d 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 ba57478323..6c6b035a28 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 a0ba8e45db..0c62177ff9 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 b233920575..071956f6ed 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 3da9b806b9..9388bb3fd3 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 1bc942ca83..998a303287 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 0c7ec78ada..471fa1311c 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 a4e5710820..a27f835fac 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 e210f706ae..c1384990a5 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 6967e179b9..124e63fdb1 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 9bb79c2f0d..44673450ff 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 38582935a3..2e31673bdc 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 a03264b03a..897533cccb 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 4e05e48193..ce13f2c6e7 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 2c8bf1860d..8aef6db2a4 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 9087999e7a..6761d6c215 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 43ff0d517e..dc3b6d42db 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 a513062b8e..e0b4338a43 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 526dc75d55..aba88630d9 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 8a0e9a87f2..3a726b8691 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 4d851c5dec..51a41aad7a 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 1a18d06618..b1827729d7 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 3099fb59b3..fa452cde7b 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 7c23f7893e..33ccd4d567 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 343f0068d4..f00c4dbf5a 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 c7ee161afc..a0ce185aed 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 2045ff2c40..d8a356b482 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 d69fa08456..71c9e37681 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 c1a08b29ef..88fbd4dafc 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 be372df84d..450ba85a38 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 edd66adcf8..166e3e3ed2 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 adee74a39e..5788944f14 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 c9a79b9793..c9725528b4 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 7f442d7a36..bab3b6e35a 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 605e305227..2c894a09bf 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 4f709b266b..f2e13490c9 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 499161f9d1..6a9e42ae2a 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 b218e28e0b..abb672623d 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 9fa6e5d517..cc0ea85602 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 d9189cf551..7e4bbf7855 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 1b49e154f1..bade330e08 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 eead0c2cdd..13213c1f9e 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 11ef7edce3..5c94ee0620 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 6be0441e03..4bac11df23 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 937006154f..1915bf50e1 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 7e8dddd4bc..df5c24d134 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 1ee0c6bf21..e05baf8552 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 bbc78eb0d8..7bec4d1238 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 8ff620dfcc..faf66cd73a 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 fd710c4c74..b926e54a24 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 9465f55cb4..c719bea4f0 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 148bca4cb9..32b9759530 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 42565e5f27..a401b2453a 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 7bfe030de0..4b5e8ddad8 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 56ed037bca..898242da39 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 6c1664d949..50a05fe31b 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 aee173753b..1a8896280f 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 224be0a894..066cf5b9be 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 1a3285eb0c..81d69eb7f4 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 be0f65e9d4..fcccc9b7b9 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 9d818b7e7e..b742456dbd 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 83d48b5007..3dedaf0d48 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 529be69aca..7ef7dcc605 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 952b914a7d..5dba0567d9 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 bc98d8818a..5e43c74d1d 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 175823c11e..99ecead7df 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 bb5371d613..092b3ffd76 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 32a1ad309a..49f7e6faa8 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 c8ab2879ce..e7552c1af2 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 93962c1ea4..c3f8d7c6a6 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 08e51fc45d..a2c8477004 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 27e23ee34d..4186452145 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 05bcbf5f7a..422c76fedb 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 fb0bb1f4ea..ba8edb72d7 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 c40fb82b08..fe60328057 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 296fed8d71..1dbf2801ab 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 b47d2e4aff..44a7778609 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 7e8267c02b..2b19ab7c05 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 f503727d02..e77b4e06a0 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 118429ee1e..773e1ff6e6 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 5a5daae9d2..8c693d2e14 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 cd0469789a..9e3283353f 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 1983d26dc3..33d30903c6 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 f462d8923c..23a6e7a603 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 c1da1a7e71..f56e628f85 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 80257f475a..241279d31a 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 eb1eef274f..bebb9984c7 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 1afa58eba0..76e151fe47 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 6200a53279..04ffbe62cd 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 c0f56f74e0..aa427c4c21 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 f6d81dfacc..a7bb9d375b 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 92592a9073..bb4f1eb4be 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 68cf2bc510..68646de44c 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 3f1010588a..5ca11201f8 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 f7b2ea7d2d..2a0ca28fe2 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 ddcf2b5adf..309cde316b 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 05ff939b2b..9df8f5a914 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 eb19f86693..71a30894f7 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 2efa47e4ec..8a0a2b53ae 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 7cc5dc6455..b205c70d93 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 5d568a0493..d9fab81cf0 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 2310731dfa..c2f8f22482 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 081a9e9716..52d0b936a6 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 3e228ed4ec..e5cab48260 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 0f05ee3f73..e2456502f9 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 953a8225ee..772bd5533f 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 f7b04216a9..45cffc4c07 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 48d23d1b49..b2fee252dd 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 415b1b5950..8dd84b094d 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 3bb8bb7d2d..5f9be9d301 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 e33963c2b4..3c2aee281e 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 5ec5973ab2..bd95d70970 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 95cd24b0a4..634e052f1b 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 be64b9bfe1..b7fd62bd86 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 9af3a12832..4bfdbaaf56 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 2f2045dbf1..a7b897dc22 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 8f125e4cc0..020d45b620 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 1e4b623730..f3bd1c4d05 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 257dde61f3..7993af97a0 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 e54abf2cd8..19878ca6af 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 9f10a60f06..d1093276ad 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 bd27dafe09..d3a175df1d 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 623213128a..e450d9be24 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 fa8bf046ee..95f8c262ad 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 de20f94af4..3441b64c5f 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 5412c598d7..74a533e32e 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 15f7fbe126..6903daf347 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 ac137847f5..ef1d138316 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 b49064ecb1..0b69a85d78 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 68c3f4cbd1..bc3ce6a347 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 a04dd951bd..fb3ec1e4ae 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 d752b84882..cfc00e8e7c 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 d241100395..274bd07c21 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 68a5336027..345e8b509d 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 ee4bd50f21..ec592b61c6 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 92a61e2f48..10587b44bc 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 590f3f40ac..ccec2ef26b 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 65f51fe1bd..15983fad19 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 27db124d5c..ba05cbdbc6 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 7ae87bea9f..8b8f06bb94 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 d8df63d938..12ecf9516f 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 bb120cf9c4..89be1eb2f5 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 1a13b3e0cf..63cf065fee 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 d3af59f13a..a73416e280 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 824c26ed9f..3406d8da1d 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 a880cb1a54..7aefa12e23 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 f889feb3fa..f58d84d8a3 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 8e6c8df190..260b1729c9 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 f8686c6408..9d15d35b6c 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 90cbde14de..3c453165b6 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 31d1e1fc38..8c74e25f44 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 5647acb2ca..a89185e246 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 b5841775be..ddb99c2035 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 76f5d26d48..4d2d6dea00 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 7fc316bf3c..0376d0a13f 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 fae7279db1..9b118e1a69 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 cafe505c0c..3d4c47b7f5 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 417fd02167..8bd7100f6c 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 71fe3cde3f..ef39d0e144 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 3de08262b9..168002d85e 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 6d2ec4f4d6..74cd7ae497 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 827a6bcaae..83f1e15418 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 b018ecb8fb..ff53631f24 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 cbeed78245..b392e8f985 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 4dff107f84..9590568f57 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 f76db4d243..0b0a853f5c 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 c03579e0c1..9c83c4b20e 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 9d8dab60b5..0f20f01396 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 a58dd6a0e0..473cf70a1f 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 cc5c828d67..75fc1d9740 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 413902e7e5..d4ec1b91f2 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 b6dc96afd6..f2a5b8753d 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 c4b0017c4f..a3a43afe80 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 7d1508f135..ab32f3c678 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 df31b1ce70..4284ea7d5a 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 f9ffd9184e..0b841f82db 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 6da1198bef..8d0da56d3d 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 58685da10c..df10d9584a 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 45bc6e162d..a7a93c155b 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 2c004c4266..2f1d79763a 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 023b6ce97b..cf199b706c 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 b6ffbdaadd..80efb272d9 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 0809a15144..dc90db16a0 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 425fc42dc2..e1a4a6f061 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 983e29f2e0..d5b7529c30 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 36e5e2ca6a..fbe3a16190 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 21fdc77b03..b67acf6c5d 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 a31910389d..7c1d8ee7d8 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 cad3c4fd92..538ac1bf8e 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 b0ec7084c1..c03b193c38 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 468f0dbaec..888aed933b 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 08d2f4b809..927432a972 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 ed59b8eb04..6625409e3a 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 4ee4da3e5f..3f2412100a 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 2bb346d01c..da813a67c0 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 3a16c76304..4364c5e4ea 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 463753b160..0c6ff396fe 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 0aaed5f38c..9d0eb6a438 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 296c50720c..cf5120f6ea 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 dd70c64525..29f88446ab 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 f4f2789000..c4857b1cc5 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 b04036d9c3..aa6b18acc9 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 60d280b5f4..7df48a10a9 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 e94ae21c89..925902786a 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 797b87602c..d3ee740c78 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 fedb48e839..674d5b2ede 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 ff0a057fa6..dd380c8683 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 ff12e3be2a..c2335a5fec 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 1bffd62c54..4f16cbf2ea 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 408f325a35..609fd1701f 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 28ea554d8f..a93dbb745b 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 1bae26fb0a..8d0ba13542 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 5d81cc4d04..7a59423a5a 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 7f7beed089..76ad1323cd 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 19d57c21bb..02ca7ed584 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 95aeb13a32..f33e03ef08 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 a57364a886..dfa8a4d220 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 3876008b68..62a122b85f 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 e86970003a..1ff5f5189b 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 11e4029dd0..a17654baf1 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 a6cb501be6..3b42ce70dd 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 fb55a2b3fd..83a4d06242 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 962340cb53..a06236118b 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 fc6fdcd884..236b7edc5f 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 c9d2e42de2..82ee078190 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 aa25c3c081..2541ac8d66 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 0014486d7c..7ada3fd731 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 e47755b4a9..558da628cb 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 2c7f56d4bc..8800a5b43b 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 ec336c11fa..87fcfb5941 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 57232d61d2..dcbbcde529 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 7e4fee97e4..b13b7cafb9 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 4085c6187e..402792028e 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 c6329079bb..be88bbcbea 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 e6b14ba9a1..dc92dfe339 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 590a82134a..cc03a82793 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 9455a1c230..b7ace74daf 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 6838537552..d36d70faa8 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 a91b8ede55..53e480c867 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 7120a37288..24e84fe2e0 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 2dfd923051..f85d33e4e5 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 9012b18536..efb855d8de 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 23e30aaa98..583d96ba11 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 717113dfa1..0caf1821e2 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 8259a3cefa..e269a3d920 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 c1680d81fe..0618569dbc 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 58803feeb4..8b11940b29 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 ac7fd49471..8140a55ddb 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 388d3943f5..0d4fbe28e7 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 f8e02a2eb9..c29e6af176 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 e0a8bdf74a..2becfe2a63 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 91d45738c6..ef0288019f 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 3ae81f2237..4a4dc25922 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 4f679206ea..6e8ef17853 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 49f4238ed0..cfc25182ff 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 1d397a872f..ea445e70af 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 4c1c59e361..0d3724f44a 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 acfcacebb9..e60ed356c2 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 7b92457232..714b5e89a9 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 a68636b26c..320996b8b3 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 4a8c9d9dc1..fc409011ea 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 7022d59ed3..9497bb9424 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 52ea9ccd47..87e3452492 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 3bf3538b57..b9dc71f649 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 f04de59acf..10843f2744 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 0bffd3fe36..ad8d985036 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 40fc60b79c..c781dd380d 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 e6e28d0403..89351840f5 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 e438de87ae..463afc99a6 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 ecdbcca2e0..38ec1525a3 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 d047ad94f4..ff337085d4 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 9494c4a551..0ffda84858 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 caeef629a8..c3812f35aa 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 4f157098b2..78d96e8294 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 */ @@ -615,7 +615,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() */ @@ -805,4 +805,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 1a6ffe0e6c..9b38bf214b 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 f3cabde102..221cea6d3b 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 0890125b55..4c6e50a4f0 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 6d5a4828f9..110d61667b 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 fdf2380b89..414532c234 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 dc7f5f01ab..be83b542c6 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 8f05de033e..5de25d9532 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 b6299f3f19..ac98a58d8a 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 5931024d18..bbb49df3bb 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 84194666a8..5c423587a6 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/chipkit-wifire/src/Makefile b/boards/mips/pic32mz/chipkit-wifire/src/Makefile index 148498974b..f0e3ea77d2 100644 --- a/boards/mips/pic32mz/chipkit-wifire/src/Makefile +++ b/boards/mips/pic32mz/chipkit-wifire/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/chipkit-wifire/src/pic32mz_appinit.c b/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_appinit.c index f6c73767c3..d4ad704e9a 100644 --- a/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_appinit.c +++ b/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_appinit.c @@ -28,7 +28,7 @@ #include "chipkit-wifire.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/flipnclick-pic32mz/src/Makefile b/boards/mips/pic32mz/flipnclick-pic32mz/src/Makefile index 34ae8af0be..1297092071 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 d289e10431..e03904a2f2 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 17e9f3f1b9..bbb49bc9ef 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 4c9dba4ca2..f59019328b 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 49b815faa7..9f462b90ea 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 0a52502731..3f7daeb6ce 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 f362cfe469..199179e3dc 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 faada664b4..f2fbcd0c01 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 47e0cfeca1..a26b2abf84 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 5794c87194..740ecf021e 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 6d274048ef..7391c58e7a 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 17e26a934b..212e827a9e 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 e5a33f0c6f..613b7cc8e5 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 4a9e100931..9ca33e9749 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 020b705fb2..0fd6eb4275 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 4b5f2c7253..86dffec6b3 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 661da923f4..a9921e8448 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 de523f7679..0d5f4e73c0 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 91789a7533..4f683dc85c 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 320753fdca..606946e783 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 bc4d129599..a6982047cf 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 2891824477..a4a3eaa652 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 e02419c5ce..3c124d84de 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 7f37c25e34..1c23c0a709 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 3810b26be4..e70a4d1374 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 d3ef7201b2..7b9f5bfbbd 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 fc6753297b..8dc195e8b4 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 426d902ed5..02ae18cf99 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 b860855ad2..eb0e9a4339 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 7cc4399c05..c05ded0832 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 ca3eaa441d..92a6692b1f 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 fc87cdd3df..80bad72b87 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 a7b40b4064..f74e614d55 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 e2bb0db45e..d1903aef70 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 578e5846c6..188a06c1ff 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 22c3cd465a..7bdacd1f3c 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 9e6e40ecdc..a3ef9b5ce1 100644 --- a/boards/xtensa/esp32/esp32-devkitc/src/Make.defs +++ b/boards/xtensa/esp32/esp32-devkitc/src/Make.defs @@ -24,7 +24,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 688de84d0c..6ed828ef0c 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 37b6622301..4f51ea7914 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 73c100e4b8..c1c79bfce1 100644 --- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c @@ -113,7 +113,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 6c489fc9c7..112b843158 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs +++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs @@ -24,7 +24,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 cb426aaa01..83107c3b0c 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 8d38c04a6b..4366443aa0 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 e1875b5e41..a830c3c961 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 90a8e8369b..2c5d68946b 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs +++ b/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs @@ -30,7 +30,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 63da316764..6d54a5c6ad 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 8016b7c47b..d8eb27deb7 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 a9ee883427..b7517d225d 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 2cea2d8af8..82b43c3f7a 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 fad196f5be..740100db05 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 94eef2d5d4..ee5ea3524c 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 171172eb67..92a7c657c1 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 395a71bb0a..e7d511e76f 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 91de320364..5e31c74596 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 d1d76dd096..263c7568b0 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 0a6a80d938..b9205ffd5c 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 317f10cfaa..7f79a50c26 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 dbd2a6f393..e780ded506 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 38c71c3412..7c8b1276cc 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 34d2897d5e..f379a41ef6 100644 --- a/include/nuttx/board.h +++ b/include/nuttx/board.h @@ -454,7 +454,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 42ae3a4491..a1059ec579 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 @@ -457,5 +457,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 c266f729a4..b520a2f508 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 868e1ab423..306d80600d 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 44266c1bd2..adcafe5313 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"