You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/12/24 14:23:39 UTC
[incubator-nuttx] branch master updated (36389da -> 412d030)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 36389da Add board support to SHT3X sensor
new 10ccba6 init: move USERMAIN_XX out of INIT_ENTRYPOINT
new 0bb32f2 init: use exec_spawn instead of exec
new 412d030 boards: move USERMAIN_XX out of INIT_ENTRYPOINT
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Documentation/applications/nsh/installation.rst | 6 +--
Documentation/guides/pysimcoder.rst | 2 +-
ReleaseNotes | 4 +-
boards/arm/a1x/pcduino-a10/configs/nsh/defconfig | 2 +-
.../am335x/beaglebone-black/configs/lcd/defconfig | 2 +-
.../am335x/beaglebone-black/configs/nsh/defconfig | 2 +-
boards/arm/c5471/c5471evm/configs/httpd/defconfig | 4 +-
.../arm/c5471/c5471evm/configs/nettest/defconfig | 4 +-
boards/arm/c5471/c5471evm/configs/nsh/defconfig | 4 +-
.../arm/cxd56xx/spresense/configs/audio/defconfig | 2 +-
.../cxd56xx/spresense/configs/audio_sdk/defconfig | 3 +-
.../arm/cxd56xx/spresense/configs/camera/defconfig | 2 +-
.../cxd56xx/spresense/configs/charger/defconfig | 2 +-
boards/arm/cxd56xx/spresense/configs/elf/defconfig | 2 +-
.../spresense/configs/example_camera/defconfig | 2 +-
.../spresense/configs/example_lcd/defconfig | 2 +-
boards/arm/cxd56xx/spresense/configs/lcd/defconfig | 2 +-
boards/arm/cxd56xx/spresense/configs/lte/defconfig | 2 +-
.../arm/cxd56xx/spresense/configs/module/defconfig | 2 +-
boards/arm/cxd56xx/spresense/configs/mpy/defconfig | 2 +-
boards/arm/cxd56xx/spresense/configs/nsh/defconfig | 2 +-
.../cxd56xx/spresense/configs/nsh_trace/defconfig | 2 +-
.../spresense/configs/posix_spawn/defconfig | 2 +-
.../arm/cxd56xx/spresense/configs/rndis/defconfig | 4 +-
.../cxd56xx/spresense/configs/rndis_smp/defconfig | 4 +-
boards/arm/cxd56xx/spresense/configs/smp/defconfig | 2 +-
.../arm/cxd56xx/spresense/configs/usbmsc/defconfig | 2 +-
.../arm/cxd56xx/spresense/configs/usbnsh/defconfig | 2 +-
.../arm/cxd56xx/spresense/configs/wifi/defconfig | 4 +-
.../cxd56xx/spresense/configs/wifi_smp/defconfig | 4 +-
.../dm320/ntosd-dm320/configs/nettest/defconfig | 4 +-
boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig | 4 +-
.../arm/dm320/ntosd-dm320/configs/poll/defconfig | 4 +-
boards/arm/dm320/ntosd-dm320/configs/udp/defconfig | 4 +-
.../dm320/ntosd-dm320/configs/webserver/defconfig | 4 +-
.../arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig | 2 +-
.../efm32/efm32gg-stk3700/configs/nsh/defconfig | 2 +-
.../olimex-efm32g880f128-stk/configs/nsh/defconfig | 2 +-
.../arm/eoss3/quickfeather/configs/nsh/defconfig | 4 +-
boards/arm/imx6/sabre-6quad/configs/elf/defconfig | 2 +-
.../arm/imx6/sabre-6quad/configs/netnsh/defconfig | 4 +-
.../imx6/sabre-6quad/configs/netnsh_smp/defconfig | 4 +-
boards/arm/imx6/sabre-6quad/configs/nsh/defconfig | 2 +-
.../imx6/sabre-6quad/configs/posix_spawn/defconfig | 2 +-
boards/arm/imx6/sabre-6quad/configs/smp/defconfig | 2 +-
.../imxrt/imxrt1020-evk/configs/netnsh/defconfig | 2 +-
.../arm/imxrt/imxrt1020-evk/configs/nsh/defconfig | 2 +-
.../imxrt/imxrt1020-evk/configs/usdhc/defconfig | 2 +-
.../arm/imxrt/imxrt1050-evk/configs/knsh/defconfig | 2 +-
.../imxrt1050-evk/configs/libcxxtest/defconfig | 2 +-
.../imxrt/imxrt1050-evk/configs/netnsh/defconfig | 2 +-
.../arm/imxrt/imxrt1050-evk/configs/nsh/defconfig | 2 +-
boards/arm/imxrt/imxrt1050-evk/kernel/Makefile | 4 +-
.../imxrt/imxrt1050-evk/kernel/imxrt_userspace.c | 4 +-
.../arm/imxrt/imxrt1060-evk/configs/can/defconfig | 2 +-
.../imxrt/imxrt1060-evk/configs/canfd/defconfig | 2 +-
.../arm/imxrt/imxrt1060-evk/configs/knsh/defconfig | 2 +-
.../imxrt1060-evk/configs/libcxxtest/defconfig | 2 +-
.../arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig | 2 +-
.../imxrt/imxrt1060-evk/configs/netnsh/defconfig | 2 +-
.../arm/imxrt/imxrt1060-evk/configs/nsh/defconfig | 2 +-
.../imxrt/imxrt1060-evk/configs/nshocram/defconfig | 2 +-
boards/arm/imxrt/imxrt1060-evk/kernel/Makefile | 4 +-
.../imxrt/imxrt1060-evk/kernel/imxrt_userspace.c | 4 +-
.../arm/imxrt/imxrt1064-evk/configs/can/defconfig | 2 +-
.../imxrt/imxrt1064-evk/configs/canfd/defconfig | 2 +-
.../arm/imxrt/imxrt1064-evk/configs/knsh/defconfig | 2 +-
.../imxrt1064-evk/configs/libcxxtest/defconfig | 2 +-
.../arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig | 2 +-
.../imxrt/imxrt1064-evk/configs/netnsh/defconfig | 2 +-
.../arm/imxrt/imxrt1064-evk/configs/nsh/defconfig | 2 +-
.../imxrt/imxrt1064-evk/configs/nshocram/defconfig | 2 +-
boards/arm/imxrt/imxrt1064-evk/kernel/Makefile | 4 +-
.../imxrt/imxrt1064-evk/kernel/imxrt_userspace.c | 4 +-
.../arm/imxrt/teensy-4.x/configs/can-4.1/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/enc-4.1/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig | 2 +-
.../imxrt/teensy-4.x/configs/netnsh-4.1/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig | 2 +-
.../imxrt/teensy-4.x/configs/pikron-bb/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/pwm-4.1/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig | 2 +-
boards/arm/imxrt/teensy-4.x/kernel/Makefile | 4 +-
.../arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c | 4 +-
.../arm/kinetis/freedom-k28f/configs/nsh/defconfig | 2 +-
.../freedom-k28f/configs/nshsdusb/defconfig | 4 +-
.../kinetis/freedom-k64f/configs/cdcacm/defconfig | 2 +-
.../kinetis/freedom-k64f/configs/demo/defconfig | 2 +-
.../kinetis/freedom-k64f/configs/netnsh/defconfig | 2 +-
.../arm/kinetis/freedom-k64f/configs/nsh/defconfig | 2 +-
.../kinetis/freedom-k66f/configs/netnsh/defconfig | 2 +-
.../arm/kinetis/freedom-k66f/configs/nsh/defconfig | 2 +-
.../kinetis/kwikstik-k40/configs/ostest/defconfig | 2 +-
.../arm/kinetis/teensy-3.x/configs/nsh/defconfig | 2 +-
.../kinetis/teensy-3.x/configs/usbnsh/defconfig | 2 +-
.../arm/kinetis/twr-k60n512/configs/nsh/defconfig | 2 +-
.../kinetis/twr-k64f120m/configs/netnsh/defconfig | 2 +-
.../arm/kinetis/twr-k64f120m/configs/nsh/defconfig | 2 +-
boards/arm/kl/freedom-kl25z/configs/nsh/defconfig | 4 +-
boards/arm/kl/freedom-kl26z/configs/nsh/defconfig | 4 +-
boards/arm/kl/teensy-lc/configs/nsh/defconfig | 4 +-
.../lc823450-xgevk/configs/audio/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/bt/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/elf/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/ipl2/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/knsh/defconfig | 4 +-
.../lc823450-xgevk/configs/kostest/defconfig | 4 +-
.../lc823450-xgevk/configs/krndis/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/nsh/defconfig | 4 +-
.../lc823450-xgevk/configs/posix_spawn/defconfig | 4 +-
.../lc823450-xgevk/configs/rndis/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/usb/defconfig | 4 +-
boards/arm/lc823450/lc823450-xgevk/kernel/Makefile | 4 +-
.../lc823450-xgevk/kernel/lc823450_userspace.c | 4 +-
.../lincoln60/configs/netnsh/defconfig | 2 +-
.../lpc17xx_40xx/lincoln60/configs/nsh/defconfig | 2 +-
.../lincoln60/configs/thttpd-binfs/defconfig | 4 +-
.../lpc4088-devkit/configs/knsh/defconfig | 2 +-
.../lpc4088-devkit/configs/nsh/defconfig | 4 +-
.../lpc17xx_40xx/lpc4088-devkit/kernel/Makefile | 4 +-
.../lpc4088-devkit/kernel/lpc17_40_userspace.c | 4 +-
.../lpc4088-quickstart/configs/knsh/defconfig | 2 +-
.../lpc4088-quickstart/configs/nsh/defconfig | 2 +-
.../lpc4088-quickstart/kernel/Makefile | 4 +-
.../lpc4088-quickstart/kernel/lpc17_40_userspace.c | 4 +-
.../lpcxpresso-lpc1768/configs/dhcpd/defconfig | 2 +-
.../lpcxpresso-lpc1768/configs/nsh/defconfig | 2 +-
.../lpcxpresso-lpc1768/configs/nx/defconfig | 2 +-
.../lpcxpresso-lpc1768/configs/thttpd/defconfig | 4 +-
.../lpcxpresso-lpc1768/configs/usbmsc/defconfig | 2 +-
.../arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig | 4 +-
boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig | 2 +-
.../lpc17xx_40xx/mbed/configs/userled/defconfig | 2 +-
.../arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig | 2 +-
.../olimex-lpc1766stk/configs/ftpc/defconfig | 2 +-
.../olimex-lpc1766stk/configs/hidkbd/defconfig | 2 +-
.../olimex-lpc1766stk/configs/hidmouse/defconfig | 2 +-
.../olimex-lpc1766stk/configs/nettest/defconfig | 2 +-
.../olimex-lpc1766stk/configs/nsh/defconfig | 2 +-
.../olimex-lpc1766stk/configs/slip-httpd/defconfig | 4 +-
.../configs/thttpd-binfs/defconfig | 4 +-
.../configs/thttpd-nxflat/defconfig | 4 +-
.../olimex-lpc1766stk/configs/usbmsc/defconfig | 2 +-
.../olimex-lpc1766stk/configs/usbserial/defconfig | 2 +-
.../olimex-lpc1766stk/configs/zmodem/defconfig | 2 +-
.../arm/lpc17xx_40xx/open1788/configs/fb/defconfig | 2 +-
.../lpc17xx_40xx/open1788/configs/knsh/defconfig | 2 +-
.../open1788/configs/knxterm/defconfig | 2 +-
.../lpc17xx_40xx/open1788/configs/nsh/defconfig | 2 +-
.../open1788/configs/nxlines/defconfig | 2 +-
.../open1788/configs/pdcurses/defconfig | 2 +-
.../lpc17xx_40xx/open1788/configs/pwfb/defconfig | 2 +-
boards/arm/lpc17xx_40xx/open1788/kernel/Makefile | 4 +-
.../open1788/kernel/lpc17_40_userspace.c | 4 +-
.../lpc17xx_40xx/pnev5180b/configs/knsh/defconfig | 2 +-
.../pnev5180b/configs/nsh-cdcecm/defconfig | 2 +-
.../lpc17xx_40xx/pnev5180b/configs/nsh/defconfig | 2 +-
.../pnev5180b/configs/usbnsh-cdcecm/defconfig | 2 +-
.../pnev5180b/configs/usbnsh/defconfig | 2 +-
boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile | 4 +-
.../pnev5180b/kernel/lpc17_40_userspace.c | 4 +-
.../lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig | 2 +-
.../zkit-arm-1769/configs/hello/defconfig | 4 +-
.../zkit-arm-1769/configs/nsh/defconfig | 2 +-
.../zkit-arm-1769/configs/nxhello/defconfig | 2 +-
.../zkit-arm-1769/configs/thttpd/defconfig | 4 +-
.../mcu123-lpc214x/configs/composite/defconfig | 2 +-
.../lpc214x/mcu123-lpc214x/configs/nsh/defconfig | 2 +-
.../mcu123-lpc214x/configs/usbmsc/defconfig | 2 +-
.../mcu123-lpc214x/configs/usbserial/defconfig | 2 +-
boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig | 2 +-
.../arm/lpc214x/zp214xpa/configs/nxlines/defconfig | 2 +-
.../lpc2378/olimex-lpc2378/configs/nsh/defconfig | 2 +-
boards/arm/lpc31xx/ea3131/configs/nsh/defconfig | 2 +-
boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig | 2 +-
.../arm/lpc31xx/ea3131/configs/usbserial/defconfig | 2 +-
boards/arm/lpc31xx/ea3152/configs/ostest/defconfig | 2 +-
boards/arm/lpc31xx/olimex-lpc-h3131/README.txt | 2 +-
.../lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig | 4 +-
.../lpc43xx/bambino-200e/configs/knsh/defconfig | 2 +-
.../bambino-200e/configs/max31855/defconfig | 2 +-
.../lpc43xx/bambino-200e/configs/netnsh/defconfig | 2 +-
.../arm/lpc43xx/bambino-200e/configs/nsh/defconfig | 2 +-
.../lpc43xx/bambino-200e/configs/usbnsh/defconfig | 2 +-
boards/arm/lpc43xx/bambino-200e/kernel/Makefile | 4 +-
.../lpc43xx/bambino-200e/kernel/lpc43_userspace.c | 4 +-
.../lpc43xx/lpc4330-xplorer/configs/nsh/defconfig | 2 +-
.../arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig | 2 +-
.../arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig | 2 +-
.../lpc43xx/lpc4370-link2/configs/nsh/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/fb/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/lvgl/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/netnsh/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/nsh/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/nxwm/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/pwfb/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/pwlines/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/twm4nx1/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/twm4nx2/defconfig | 2 +-
.../max326xx/max32660-evsys/configs/nsh/defconfig | 2 +-
boards/arm/moxart/moxa/configs/nsh/defconfig | 2 +-
.../arm/nrf52/nrf52-feather/configs/i2c/defconfig | 2 +-
.../arm/nrf52/nrf52-feather/configs/nsh/defconfig | 2 +-
.../nrf52/nrf52-feather/configs/userleds/defconfig | 2 +-
boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig | 2 +-
.../arm/nrf52/nrf52832-dk/configs/wdog/defconfig | 2 +-
.../arm/nrf52/nrf52832-mdk/configs/nsh/defconfig | 2 +-
.../nrf52/nrf52832-sparkfun/configs/nsh/defconfig | 2 +-
boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig | 2 +-
.../nrf52/nrf52840-dk/configs/highpri/defconfig | 2 +-
boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig | 2 +-
boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig | 2 +-
.../arm/nrf52/nrf52840-dk/configs/sx127x/defconfig | 2 +-
.../arm/nrf52/nrf52840-dk/configs/timer/defconfig | 2 +-
.../nrf52/nrf52840-dongle/configs/nsh/defconfig | 2 +-
.../arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig | 4 +-
boards/arm/phy62xx/phy6222/configs/nsh/defconfig | 4 +-
.../arm/phy62xx/phy6222/configs/phy_sbp/defconfig | 4 +-
.../raspberrypi-pico/configs/audiopack/defconfig | 2 +-
.../raspberrypi-pico/configs/composite/defconfig | 2 +-
.../raspberrypi-pico/configs/displaypack/defconfig | 2 +-
.../raspberrypi-pico/configs/enc28j60/defconfig | 2 +-
.../raspberrypi-pico/configs/lcd1602/defconfig | 2 +-
.../rp2040/raspberrypi-pico/configs/nsh/defconfig | 2 +-
.../raspberrypi-pico/configs/nshsram/defconfig | 2 +-
.../rp2040/raspberrypi-pico/configs/smp/defconfig | 2 +-
.../raspberrypi-pico/configs/spisd/defconfig | 2 +-
.../raspberrypi-pico/configs/ssd1306/defconfig | 2 +-
.../raspberrypi-pico/configs/st7735/defconfig | 2 +-
.../raspberrypi-pico/configs/usbmsc/defconfig | 2 +-
.../raspberrypi-pico/configs/usbnsh/defconfig | 2 +-
.../configs/waveshare-lcd-1.14/defconfig | 2 +-
.../configs/waveshare-lcd-1.3/defconfig | 2 +-
.../arm/s32k1xx/s32k118evb/configs/nsh/defconfig | 4 +-
.../arm/s32k1xx/s32k144evb/configs/nsh/defconfig | 2 +-
.../arm/s32k1xx/s32k146evb/configs/nsh/defconfig | 2 +-
.../arm/s32k1xx/s32k148evb/configs/nsh/defconfig | 2 +-
.../arm/s32k1xx/ucans32k146/configs/can/defconfig | 2 +-
.../arm/s32k1xx/ucans32k146/configs/nsh/defconfig | 2 +-
boards/arm/sam34/arduino-due/configs/nsh/defconfig | 2 +-
.../sam34/flipnclick-sam3x/configs/nsh/defconfig | 2 +-
.../flipnclick-sam3x/configs/nxlines/defconfig | 2 +-
boards/arm/sam34/sam3u-ek/configs/knsh/defconfig | 2 +-
boards/arm/sam34/sam3u-ek/configs/nsh/defconfig | 2 +-
boards/arm/sam34/sam3u-ek/configs/nx/defconfig | 2 +-
boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig | 4 +-
boards/arm/sam34/sam3u-ek/kernel/Makefile | 4 +-
boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c | 4 +-
boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig | 2 +-
boards/arm/sam34/sam4e-ek/README.txt | 2 +-
boards/arm/sam34/sam4e-ek/configs/nsh/defconfig | 2 +-
boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig | 4 +-
boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig | 2 +-
.../arm/sam34/sam4l-xplained/configs/nsh/defconfig | 4 +-
.../sam34/sam4s-xplained-pro/configs/fs/defconfig | 4 +-
.../sam34/sam4s-xplained-pro/configs/nsh/defconfig | 4 +-
.../arm/sam34/sam4s-xplained/configs/nsh/defconfig | 2 +-
.../arm/sama5/giant-board/configs/netnsh/defconfig | 2 +-
boards/arm/sama5/giant-board/configs/nsh/defconfig | 2 +-
.../giant-board/configs/sdmmc-net-nsh/defconfig | 2 +-
.../sama5/giant-board/configs/sdmmcnsh/defconfig | 2 +-
.../sama5/sama5d2-xult/configs/netnsh/defconfig | 2 +-
.../arm/sama5/sama5d2-xult/configs/nsh/defconfig | 2 +-
.../sama5/sama5d2-xult/configs/sdmmcnsh/defconfig | 2 +-
.../sama5d3-xplained/configs/bridge/defconfig | 2 +-
.../ethernet-over-usb-2-high-speed/defconfig | 2 +-
.../sama5/sama5d3-xplained/configs/nsh/defconfig | 2 +-
.../arm/sama5/sama5d3x-ek/configs/demo/defconfig | 2 +-
.../arm/sama5/sama5d3x-ek/configs/hello/defconfig | 2 +-
.../sama5/sama5d3x-ek/configs/norboot/defconfig | 2 +-
boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig | 2 +-
boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig | 2 +-
.../sama5/sama5d3x-ek/configs/nxplayer/defconfig | 2 +-
.../arm/sama5/sama5d3x-ek/configs/nxwm/defconfig | 4 +-
.../arm/sama5/sama5d3x-ek/configs/ov2640/defconfig | 2 +-
boards/arm/sama5/sama5d4-ek/README.txt | 4 +-
.../sama5/sama5d4-ek/configs/at25boot/defconfig | 2 +-
.../arm/sama5/sama5d4-ek/configs/bridge/defconfig | 2 +-
.../sama5/sama5d4-ek/configs/dramboot/defconfig | 2 +-
boards/arm/sama5/sama5d4-ek/configs/elf/defconfig | 4 +-
boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig | 2 +-
boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig | 2 +-
boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig | 4 +-
.../arm/sama5/sama5d4-ek/configs/ramtest/defconfig | 2 +-
.../arm/samd2l2/arduino-m0/configs/nsh/defconfig | 4 +-
.../samd2l2/arduino-m0/configs/usbnsh/defconfig | 4 +-
.../samd2l2/circuit-express/configs/nsh/defconfig | 4 +-
.../circuit-express/configs/usbnsh/defconfig | 4 +-
.../samd2l2/samd20-xplained/configs/nsh/defconfig | 4 +-
.../samd2l2/samd21-xplained/configs/nsh/defconfig | 4 +-
.../samd2l2/saml21-xplained/configs/nsh/defconfig | 4 +-
boards/arm/samd5e5/metro-m4/configs/nsh/defconfig | 4 +-
.../same54-xplained-pro/configs/nsh/defconfig | 4 +-
boards/arm/samv7/same70-qmtech/README.txt | 6 +--
.../configs/mcuboot-confirm/defconfig | 2 +-
.../same70-qmtech/configs/mcuboot-loader/defconfig | 2 +-
.../arm/samv7/same70-qmtech/configs/nsh/defconfig | 2 +-
boards/arm/samv7/same70-qmtech/kernel/Makefile | 4 +-
.../arm/samv7/same70-qmtech/kernel/sam_userspace.c | 4 +-
boards/arm/samv7/same70-xplained/README.txt | 8 ++--
.../samv7/same70-xplained/configs/adc/defconfig | 2 +-
.../configs/mcuboot-confirm/defconfig | 2 +-
.../configs/mcuboot-loader/defconfig | 2 +-
.../configs/mrf24j40-starhub/defconfig | 2 +-
.../samv7/same70-xplained/configs/netnsh/defconfig | 2 +-
.../samv7/same70-xplained/configs/nsh/defconfig | 2 +-
.../samv7/same70-xplained/configs/twm4nx/defconfig | 2 +-
boards/arm/samv7/same70-xplained/kernel/Makefile | 4 +-
.../samv7/same70-xplained/kernel/sam_userspace.c | 4 +-
boards/arm/samv7/samv71-xult/README.txt | 8 ++--
.../arm/samv7/samv71-xult/configs/knsh/defconfig | 2 +-
.../samv71-xult/configs/mcuboot-loader/defconfig | 2 +-
.../samv71-xult/configs/mcuboot-nsh/defconfig | 2 +-
.../arm/samv7/samv71-xult/configs/module/defconfig | 2 +-
.../samv71-xult/configs/mrf24j40-starhub/defconfig | 2 +-
.../samv7/samv71-xult/configs/mxtxplnd/defconfig | 2 +-
.../arm/samv7/samv71-xult/configs/netnsh/defconfig | 2 +-
boards/arm/samv7/samv71-xult/configs/nsh/defconfig | 2 +-
.../arm/samv7/samv71-xult/configs/nxwm/defconfig | 4 +-
boards/arm/samv7/samv71-xult/configs/vnc/defconfig | 2 +-
.../arm/samv7/samv71-xult/configs/vnxwm/defconfig | 4 +-
boards/arm/samv7/samv71-xult/kernel/Makefile | 4 +-
.../arm/samv7/samv71-xult/kernel/sam_userspace.c | 4 +-
boards/arm/stm32/axoloti/configs/nsh/defconfig | 2 +-
.../stm32/b-g431b-esc1/configs/foc_b16/defconfig | 2 +-
.../stm32/b-g431b-esc1/configs/foc_f32/defconfig | 2 +-
.../arm/stm32/b-g431b-esc1/configs/nsh/defconfig | 2 +-
.../arm/stm32/b-g474e-dpow1/configs/nsh/defconfig | 2 +-
.../stm32/clicker2-stm32/configs/knsh/defconfig | 2 +-
.../configs/mrf24j40-6lowpan/defconfig | 2 +-
.../clicker2-stm32/configs/mrf24j40-mac/defconfig | 2 +-
.../configs/mrf24j40-starhub/defconfig | 2 +-
.../configs/mrf24j40-starpoint/defconfig | 2 +-
.../arm/stm32/clicker2-stm32/configs/nsh/defconfig | 2 +-
.../stm32/clicker2-stm32/configs/usbnsh/defconfig | 2 +-
.../clicker2-stm32/configs/xbee-6lowpan/defconfig | 2 +-
boards/arm/stm32/clicker2-stm32/kernel/Makefile | 4 +-
.../stm32/clicker2-stm32/kernel/stm32_userspace.c | 4 +-
boards/arm/stm32/cloudctrl/configs/nsh/defconfig | 2 +-
boards/arm/stm32/emw3162/configs/nsh/defconfig | 2 +-
boards/arm/stm32/emw3162/configs/wlan/defconfig | 2 +-
.../arm/stm32/et-stm32-stamp/configs/nsh/defconfig | 2 +-
.../arm/stm32/fire-stm32v2/configs/nsh/defconfig | 2 +-
.../arm/stm32/hymini-stm32v/configs/nsh/defconfig | 2 +-
.../arm/stm32/hymini-stm32v/configs/nsh2/defconfig | 2 +-
.../stm32/hymini-stm32v/configs/usbmsc/defconfig | 2 +-
.../stm32/hymini-stm32v/configs/usbnsh/defconfig | 2 +-
.../hymini-stm32v/configs/usbserial/defconfig | 2 +-
boards/arm/stm32/maple/configs/nsh/defconfig | 2 +-
boards/arm/stm32/maple/configs/nx/defconfig | 2 +-
boards/arm/stm32/maple/configs/usbnsh/defconfig | 2 +-
.../mikroe-stm32f4/configs/fulldemo/defconfig | 2 +-
.../stm32/mikroe-stm32f4/configs/kostest/defconfig | 2 +-
.../arm/stm32/mikroe-stm32f4/configs/nsh/defconfig | 2 +-
.../arm/stm32/mikroe-stm32f4/configs/nx/defconfig | 2 +-
.../stm32/mikroe-stm32f4/configs/nxlines/defconfig | 2 +-
.../stm32/mikroe-stm32f4/configs/nxtext/defconfig | 2 +-
.../stm32/mikroe-stm32f4/configs/usbnsh/defconfig | 2 +-
boards/arm/stm32/mikroe-stm32f4/kernel/Makefile | 4 +-
.../stm32/mikroe-stm32f4/kernel/stm32_userspace.c | 4 +-
.../arm/stm32/nucleo-f103rb/configs/adc/defconfig | 2 +-
.../nucleo-f103rb/configs/ihm07m1_b16/defconfig | 2 +-
.../arm/stm32/nucleo-f103rb/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-f103rb/configs/pwm/defconfig | 2 +-
.../stm32/nucleo-f103rb/configs/qenco/defconfig | 2 +-
.../arm/stm32/nucleo-f207zg/configs/adc/defconfig | 2 +-
.../arm/stm32/nucleo-f207zg/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-f207zg/configs/pwm/defconfig | 2 +-
.../stm32/nucleo-f302r8/configs/highpri/defconfig | 4 +-
.../nucleo-f302r8/configs/ihm07m1_b16/defconfig | 2 +-
.../nucleo-f302r8/configs/ihm07m1_f32/defconfig | 2 +-
.../arm/stm32/nucleo-f302r8/configs/nsh/defconfig | 4 +-
.../stm32/nucleo-f302r8/configs/qenco/defconfig | 2 +-
.../arm/stm32/nucleo-f303re/configs/adc/defconfig | 2 +-
.../arm/stm32/nucleo-f303re/configs/can/defconfig | 2 +-
.../stm32/nucleo-f303re/configs/hello/defconfig | 2 +-
.../arm/stm32/nucleo-f303re/configs/nsh/defconfig | 2 +-
.../stm32/nucleo-f303re/configs/nxlines/defconfig | 2 +-
.../arm/stm32/nucleo-f303re/configs/pwm/defconfig | 2 +-
.../stm32/nucleo-f303re/configs/serialrx/defconfig | 2 +-
.../arm/stm32/nucleo-f303ze/configs/adc/defconfig | 2 +-
.../arm/stm32/nucleo-f303ze/configs/nsh/defconfig | 2 +-
.../nucleo-f303ze/configs/nxlines_oled/defconfig | 2 +-
.../arm/stm32/nucleo-f334r8/configs/adc/defconfig | 4 +-
.../stm32/nucleo-f334r8/configs/highpri/defconfig | 4 +-
.../arm/stm32/nucleo-f334r8/configs/nsh/defconfig | 4 +-
.../stm32/nucleo-f334r8/configs/spwm1/defconfig | 4 +-
.../stm32/nucleo-f334r8/configs/spwm2/defconfig | 4 +-
.../arm/stm32/nucleo-f410rb/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-f412zg/configs/nsh/defconfig | 2 +-
.../stm32/nucleo-f429zi/configs/netnsh/defconfig | 2 +-
.../arm/stm32/nucleo-f429zi/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/adc/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/can/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/dac/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/gpio/defconfig | 2 +-
.../nucleo-f446re/configs/ihm08m1_b16/defconfig | 2 +-
.../nucleo-f446re/configs/ihm08m1_f32/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/lcd/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/pwm/defconfig | 2 +-
.../stm32/nucleo-f446re/configs/qenco/defconfig | 2 +-
.../stm32/nucleo-f4x1re/configs/f401-nsh/defconfig | 2 +-
.../configs/f411-mcp2515-extid/defconfig | 2 +-
.../stm32/nucleo-f4x1re/configs/f411-nsh/defconfig | 2 +-
.../arm/stm32/nucleo-g431kb/configs/comp/defconfig | 2 +-
.../arm/stm32/nucleo-g431kb/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-g431kb/configs/pwm/defconfig | 2 +-
.../arm/stm32/nucleo-g431rb/configs/adc/defconfig | 4 +-
.../stm32/nucleo-g431rb/configs/cordic/defconfig | 2 +-
.../nucleo-g431rb/configs/ihm16m1_b16/defconfig | 2 +-
.../nucleo-g431rb/configs/ihm16m1_f32/defconfig | 2 +-
.../arm/stm32/nucleo-g431rb/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-g431rb/configs/pwm/defconfig | 2 +-
.../stm32/nucleo-g431rb/configs/qenco/defconfig | 2 +-
.../arm/stm32/nucleo-l152re/configs/lcd/defconfig | 4 +-
.../arm/stm32/nucleo-l152re/configs/nsh/defconfig | 4 +-
.../olimex-stm32-e407/configs/bmp180/defconfig | 2 +-
.../stm32/olimex-stm32-e407/configs/dac/defconfig | 2 +-
.../olimex-stm32-e407/configs/discover/defconfig | 2 +-
.../olimex-stm32-e407/configs/ina219/defconfig | 2 +-
.../configs/mrf24j40-6lowpan/defconfig | 2 +-
.../configs/mrf24j40-mac/defconfig | 2 +-
.../olimex-stm32-e407/configs/netnsh/defconfig | 2 +-
.../stm32/olimex-stm32-e407/configs/nsh/defconfig | 2 +-
.../olimex-stm32-e407/configs/telnetd/defconfig | 2 +-
.../olimex-stm32-e407/configs/timer/defconfig | 2 +-
.../olimex-stm32-e407/configs/usbnsh/defconfig | 2 +-
.../olimex-stm32-e407/configs/webserver/defconfig | 2 +-
.../olimex-stm32-h405/configs/usbnsh/defconfig | 2 +-
.../stm32/olimex-stm32-h407/configs/nsh/defconfig | 2 +-
.../olimex-stm32-h407/configs/nsh_uext/defconfig | 2 +-
.../stm32/olimex-stm32-p107/configs/nsh/defconfig | 2 +-
.../stm32/olimex-stm32-p207/configs/nsh/defconfig | 2 +-
.../olimex-stm32-p407/configs/audio/defconfig | 2 +-
.../olimex-stm32-p407/configs/dhtxx/defconfig | 2 +-
.../olimex-stm32-p407/configs/hidkbd/defconfig | 2 +-
.../stm32/olimex-stm32-p407/configs/kelf/defconfig | 4 +-
.../olimex-stm32-p407/configs/kmodule/defconfig | 2 +-
.../stm32/olimex-stm32-p407/configs/knsh/defconfig | 2 +-
.../olimex-stm32-p407/configs/module/defconfig | 2 +-
.../olimex-stm32-p407/configs/mqttc/defconfig | 2 +-
.../stm32/olimex-stm32-p407/configs/nsh/defconfig | 2 +-
.../olimex-stm32-p407/configs/zmodem/defconfig | 2 +-
boards/arm/stm32/olimex-stm32-p407/kernel/Makefile | 4 +-
.../olimex-stm32-p407/kernel/stm32_userspace.c | 4 +-
.../stm32/olimexino-stm32/configs/can/defconfig | 4 +-
.../olimexino-stm32/configs/composite/defconfig | 4 +-
.../stm32/olimexino-stm32/configs/nsh/defconfig | 4 +-
.../olimexino-stm32/configs/smallnsh/defconfig | 4 +-
.../stm32/olimexino-stm32/configs/tiny/defconfig | 4 +-
boards/arm/stm32/omnibusf4/configs/nsh/defconfig | 2 +-
boards/arm/stm32/omnibusf4/kernel/Makefile | 4 +-
.../arm/stm32/omnibusf4/kernel/stm32_userspace.c | 4 +-
boards/arm/stm32/photon/configs/adb/defconfig | 4 +-
boards/arm/stm32/photon/configs/nsh/defconfig | 2 +-
boards/arm/stm32/photon/configs/rgbled/defconfig | 2 +-
boards/arm/stm32/photon/configs/usbnsh/defconfig | 2 +-
boards/arm/stm32/photon/configs/wlan/defconfig | 2 +-
boards/arm/stm32/shenzhou/configs/nsh/defconfig | 2 +-
boards/arm/stm32/shenzhou/configs/nxwm/defconfig | 4 +-
boards/arm/stm32/shenzhou/configs/thttpd/defconfig | 2 +-
boards/arm/stm32/stm3210e-eval/README.txt | 4 +-
.../stm3210e-eval/configs/composite/defconfig | 2 +-
.../arm/stm32/stm3210e-eval/configs/nsh/defconfig | 2 +-
.../arm/stm32/stm3210e-eval/configs/nsh2/defconfig | 2 +-
.../arm/stm32/stm3210e-eval/configs/nx/defconfig | 2 +-
.../stm32/stm3210e-eval/configs/nxterm/defconfig | 2 +-
.../arm/stm32/stm3210e-eval/configs/pm/defconfig | 2 +-
.../stm32/stm3210e-eval/configs/usbmsc/defconfig | 2 +-
.../stm3210e-eval/configs/usbserial/defconfig | 2 +-
.../stm32/stm3220g-eval/configs/dhcpd/defconfig | 2 +-
.../stm32/stm3220g-eval/configs/nettest/defconfig | 2 +-
.../arm/stm32/stm3220g-eval/configs/nsh/defconfig | 2 +-
.../arm/stm32/stm3220g-eval/configs/nsh2/defconfig | 2 +-
.../arm/stm32/stm3220g-eval/configs/nxwm/defconfig | 2 +-
.../stm32/stm3220g-eval/configs/telnetd/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/dhcpd/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/discover/defconfig | 2 +-
.../arm/stm32/stm3240g-eval/configs/fb/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/knxwm/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/nettest/defconfig | 2 +-
.../arm/stm32/stm3240g-eval/configs/nsh/defconfig | 2 +-
.../arm/stm32/stm3240g-eval/configs/nsh2/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/nxterm/defconfig | 2 +-
.../arm/stm32/stm3240g-eval/configs/nxwm/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/telnetd/defconfig | 2 +-
.../stm3240g-eval/configs/webserver/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/xmlrpc/defconfig | 4 +-
boards/arm/stm32/stm3240g-eval/kernel/Makefile | 4 +-
.../stm32/stm3240g-eval/kernel/stm32_userspace.c | 4 +-
boards/arm/stm32/stm32_tiny/configs/nsh/defconfig | 2 +-
.../arm/stm32/stm32_tiny/configs/usbnsh/defconfig | 2 +-
.../stm32/stm32butterfly2/configs/nsh/defconfig | 2 +-
.../stm32/stm32butterfly2/configs/nshnet/defconfig | 2 +-
.../stm32butterfly2/configs/nshusbdev/defconfig | 2 +-
.../stm32butterfly2/configs/nshusbhost/defconfig | 2 +-
.../stm32/stm32f103-minimum/configs/adb/defconfig | 4 +-
.../stm32f103-minimum/configs/apds9960/defconfig | 2 +-
.../stm32f103-minimum/configs/audio_tone/defconfig | 2 +-
.../stm32f103-minimum/configs/buttons/defconfig | 2 +-
.../stm32f103-minimum/configs/hello/defconfig | 4 +-
.../stm32f103-minimum/configs/jlx12864g/defconfig | 2 +-
.../stm32f103-minimum/configs/lcd1602/defconfig | 2 +-
.../stm32f103-minimum/configs/mcp2515/defconfig | 2 +-
.../stm32f103-minimum/configs/nrf24/defconfig | 2 +-
.../stm32/stm32f103-minimum/configs/nsh/defconfig | 2 +-
.../stm32/stm32f103-minimum/configs/pwm/defconfig | 2 +-
.../stm32f103-minimum/configs/rfid-rc522/defconfig | 2 +-
.../stm32f103-minimum/configs/rgbled/defconfig | 2 +-
.../stm32f103-minimum/configs/sensors/defconfig | 2 +-
.../stm32f103-minimum/configs/usbnsh/defconfig | 2 +-
.../stm32f103-minimum/configs/userled/defconfig | 2 +-
.../stm32f103-minimum/configs/veml6070/defconfig | 2 +-
.../stm32f334-disco/configs/buckboost/defconfig | 4 +-
.../stm32/stm32f334-disco/configs/nsh/defconfig | 4 +-
.../stm32f334-disco/configs/powerled/defconfig | 4 +-
.../stm32/stm32f3discovery/configs/nsh/defconfig | 2 +-
.../stm32f3discovery/configs/usbnsh/defconfig | 2 +-
.../stm32/stm32f411-minimum/configs/nsh/defconfig | 2 +-
.../stm32/stm32f411e-disco/configs/nsh/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/adc/defconfig | 2 +-
.../stm32f429i-disco/configs/extflash/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/fb/defconfig | 2 +-
.../stm32f429i-disco/configs/highpri/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/lcd/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/lvgl/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/nsh/defconfig | 2 +-
.../stm32f429i-disco/configs/nxhello/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/nxwm/defconfig | 2 +-
.../stm32f429i-disco/configs/usbmsc/defconfig | 2 +-
.../stm32f429i-disco/configs/usbnsh/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/adb/defconfig | 4 +-
.../stm32/stm32f4discovery/configs/audio/defconfig | 2 +-
.../stm32f4discovery/configs/canard/defconfig | 2 +-
.../stm32f4discovery/configs/cxxtest/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/elf/defconfig | 4 +-
.../stm32/stm32f4discovery/configs/ipv6/defconfig | 2 +-
.../stm32f4discovery/configs/kostest/defconfig | 2 +-
.../stm32f4discovery/configs/lcd1602/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/lwl/defconfig | 2 +-
.../stm32f4discovery/configs/max31855/defconfig | 2 +-
.../stm32f4discovery/configs/max7219/defconfig | 2 +-
.../stm32f4discovery/configs/mmcsdspi/defconfig | 2 +-
.../configs/modbus_slave/defconfig | 2 +-
.../stm32f4discovery/configs/module/defconfig | 2 +-
.../stm32f4discovery/configs/netnsh/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/nsh/defconfig | 2 +-
.../stm32f4discovery/configs/nxlines/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/pm/defconfig | 2 +-
.../stm32f4discovery/configs/posix_spawn/defconfig | 2 +-
.../stm32f4discovery/configs/pseudoterm/defconfig | 2 +-
.../stm32f4discovery/configs/rgbled/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/rndis/defconfig | 4 +-
.../stm32f4discovery/configs/sporadic/defconfig | 2 +-
.../stm32f4discovery/configs/st7789/defconfig | 2 +-
.../stm32f4discovery/configs/testlibcxx/defconfig | 2 +-
.../stm32f4discovery/configs/usbmsc/defconfig | 2 +-
.../stm32f4discovery/configs/usbnsh/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/wifi/defconfig | 2 +-
.../stm32f4discovery/configs/winbuild/Make.defs | 56 ----------------------
.../stm32f4discovery/configs/xen1210/defconfig | 2 +-
boards/arm/stm32/stm32f4discovery/kernel/Makefile | 4 +-
.../stm32f4discovery/kernel/stm32_userspace.c | 4 +-
.../stm32/stm32ldiscovery/configs/chrono/defconfig | 4 +-
.../stm32/stm32ldiscovery/configs/nsh/defconfig | 4 +-
.../stm32/stm32vldiscovery/configs/nsh/defconfig | 4 +-
.../viewtool-stm32f107/configs/ft80x/defconfig | 2 +-
.../viewtool-stm32f107/configs/highpri/defconfig | 2 +-
.../viewtool-stm32f107/configs/netnsh/defconfig | 2 +-
.../stm32/viewtool-stm32f107/configs/nsh/defconfig | 2 +-
.../configs/tcpblaster/defconfig | 2 +-
.../b-l072z-lrwan1/configs/adc/defconfig | 4 +-
.../b-l072z-lrwan1/configs/nsh/defconfig | 4 +-
.../b-l072z-lrwan1/configs/nxlines_oled/defconfig | 4 +-
.../b-l072z-lrwan1/configs/sx127x/defconfig | 4 +-
.../nucleo-f072rb/configs/nsh/defconfig | 4 +-
.../nucleo-f091rc/configs/nsh/defconfig | 4 +-
.../nucleo-f091rc/configs/sx127x/defconfig | 4 +-
.../nucleo-g070rb/configs/nsh/defconfig | 4 +-
.../nucleo-g071rb/configs/nsh/defconfig | 4 +-
.../nucleo-l073rz/configs/nsh/defconfig | 4 +-
.../nucleo-l073rz/configs/sx127x/defconfig | 4 +-
.../stm32f051-discovery/configs/nsh/defconfig | 4 +-
.../stm32f072-discovery/configs/nsh/defconfig | 4 +-
.../stm32f7/nucleo-144/configs/f722-nsh/defconfig | 2 +-
.../nucleo-144/configs/f746-evalos/defconfig | 2 +-
.../stm32f7/nucleo-144/configs/f746-nsh/defconfig | 2 +-
.../nucleo-144/configs/f746-pysim/defconfig | 2 +-
.../nucleo-144/configs/f767-evalos/defconfig | 2 +-
.../nucleo-144/configs/f767-netnsh/defconfig | 2 +-
.../stm32f7/nucleo-144/configs/f767-nsh/defconfig | 2 +-
.../arm/stm32f7/stm32f746-ws/configs/nsh/defconfig | 4 +-
.../stm32f746g-disco/configs/audio/defconfig | 2 +-
.../stm32f7/stm32f746g-disco/configs/fb/defconfig | 2 +-
.../stm32f746g-disco/configs/lvgl/defconfig | 2 +-
.../stm32f746g-disco/configs/netnsh/defconfig | 2 +-
.../stm32f7/stm32f746g-disco/configs/nsh/defconfig | 2 +-
.../stm32f746g-disco/configs/nxdemo/defconfig | 2 +-
.../stm32f746g-disco/configs/nxterm/defconfig | 2 +-
.../arm/stm32f7/stm32f746g-disco/kernel/Makefile | 4 +-
.../stm32f746g-disco/kernel/stm32_userspace.c | 4 +-
.../stm32f769i-disco/configs/netnsh/defconfig | 2 +-
.../stm32f7/stm32f769i-disco/configs/nsh/defconfig | 2 +-
.../arm/stm32f7/stm32f769i-disco/kernel/Makefile | 4 +-
.../stm32f769i-disco/kernel/stm32_userspace.c | 4 +-
.../stm32h7/nucleo-h743zi/configs/elf/defconfig | 2 +-
.../stm32h7/nucleo-h743zi/configs/netnsh/defconfig | 2 +-
.../stm32h7/nucleo-h743zi/configs/nsh/defconfig | 2 +-
.../nucleo-h743zi/configs/nxlines_oled/defconfig | 2 +-
.../nucleo-h743zi/configs/otg_fs_host/defconfig | 2 +-
.../stm32h7/nucleo-h743zi/configs/pwm/defconfig | 2 +-
boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile | 4 +-
.../stm32h7/nucleo-h743zi/kernel/stm32_userspace.c | 4 +-
.../stm32h7/nucleo-h743zi2/configs/jumbo/defconfig | 2 +-
.../nucleo-h743zi2/configs/netnsh/defconfig | 2 +-
.../stm32h7/nucleo-h743zi2/configs/nsh/defconfig | 2 +-
.../stm32h7/stm32h747i-disco/configs/nsh/defconfig | 2 +-
.../arm/stm32h7/stm32h747i-disco/kernel/Makefile | 4 +-
.../stm32h747i-disco/kernel/stm32_userspace.c | 4 +-
.../stm32l4/b-l475e-iot01a/configs/nsh/defconfig | 2 +-
.../configs/spirit-6lowpan/defconfig | 2 +-
.../configs/spirit-starhub/defconfig | 2 +-
.../configs/spirit-starpoint/defconfig | 2 +-
.../stm32l4/nucleo-l432kc/configs/nsh/defconfig | 2 +-
.../stm32l4/nucleo-l432kc/configs/spwm/defconfig | 2 +-
.../stm32l4/nucleo-l452re/configs/nsh/defconfig | 2 +-
.../stm32l4/nucleo-l476rg/configs/nsh/defconfig | 2 +-
.../stm32l4/nucleo-l476rg/configs/nxdemo/defconfig | 2 +-
.../stm32l4/nucleo-l496zg/configs/nsh/defconfig | 2 +-
.../stm32l4/stm32l476-mdk/configs/nsh/defconfig | 2 +-
.../stm32l476vg-disco/configs/knsh/defconfig | 2 +-
.../stm32l476vg-disco/configs/nsh/defconfig | 2 +-
.../arm/stm32l4/stm32l476vg-disco/kernel/Makefile | 4 +-
.../stm32l476vg-disco/kernel/stm32l4_userspace.c | 4 +-
.../stm32l4r9ai-disco/configs/knsh/defconfig | 4 +-
.../stm32l4r9ai-disco/configs/nsh/defconfig | 2 +-
.../arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile | 4 +-
.../stm32l4r9ai-disco/kernel/stm32l4_userspace.c | 4 +-
.../stm32l5/nucleo-l552ze/configs/nsh/defconfig | 2 +-
.../stm32l5/stm32l562e-dk/configs/nsh/defconfig | 2 +-
.../olimex-strp711/configs/nettest/defconfig | 2 +-
.../str71x/olimex-strp711/configs/nsh/defconfig | 2 +-
boards/arm/tiva/dk-tm4c129x/README.txt | 2 +-
boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig | 2 +-
boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/httpd/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/nettest/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/nsh/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/nxflat/defconfig | 4 +-
boards/arm/tiva/eagle100/configs/thttpd/defconfig | 4 +-
boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig | 2 +-
.../arm/tiva/launchxl-cc1310/configs/nsh/defconfig | 2 +-
.../tiva/launchxl-cc1312r1/configs/nsh/defconfig | 2 +-
boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig | 2 +-
.../tiva/lm3s6965-ek/configs/discover/defconfig | 2 +-
boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig | 2 +-
boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig | 2 +-
.../tiva/lm3s6965-ek/configs/qemu-flat/defconfig | 2 +-
.../tiva/lm3s6965-ek/configs/qemu-nxflat/defconfig | 2 +-
.../lm3s6965-ek/configs/qemu-protected/defconfig | 2 +-
.../arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig | 2 +-
boards/arm/tiva/lm3s6965-ek/kernel/Makefile | 4 +-
boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c | 4 +-
boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig | 2 +-
boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig | 2 +-
.../tiva/lm4f120-launchpad/configs/nsh/defconfig | 2 +-
.../tm4c123g-launchpad/configs/mcp2515/defconfig | 2 +-
.../tiva/tm4c123g-launchpad/configs/nsh/defconfig | 2 +-
boards/arm/tiva/tm4c1294-launchpad/README.txt | 2 +-
.../tiva/tm4c1294-launchpad/configs/ipv6/defconfig | 2 +-
.../tiva/tm4c1294-launchpad/configs/nsh/defconfig | 2 +-
.../tms570/launchxl-tms57004/configs/nsh/defconfig | 2 +-
.../tms570ls31x-usb-kit/configs/nsh/defconfig | 2 +-
.../arm/xmc4/xmc4500-relax/configs/nsh/defconfig | 2 +-
.../arm/xmc4/xmc4700-relax/configs/nsh/defconfig | 2 +-
boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig | 2 +-
.../avr/at32uc3/avr32dev1/configs/ostest/defconfig | 2 +-
.../at90usb/micropendous3/configs/hello/defconfig | 4 +-
.../avr/at90usb/teensy-2.0/configs/hello/defconfig | 4 +-
.../avr/at90usb/teensy-2.0/configs/nsh/defconfig | 4 +-
.../at90usb/teensy-2.0/configs/usbmsc/defconfig | 4 +-
boards/avr/atmega/amber/configs/hello/defconfig | 4 +-
.../arduino-mega2560/configs/hello/defconfig | 4 +-
.../atmega/arduino-mega2560/configs/nsh/defconfig | 4 +-
.../atmega/moteino-mega/configs/hello/defconfig | 4 +-
.../avr/atmega/moteino-mega/configs/nsh/defconfig | 4 +-
.../hc/m9s12/demo9s12ne64/configs/ostest/defconfig | 4 +-
boards/hc/m9s12/ne64badge/configs/ostest/defconfig | 4 +-
boards/mips/pic32mx/mirtoo/configs/nsh/defconfig | 2 +-
boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig | 2 +-
.../pic32mx-starterkit/configs/nsh/defconfig | 2 +-
.../pic32mx-starterkit/configs/nsh2/defconfig | 2 +-
.../mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig | 2 +-
.../pic32mx/sure-pic32mx/configs/nsh/defconfig | 2 +-
.../pic32mx/sure-pic32mx/configs/usbnsh/defconfig | 2 +-
boards/mips/pic32mx/ubw32/configs/nsh/defconfig | 2 +-
.../pic32mz/chipkit-wifire/configs/nsh/defconfig | 2 +-
.../flipnclick-pic32mz/configs/nsh/defconfig | 2 +-
.../flipnclick-pic32mz/configs/nxlines/defconfig | 2 +-
.../pic32mz-starterkit/configs/nsh/defconfig | 2 +-
boards/misoc/lm32/misoc/configs/hello/defconfig | 2 +-
boards/misoc/lm32/misoc/configs/nsh/defconfig | 4 +-
boards/or1k/mor1kx/or1k/configs/nsh/defconfig | 4 +-
.../renesas/m16c/skp16c26/configs/ostest/defconfig | 4 +-
.../rx65n/rx65n-grrose/configs/ipv6/defconfig | 4 +-
.../rx65n/rx65n-grrose/configs/netnsh/defconfig | 4 +-
.../rx65n/rx65n-grrose/configs/nsh/defconfig | 4 +-
.../rx65n/rx65n-rsk1mb/configs/netnsh/defconfig | 4 +-
.../rx65n/rx65n-rsk1mb/configs/nsh/defconfig | 4 +-
.../rx65n/rx65n-rsk2mb/configs/ipv6/defconfig | 4 +-
.../rx65n/rx65n-rsk2mb/configs/netnsh/defconfig | 4 +-
.../rx65n/rx65n-rsk2mb/configs/nsh/defconfig | 4 +-
boards/renesas/rx65n/rx65n/configs/nsh/defconfig | 4 +-
.../renesas/sh1/us7032evb1/configs/nsh/defconfig | 4 +-
.../sh1/us7032evb1/configs/ostest/defconfig | 4 +-
boards/risc-v/bl602/bl602evb/configs/elf/defconfig | 4 +-
boards/risc-v/bl602/bl602evb/configs/fpu/defconfig | 4 +-
.../risc-v/bl602/bl602evb/configs/gpio/defconfig | 4 +-
boards/risc-v/bl602/bl602evb/configs/i2c/defconfig | 4 +-
boards/risc-v/bl602/bl602evb/configs/nsh/defconfig | 4 +-
boards/risc-v/bl602/bl602evb/configs/spi/defconfig | 4 +-
.../bl602/bl602evb/configs/spiflash/defconfig | 4 +-
.../risc-v/bl602/bl602evb/configs/timer/defconfig | 4 +-
.../risc-v/bl602/bl602evb/configs/wifi/defconfig | 4 +-
.../risc-v/c906/smartl-c906/configs/elf/defconfig | 4 +-
.../risc-v/c906/smartl-c906/configs/fpu/defconfig | 4 +-
.../risc-v/c906/smartl-c906/configs/knsh/defconfig | 4 +-
.../c906/smartl-c906/configs/module/defconfig | 4 +-
.../risc-v/c906/smartl-c906/configs/nsh/defconfig | 4 +-
.../c906/smartl-c906/configs/sotest/defconfig | 4 +-
boards/risc-v/c906/smartl-c906/kernel/Makefile | 4 +-
.../c906/smartl-c906/kernel/c906_userspace.c | 4 +-
.../esp32c3/esp32c3-devkit/configs/adc/defconfig | 2 +-
.../esp32c3-devkit/configs/autopm/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/ble/defconfig | 2 +-
.../esp32c3-devkit/configs/bmp180/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/efuse/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/elf/defconfig | 4 +-
.../esp32c3/esp32c3-devkit/configs/gpio/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/lvgl/defconfig | 2 +-
.../configs/mcuboot_confirm/defconfig | 2 +-
.../esp32c3-devkit/configs/module/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/nsh/defconfig | 2 +-
.../esp32c3-devkit/configs/oneshot/defconfig | 2 +-
.../esp32c3-devkit/configs/ostest/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/pm/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/pwm/defconfig | 2 +-
.../esp32c3-devkit/configs/random/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/romfs/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/rtc/defconfig | 2 +-
.../esp32c3-devkit/configs/sotest/defconfig | 2 +-
.../esp32c3-devkit/configs/spiflash/defconfig | 2 +-
.../esp32c3-devkit/configs/sta_softap/defconfig | 2 +-
.../esp32c3-devkit/configs/tickless/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/timer/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/uid/defconfig | 2 +-
.../esp32c3-devkit/configs/usbconsole/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/wapi/defconfig | 2 +-
.../esp32c3-devkit/configs/watchdog/defconfig | 2 +-
.../esp32c3-devkit/configs/watcher/defconfig | 2 +-
.../fe310/hifive1-revb/configs/nsh/defconfig | 4 +-
boards/risc-v/k210/maix-bit/configs/elf/defconfig | 4 +-
boards/risc-v/k210/maix-bit/configs/knsh/defconfig | 4 +-
.../k210/maix-bit/configs/knsh_smp/defconfig | 4 +-
.../risc-v/k210/maix-bit/configs/kostest/defconfig | 4 +-
.../risc-v/k210/maix-bit/configs/module/defconfig | 4 +-
boards/risc-v/k210/maix-bit/configs/nsh/defconfig | 4 +-
.../k210/maix-bit/configs/posix_spawn/defconfig | 4 +-
boards/risc-v/k210/maix-bit/configs/smp/defconfig | 4 +-
boards/risc-v/k210/maix-bit/configs/smp2/defconfig | 4 +-
boards/risc-v/k210/maix-bit/kernel/Makefile | 4 +-
.../risc-v/k210/maix-bit/kernel/k210_userspace.c | 4 +-
boards/risc-v/litex/arty_a7/configs/nsh/defconfig | 4 +-
boards/risc-v/mpfs/common/kernel/Makefile | 4 +-
boards/risc-v/mpfs/common/kernel/mpfs_userspace.c | 4 +-
boards/risc-v/mpfs/icicle/configs/hwtest/defconfig | 4 +-
boards/risc-v/mpfs/icicle/configs/nsh/defconfig | 4 +-
.../risc-v/mpfs/icicle/configs/opensbi/defconfig | 4 +-
.../risc-v/mpfs/m100pfsevp/configs/nsh/defconfig | 4 +-
.../qemu-rv32/rv32-virt/configs/nsh/defconfig | 2 +-
.../rv32m1/rv32m1-vega/configs/buttons/defconfig | 2 +-
.../rv32m1/rv32m1-vega/configs/nsh-itcm/defconfig | 2 +-
.../rv32m1/rv32m1-vega/configs/nsh/defconfig | 2 +-
boards/sim/sim/sim/README.txt | 4 +-
boards/sim/sim/sim/configs/alsa/defconfig | 2 +-
boards/sim/sim/sim/configs/asan/defconfig | 2 +-
boards/sim/sim/sim/configs/bas/defconfig | 2 +-
boards/sim/sim/sim/configs/bastest/defconfig | 2 +-
boards/sim/sim/sim/configs/bluetooth/defconfig | 2 +-
boards/sim/sim/sim/configs/bthcisock/defconfig | 2 +-
boards/sim/sim/sim/configs/btuart/defconfig | 2 +-
boards/sim/sim/sim/configs/configdata/defconfig | 2 +-
boards/sim/sim/sim/configs/cxxtest/defconfig | 2 +-
boards/sim/sim/sim/configs/duktape/defconfig | 2 +-
boards/sim/sim/sim/configs/elf/defconfig | 2 +-
boards/sim/sim/sim/configs/fb/defconfig | 2 +-
boards/sim/sim/sim/configs/foc/defconfig | 2 +-
boards/sim/sim/sim/configs/ipforward/defconfig | 2 +-
boards/sim/sim/sim/configs/kasan/defconfig | 2 +-
boards/sim/sim/sim/configs/libcxxtest/defconfig | 2 +-
boards/sim/sim/sim/configs/linuxi2c/defconfig | 2 +-
boards/sim/sim/sim/configs/linuxspi/defconfig | 2 +-
boards/sim/sim/sim/configs/loadable/defconfig | 4 +-
boards/sim/sim/sim/configs/lvgl/defconfig | 2 +-
boards/sim/sim/sim/configs/minibasic/defconfig | 2 +-
boards/sim/sim/sim/configs/module/defconfig | 2 +-
boards/sim/sim/sim/configs/module32/defconfig | 2 +-
boards/sim/sim/sim/configs/mount/defconfig | 2 +-
boards/sim/sim/sim/configs/mtdpart/defconfig | 2 +-
boards/sim/sim/sim/configs/mtdrwb/defconfig | 2 +-
boards/sim/sim/sim/configs/nettest/defconfig | 2 +-
boards/sim/sim/sim/configs/nimble/defconfig | 2 +-
boards/sim/sim/sim/configs/note/defconfig | 2 +-
boards/sim/sim/sim/configs/nsh/defconfig | 2 +-
boards/sim/sim/sim/configs/nsh2/defconfig | 2 +-
boards/sim/sim/sim/configs/nshcromfs/defconfig | 2 +-
boards/sim/sim/sim/configs/nx/defconfig | 2 +-
boards/sim/sim/sim/configs/nx11/defconfig | 2 +-
boards/sim/sim/sim/configs/nxffs/defconfig | 2 +-
boards/sim/sim/sim/configs/nxlines/defconfig | 2 +-
boards/sim/sim/sim/configs/nxwm/defconfig | 2 +-
boards/sim/sim/sim/configs/ostest/defconfig | 2 +-
boards/sim/sim/sim/configs/pf_ieee802154/defconfig | 2 +-
boards/sim/sim/sim/configs/pktradio/defconfig | 2 +-
boards/sim/sim/sim/configs/posix_spawn/defconfig | 2 +-
boards/sim/sim/sim/configs/rc/defconfig | 2 +-
boards/sim/sim/sim/configs/romfs/defconfig | 2 +-
boards/sim/sim/sim/configs/rpproxy/defconfig | 2 +-
boards/sim/sim/sim/configs/rpserver/defconfig | 2 +-
boards/sim/sim/sim/configs/sensor/defconfig | 2 +-
boards/sim/sim/sim/configs/sixlowpan/defconfig | 2 +-
boards/sim/sim/sim/configs/smartfs/defconfig | 2 +-
boards/sim/sim/sim/configs/smp/defconfig | 2 +-
boards/sim/sim/sim/configs/sotest/defconfig | 2 +-
boards/sim/sim/sim/configs/sotest32/defconfig | 2 +-
boards/sim/sim/sim/configs/spiffs/defconfig | 2 +-
boards/sim/sim/sim/configs/tcpblaster/defconfig | 2 +-
boards/sim/sim/sim/configs/tcploop/defconfig | 2 +-
boards/sim/sim/sim/configs/touchscreen/defconfig | 2 +-
boards/sim/sim/sim/configs/udgram/defconfig | 2 +-
boards/sim/sim/sim/configs/unionfs/defconfig | 2 +-
boards/sim/sim/sim/configs/userfs/defconfig | 2 +-
boards/sim/sim/sim/configs/ustream/defconfig | 2 +-
boards/sim/sim/sim/configs/vpnkit/defconfig | 2 +-
boards/x86/qemu/qemu-i486/configs/nsh/defconfig | 2 +-
boards/x86/qemu/qemu-i486/configs/ostest/defconfig | 2 +-
.../intel64/qemu-intel64/configs/nsh/defconfig | 4 +-
.../intel64/qemu-intel64/configs/ostest/defconfig | 4 +-
.../esp32/esp32-devkitc/configs/autopm/defconfig | 4 +-
.../esp32/esp32-devkitc/configs/ble/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/blewifi/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/buttons/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/elf/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/leds/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/mcp2515/defconfig | 2 +-
.../esp32-devkitc/configs/mcuboot_agent/defconfig | 2 +-
.../configs/mcuboot_confirm/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/mmcsdspi/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/module/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/mqttc/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/netnsh/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/nsh/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/oneshot/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/ostest/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/pm/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/psram/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/random/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/rtc/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/smp/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/sotest/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/spiflash/defconfig | 2 +-
.../esp32-devkitc/configs/sta_softap/defconfig | 4 +-
.../esp32/esp32-devkitc/configs/tickless/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/timer/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/wapi/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/wapi_smp/defconfig | 4 +-
.../esp32/esp32-devkitc/configs/watchdog/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/watcher/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/wifinsh/defconfig | 4 +-
.../esp32-ethernet-kit/configs/autopm/defconfig | 4 +-
.../esp32-ethernet-kit/configs/buttons/defconfig | 2 +-
.../esp32-ethernet-kit/configs/ethernet/defconfig | 2 +-
.../configs/mcuboot_agent/defconfig | 2 +-
.../configs/mcuboot_confirm/defconfig | 2 +-
.../esp32/esp32-ethernet-kit/configs/nsh/defconfig | 2 +-
.../esp32-ethernet-kit/configs/oneshot/defconfig | 2 +-
.../esp32/esp32-ethernet-kit/configs/rtc/defconfig | 2 +-
.../esp32-ethernet-kit/configs/tickless/defconfig | 2 +-
.../esp32-ethernet-kit/configs/wapi/defconfig | 4 +-
.../esp32-wrover-kit/configs/autopm/defconfig | 4 +-
.../esp32-wrover-kit/configs/bmp180/defconfig | 2 +-
.../esp32-wrover-kit/configs/buttons/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/gpio/defconfig | 2 +-
.../esp32-wrover-kit/configs/lcd1602/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/leds/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/lvgl/defconfig | 2 +-
.../configs/mcuboot_agent/defconfig | 2 +-
.../configs/mcuboot_confirm/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/nsh/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/nx/defconfig | 2 +-
.../esp32-wrover-kit/configs/oneshot/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/rtc/defconfig | 2 +-
.../esp32-wrover-kit/configs/tickless/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/wapi/defconfig | 4 +-
.../esp32/ttgo_lora_esp32/configs/nsh/defconfig | 2 +-
.../esp32s2/esp32s2-saola-1/configs/gpio/defconfig | 2 +-
.../esp32s2-saola-1/configs/mcuboot_nsh/defconfig | 2 +-
.../esp32s2/esp32s2-saola-1/configs/nsh/defconfig | 2 +-
.../esp32s2-saola-1/configs/oneshot/defconfig | 2 +-
.../esp32s2-saola-1/configs/random/defconfig | 2 +-
.../esp32s2-saola-1/configs/timer/defconfig | 3 +-
.../z16/z16f/z16f2800100zcog/configs/nsh/defconfig | 2 +-
.../z16f/z16f2800100zcog/configs/ostest/defconfig | 4 +-
.../ez80/ez80f910200kitg/configs/ostest/defconfig | 4 +-
.../ez80/ez80f910200zco/configs/dhcpd/defconfig | 4 +-
.../ez80/ez80f910200zco/configs/httpd/defconfig | 4 +-
.../ez80/ez80f910200zco/configs/nettest/defconfig | 4 +-
.../z80/ez80/ez80f910200zco/configs/nsh/defconfig | 2 +-
.../z80/ez80/ez80f910200zco/configs/poll/defconfig | 4 +-
.../z80/ez80/makerlisp/configs/nsh_flash/defconfig | 2 +-
.../z80/ez80/makerlisp/configs/nsh_ram/defconfig | 2 +-
boards/z80/ez80/makerlisp/configs/sdboot/defconfig | 2 +-
boards/z80/ez80/z20x/configs/hello/defconfig | 2 +-
boards/z80/ez80/z20x/configs/nsh/defconfig | 2 +-
boards/z80/ez80/z20x/configs/sdboot/defconfig | 2 +-
boards/z80/ez80/z20x/configs/w25boot/defconfig | 2 +-
boards/z80/z180/p112/configs/ostest/defconfig | 22 ++++-----
.../z80/z8/z8encore000zco/configs/ostest/defconfig | 4 +-
.../z80/z8/z8f64200100kit/configs/ostest/defconfig | 4 +-
boards/z80/z80/z80sim/configs/nsh/defconfig | 4 +-
boards/z80/z80/z80sim/configs/ostest/defconfig | 4 +-
include/nuttx/init.h | 2 +-
sched/Kconfig | 46 ++++++++++--------
sched/init/init.h | 2 +-
sched/init/nx_bringup.c | 55 ++++++++++++---------
tools/cfgdefine.c | 2 +-
938 files changed, 1261 insertions(+), 1310 deletions(-)
delete mode 100644 boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs
[incubator-nuttx] 02/03: init: use exec_spawn instead of exec
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 0bb32f27c080a7b67b5913839e0d44a03d434ac2
Author: ligd <li...@xiaomi.com>
AuthorDate: Mon Dec 20 12:30:57 2021 +0800
init: use exec_spawn instead of exec
Signed-off-by: ligd <li...@xiaomi.com>
---
sched/Kconfig | 4 ++++
sched/init/nx_bringup.c | 17 +++++++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/sched/Kconfig b/sched/Kconfig
index 5843b34..1f94a0f 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -347,6 +347,10 @@ config INIT_ENTRYPOINT
applications this is of the form 'app_main' where 'app' is the application
name. If not defined, INIT_ENTRYPOINT defaults to "main".
+config INIT_ENTRYNAME
+ string "Application entry name"
+ default INIT_ENTRYPOINT
+
endif # INIT_ENTRY
if INIT_FILE
diff --git a/sched/init/nx_bringup.c b/sched/init/nx_bringup.c
index 99c94c2..8ec1d74 100644
--- a/sched/init/nx_bringup.c
+++ b/sched/init/nx_bringup.c
@@ -234,6 +234,9 @@ static inline void nx_start_application(void)
FAR char *const *argv = NULL;
#endif
int ret;
+#ifdef CONFIG_INIT_FILE
+ posix_spawnattr_t attr;
+#endif
#ifdef CONFIG_BOARD_LATE_INITIALIZE
/* Perform any last-minute, board-specific initialization, if so
@@ -255,11 +258,11 @@ static inline void nx_start_application(void)
#ifdef CONFIG_BUILD_PROTECTED
DEBUGASSERT(USERSPACE->us_entrypoint != NULL);
- ret = nxtask_create("init", CONFIG_INIT_PRIORITY,
+ ret = nxtask_create(CONFIG_INIT_ENTRYNAME, CONFIG_INIT_PRIORITY,
CONFIG_INIT_STACKSIZE,
USERSPACE->us_entrypoint, argv);
#else
- ret = nxtask_create("init", CONFIG_INIT_PRIORITY,
+ ret = nxtask_create(CONFIG_INIT_ENTRYNAME, CONFIG_INIT_PRIORITY,
CONFIG_INIT_STACKSIZE,
(main_t)CONFIG_INIT_ENTRYPOINT, argv);
#endif
@@ -283,8 +286,14 @@ static inline void nx_start_application(void)
sinfo("Starting init task: %s\n", CONFIG_INIT_FILEPATH);
- ret = exec(CONFIG_INIT_FILEPATH, argv,
- CONFIG_INIT_SYMTAB, CONFIG_INIT_NEXPORTS);
+ posix_spawnattr_init(&attr);
+
+ attr.priority = CONFIG_INIT_PRIORITY;
+#ifndef CONFIG_ARCH_ADDRENV
+ attr.stacksize = CONFIG_INIT_STACKSIZE;
+#endif
+ ret = exec_spawn(CONFIG_INIT_FILEPATH, argv,
+ CONFIG_INIT_SYMTAB, CONFIG_INIT_NEXPORTS, &attr);
DEBUGASSERT(ret >= 0);
#endif
[incubator-nuttx] 01/03: init: move USERMAIN_XX out of INIT_ENTRYPOINT
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 10ccba66712301b8b3157089fa85722d2ab94b8b
Author: ligd <li...@xiaomi.com>
AuthorDate: Mon Dec 20 12:21:47 2021 +0800
init: move USERMAIN_XX out of INIT_ENTRYPOINT
Signed-off-by: ligd <li...@xiaomi.com>
---
Documentation/applications/nsh/installation.rst | 6 ++--
Documentation/guides/pysimcoder.rst | 2 +-
ReleaseNotes | 4 +--
include/nuttx/init.h | 2 +-
sched/Kconfig | 42 +++++++++++------------
sched/init/init.h | 2 +-
sched/init/nx_bringup.c | 44 ++++++++++++-------------
tools/cfgdefine.c | 2 +-
8 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/Documentation/applications/nsh/installation.rst b/Documentation/applications/nsh/installation.rst
index 2df8547..a6bd2e1 100644
--- a/Documentation/applications/nsh/installation.rst
+++ b/Documentation/applications/nsh/installation.rst
@@ -14,11 +14,11 @@ increasing difficulty:
#. You replace the sample code at ``apps/examples/nsh/nsh_main.c`` with
whatever start-up logic that you want. NSH is a library at
``apps/nshlib``. ``apps.examples/nsh`` is just a tiny, example
- start-up function (``CONFIG_USER_ENTRYPOINT``\ ()) that that runs
+ start-up function (``CONFIG_INIT_ENTRYPOINT``\ ()) that runs
immediately and illustrates how to start NSH If you want something
else to run immediately then you can write your write your own custom
- ``CONFIG_USER_ENTRYPOINT``\ () function and then start other tasks
- from your custom ``CONFIG_USER_ENTRYPOINT``\ ().
+ ``CONFIG_INIT_ENTRYPOINT``\ () function and then start other tasks
+ from your custom ``CONFIG_INIT_ENTRYPOINT``\ ().
#. NSH also supports a start-up script that executed when NSH first
runs. This mechanism has the advantage that the start-up script can
diff --git a/Documentation/guides/pysimcoder.rst b/Documentation/guides/pysimcoder.rst
index 8769689..c227fb3 100644
--- a/Documentation/guides/pysimcoder.rst
+++ b/Documentation/guides/pysimcoder.rst
@@ -60,7 +60,7 @@ with NuttX. The list is the following:
``CONFIG_LIBC_EXECFUNCS=y`` ``CONFIG_SYMTAB_ORDEREDBYNAME=y``
``CONFIG_LIBC_STRERROR=y`` ``CONFIG_SYSTEM_NSH=y``
``CONFIG_MAX_TASKS=16`` ``CONFIG_SYSTEM_NSH_STACKSIZE=4096``
-``CONFIG_NSH_BUILTIN_APPS=y`` ``CONFIG_USER_ENTRYPOINT="nsh_main"``
+``CONFIG_NSH_BUILTIN_APPS=y`` ``CONFIG_INIT_ENTRYPOINT="nsh_main"``
``CONFIG_NSH_FILEIOSIZE=512``
==================================== =====================================
diff --git a/ReleaseNotes b/ReleaseNotes
index 555e692..a229115 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -3109,7 +3109,7 @@ Or
Additional new features and extended functionality:
* RTOS: Application entry point is no longer user_start, but can be
- configured using CONFIG_USER_ENTRYPOINT. NuttX now supports two work
+ configured using CONFIG_INIT_ENTRYPOINT. NuttX now supports two work
queues: A lower priority work queue (for extended processing) and a
higher priority work queue (for quick, high priority operations).
@@ -23783,7 +23783,7 @@ Additional new features and extended functionality:
Jerpelea.
- Enable internal flash storage for SPresence boards. The SmartFS
flash is mounted under /mnt/spif folder. From Alin Jerpelea.
- - For compatibility with SDK we need to change the USER_ENTRYPOINT
+ - For compatibility with SDK we need to change the INIT_ENTRYPOINT
in all configurations to spresense_main(). From Alin Jerpelea.
* STMicro STM32:
diff --git a/include/nuttx/init.h b/include/nuttx/init.h
index b688ac5..1d73ba7 100644
--- a/include/nuttx/init.h
+++ b/include/nuttx/init.h
@@ -94,7 +94,7 @@ EXTERN uint8_t g_nx_initstate; /* See enum nx_initstate_e */
/* This entry point must be supplied by the application */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
/* Functions contained in nx_task.c *****************************************/
diff --git a/sched/Kconfig b/sched/Kconfig
index 633a33a..5843b34 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -301,18 +301,18 @@ endif # SMP
choice
prompt "Initialization Task"
- default INIT_ENTRYPOINT if !BUILD_KERNEL
- default INIT_FILEPATH if !BINFMT_DISABLE
+ default INIT_ENTRY if !BUILD_KERNEL
+ default INIT_FILE if !BINFMT_DISABLE
default INIT_NONE if BINFMT_DISABLE
config INIT_NONE
bool "None"
-config INIT_ENTRYPOINT
- bool "Via application entry point"
+config INIT_ENTRY
+ bool "Via application entry"
depends on !BUILD_KERNEL
-config INIT_FILEPATH
+config INIT_FILE
bool "Via executable file"
depends on !BINFMT_DISABLE
@@ -325,39 +325,39 @@ config INIT_ARGS
The argument list for user applications. e.g.:
"\"arg1\",\"arg2\",\"arg3\""
-if INIT_ENTRYPOINT
-config USER_ENTRYPOINT
- string "Application entry point"
- default "main"
- ---help---
- The name of the entry point for user applications. For the example
- applications this is of the form 'app_main' where 'app' is the application
- name. If not defined, USER_ENTRYPOINT defaults to "main".
-
-config USERMAIN_STACKSIZE
+config INIT_STACKSIZE
int "Main thread stack size"
default DEFAULT_TASK_STACKSIZE
---help---
The size of the stack to allocate for the user initialization thread
that is started as soon as the OS completes its initialization.
-config USERMAIN_PRIORITY
+config INIT_PRIORITY
int "init thread priority"
default 100
---help---
The priority of the user initialization thread.
-endif # INIT_ENTRYPOINT
+if INIT_ENTRY
+config INIT_ENTRYPOINT
+ string "Application entry point"
+ default "main"
+ ---help---
+ The name of the entry point for user applications. For the example
+ applications this is of the form 'app_main' where 'app' is the application
+ name. If not defined, INIT_ENTRYPOINT defaults to "main".
-if INIT_FILEPATH
+endif # INIT_ENTRY
-config USER_INITPATH
+if INIT_FILE
+
+config INIT_FILEPATH
string "Application initialization path"
default "/bin/init"
---help---
The name of the entry point for user applications. For the example
applications this is of the form 'app_main' where 'app' is the application
- name. If not defined, USER_ENTRYPOINT defaults to "main".
+ name. If not defined, INIT_ENTRYPOINT defaults to "main".
config INIT_SYMTAB
string "Symbol table"
@@ -423,7 +423,7 @@ config INIT_MOUNT_DATA
default ""
endif # INIT_MOUNT
-endif # INIT_FILEPATH
+endif # INIT_FILE
config RR_INTERVAL
int "Round robin timeslice (MSEC)"
diff --git a/sched/init/init.h b/sched/init/init.h
index fe7b759..1e389b5 100644
--- a/sched/init/init.h
+++ b/sched/init/init.h
@@ -107,7 +107,7 @@ void nx_idle_trampoline(void);
* And the main application entry point:
* symbols:
*
- * - USER_ENTRYPOINT: This is the default user application entry point.
+ * - INIT_ENTRYPOINT: This is the default user application entry point.
*
* Input Parameters:
* None
diff --git a/sched/init/nx_bringup.c b/sched/init/nx_bringup.c
index 66e5b08..99c94c2 100644
--- a/sched/init/nx_bringup.c
+++ b/sched/init/nx_bringup.c
@@ -58,34 +58,34 @@
# error No initialization mechanism selected (CONFIG_INIT_NONE)
#else
-# if !defined(CONFIG_INIT_ENTRYPOINT) && !defined(CONFIG_INIT_FILEPATH)
+# if !defined(CONFIG_INIT_ENTRY) && !defined(CONFIG_INIT_FILE)
/* For backward compatibility with older defconfig files when this was
* the way things were done.
*/
-# define CONFIG_INIT_ENTRYPOINT 1
+# define CONFIG_INIT_ENTRY 1
# endif
-# if defined(CONFIG_INIT_ENTRYPOINT)
+# if defined(CONFIG_INIT_ENTRY)
/* Initialize by starting a task at an entry point */
-# ifndef CONFIG_USER_ENTRYPOINT
+# ifndef CONFIG_INIT_ENTRYPOINT
/* Entry point name must have been provided */
-# error CONFIG_USER_ENTRYPOINT must be defined
+# error CONFIG_INIT_ENTRYPOINT must be defined
# endif
-# elif defined(CONFIG_INIT_FILEPATH)
+# elif defined(CONFIG_INIT_FILE)
/* Initialize by running an initialization program in the file system.
* Presumably the user has configured a board initialization function
* that will mount the file system containing the initialization
* program.
*/
-# ifndef CONFIG_USER_INITPATH
+# ifndef CONFIG_INIT_FILEPATH
/* Path to the initialization program must have been provided */
-# error CONFIG_USER_INITPATH must be defined
+# error CONFIG_INT_FILEPATH must be defined
# endif
# if !defined(CONFIG_INIT_SYMTAB) || !defined(CONFIG_INIT_NEXPORTS)
@@ -108,8 +108,8 @@ extern const int CONFIG_INIT_NEXPORTS;
# undef CONFIG_LIBC_USRWORK
#endif
-#if !defined(CONFIG_USERMAIN_PRIORITY)
-# define CONFIG_USERMAIN_PRIORITY SCHED_PRIORITY_DEFAULT
+#if !defined(CONFIG_INIT_PRIORITY)
+# define CONFIG_INIT_PRIORITY SCHED_PRIORITY_DEFAULT
#endif
/****************************************************************************
@@ -243,10 +243,10 @@ static inline void nx_start_application(void)
board_late_initialize();
#endif
-#if defined(CONFIG_INIT_ENTRYPOINT)
+#if defined(CONFIG_INIT_ENTRY)
/* Start the application initialization task. In a flat build, this is
- * entrypoint is given by the definitions, CONFIG_USER_ENTRYPOINT. In
+ * entrypoint is given by the definitions, CONFIG_INIT_ENTRYPOINT. In
* the protected build, however, we must get the address of the
* entrypoint from the header at the beginning of the user-space blob.
*/
@@ -255,17 +255,17 @@ static inline void nx_start_application(void)
#ifdef CONFIG_BUILD_PROTECTED
DEBUGASSERT(USERSPACE->us_entrypoint != NULL);
- ret = nxtask_create("init", CONFIG_USERMAIN_PRIORITY,
- CONFIG_USERMAIN_STACKSIZE,
+ ret = nxtask_create("init", CONFIG_INIT_PRIORITY,
+ CONFIG_INIT_STACKSIZE,
USERSPACE->us_entrypoint, argv);
#else
- ret = nxtask_create("init", CONFIG_USERMAIN_PRIORITY,
- CONFIG_USERMAIN_STACKSIZE,
- (main_t)CONFIG_USER_ENTRYPOINT, argv);
+ ret = nxtask_create("init", CONFIG_INIT_PRIORITY,
+ CONFIG_INIT_STACKSIZE,
+ (main_t)CONFIG_INIT_ENTRYPOINT, argv);
#endif
DEBUGASSERT(ret > 0);
-#elif defined(CONFIG_INIT_FILEPATH)
+#elif defined(CONFIG_INIT_FILE)
#ifdef CONFIG_INIT_MOUNT
/* Mount the file system containing the init program. */
@@ -281,9 +281,9 @@ static inline void nx_start_application(void)
* of the board_late_initialize() operation.
*/
- sinfo("Starting init task: %s\n", CONFIG_USER_INITPATH);
+ sinfo("Starting init task: %s\n", CONFIG_INIT_FILEPATH);
- ret = exec(CONFIG_USER_INITPATH, argv,
+ ret = exec(CONFIG_INIT_FILEPATH, argv,
CONFIG_INIT_SYMTAB, CONFIG_INIT_NEXPORTS);
DEBUGASSERT(ret >= 0);
#endif
@@ -377,9 +377,9 @@ static inline void nx_create_initthread(void)
* And the main application entry point:
* symbols, either:
*
- * - CONFIG_USER_ENTRYPOINT: This is the default user application entry
+ * - CONFIG_INIT_ENTRYPOINT: This is the default user application entry
* point, or
- * - CONFIG_USER_INITPATH: The full path to the location in a mounted
+ * - CONFIG_INIT_FILEPATH: The full path to the location in a mounted
* file system where we can expect to find the
* initialization program. Presumably, this file system
* was mounted by board-specific logic when
diff --git a/tools/cfgdefine.c b/tools/cfgdefine.c
index 39cccac..87ecb87 100644
--- a/tools/cfgdefine.c
+++ b/tools/cfgdefine.c
@@ -54,12 +54,12 @@ static const char *dequote_list[] =
"CONFIG_INIT_ARGS", /* Argument list of entry point */
"CONFIG_INIT_SYMTAB", /* Global symbol table */
"CONFIG_INIT_NEXPORTS", /* Global symbol table size */
+ "CONFIG_INIT_ENTRYPOINT", /* Name of entry point function */
"CONFIG_MODLIB_SYMTAB_ARRAY", /* Symbol table array used by modlib functions */
"CONFIG_MODLIB_NSYMBOLS_VAR", /* Variable holding number of symbols in the table */
"CONFIG_PASS1_BUILDIR", /* Pass1 build directory */
"CONFIG_PASS1_TARGET", /* Pass1 build target */
"CONFIG_PASS1_OBJECT", /* Pass1 build object */
- "CONFIG_USER_ENTRYPOINT", /* Name of entry point function */
/* NxWidgets/NxWM */
[incubator-nuttx] 03/03: boards: move USERMAIN_XX out of INIT_ENTRYPOINT
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 412d030149829c582749ece9f081f6609d2d6e7f
Author: ligd <li...@xiaomi.com>
AuthorDate: Thu Dec 23 11:56:43 2021 +0800
boards: move USERMAIN_XX out of INIT_ENTRYPOINT
Signed-off-by: ligd <li...@xiaomi.com>
---
boards/arm/a1x/pcduino-a10/configs/nsh/defconfig | 2 +-
.../am335x/beaglebone-black/configs/lcd/defconfig | 2 +-
.../am335x/beaglebone-black/configs/nsh/defconfig | 2 +-
boards/arm/c5471/c5471evm/configs/httpd/defconfig | 4 +-
.../arm/c5471/c5471evm/configs/nettest/defconfig | 4 +-
boards/arm/c5471/c5471evm/configs/nsh/defconfig | 4 +-
.../arm/cxd56xx/spresense/configs/audio/defconfig | 2 +-
.../cxd56xx/spresense/configs/audio_sdk/defconfig | 3 +-
.../arm/cxd56xx/spresense/configs/camera/defconfig | 2 +-
.../cxd56xx/spresense/configs/charger/defconfig | 2 +-
boards/arm/cxd56xx/spresense/configs/elf/defconfig | 2 +-
.../spresense/configs/example_camera/defconfig | 2 +-
.../spresense/configs/example_lcd/defconfig | 2 +-
boards/arm/cxd56xx/spresense/configs/lcd/defconfig | 2 +-
boards/arm/cxd56xx/spresense/configs/lte/defconfig | 2 +-
.../arm/cxd56xx/spresense/configs/module/defconfig | 2 +-
boards/arm/cxd56xx/spresense/configs/mpy/defconfig | 2 +-
boards/arm/cxd56xx/spresense/configs/nsh/defconfig | 2 +-
.../cxd56xx/spresense/configs/nsh_trace/defconfig | 2 +-
.../spresense/configs/posix_spawn/defconfig | 2 +-
.../arm/cxd56xx/spresense/configs/rndis/defconfig | 4 +-
.../cxd56xx/spresense/configs/rndis_smp/defconfig | 4 +-
boards/arm/cxd56xx/spresense/configs/smp/defconfig | 2 +-
.../arm/cxd56xx/spresense/configs/usbmsc/defconfig | 2 +-
.../arm/cxd56xx/spresense/configs/usbnsh/defconfig | 2 +-
.../arm/cxd56xx/spresense/configs/wifi/defconfig | 4 +-
.../cxd56xx/spresense/configs/wifi_smp/defconfig | 4 +-
.../dm320/ntosd-dm320/configs/nettest/defconfig | 4 +-
boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig | 4 +-
.../arm/dm320/ntosd-dm320/configs/poll/defconfig | 4 +-
boards/arm/dm320/ntosd-dm320/configs/udp/defconfig | 4 +-
.../dm320/ntosd-dm320/configs/webserver/defconfig | 4 +-
.../arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig | 2 +-
.../efm32/efm32gg-stk3700/configs/nsh/defconfig | 2 +-
.../olimex-efm32g880f128-stk/configs/nsh/defconfig | 2 +-
.../arm/eoss3/quickfeather/configs/nsh/defconfig | 4 +-
boards/arm/imx6/sabre-6quad/configs/elf/defconfig | 2 +-
.../arm/imx6/sabre-6quad/configs/netnsh/defconfig | 4 +-
.../imx6/sabre-6quad/configs/netnsh_smp/defconfig | 4 +-
boards/arm/imx6/sabre-6quad/configs/nsh/defconfig | 2 +-
.../imx6/sabre-6quad/configs/posix_spawn/defconfig | 2 +-
boards/arm/imx6/sabre-6quad/configs/smp/defconfig | 2 +-
.../imxrt/imxrt1020-evk/configs/netnsh/defconfig | 2 +-
.../arm/imxrt/imxrt1020-evk/configs/nsh/defconfig | 2 +-
.../imxrt/imxrt1020-evk/configs/usdhc/defconfig | 2 +-
.../arm/imxrt/imxrt1050-evk/configs/knsh/defconfig | 2 +-
.../imxrt1050-evk/configs/libcxxtest/defconfig | 2 +-
.../imxrt/imxrt1050-evk/configs/netnsh/defconfig | 2 +-
.../arm/imxrt/imxrt1050-evk/configs/nsh/defconfig | 2 +-
boards/arm/imxrt/imxrt1050-evk/kernel/Makefile | 4 +-
.../imxrt/imxrt1050-evk/kernel/imxrt_userspace.c | 4 +-
.../arm/imxrt/imxrt1060-evk/configs/can/defconfig | 2 +-
.../imxrt/imxrt1060-evk/configs/canfd/defconfig | 2 +-
.../arm/imxrt/imxrt1060-evk/configs/knsh/defconfig | 2 +-
.../imxrt1060-evk/configs/libcxxtest/defconfig | 2 +-
.../arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig | 2 +-
.../imxrt/imxrt1060-evk/configs/netnsh/defconfig | 2 +-
.../arm/imxrt/imxrt1060-evk/configs/nsh/defconfig | 2 +-
.../imxrt/imxrt1060-evk/configs/nshocram/defconfig | 2 +-
boards/arm/imxrt/imxrt1060-evk/kernel/Makefile | 4 +-
.../imxrt/imxrt1060-evk/kernel/imxrt_userspace.c | 4 +-
.../arm/imxrt/imxrt1064-evk/configs/can/defconfig | 2 +-
.../imxrt/imxrt1064-evk/configs/canfd/defconfig | 2 +-
.../arm/imxrt/imxrt1064-evk/configs/knsh/defconfig | 2 +-
.../imxrt1064-evk/configs/libcxxtest/defconfig | 2 +-
.../arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig | 2 +-
.../imxrt/imxrt1064-evk/configs/netnsh/defconfig | 2 +-
.../arm/imxrt/imxrt1064-evk/configs/nsh/defconfig | 2 +-
.../imxrt/imxrt1064-evk/configs/nshocram/defconfig | 2 +-
boards/arm/imxrt/imxrt1064-evk/kernel/Makefile | 4 +-
.../imxrt/imxrt1064-evk/kernel/imxrt_userspace.c | 4 +-
.../arm/imxrt/teensy-4.x/configs/can-4.1/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/enc-4.1/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig | 2 +-
.../imxrt/teensy-4.x/configs/netnsh-4.1/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig | 2 +-
.../imxrt/teensy-4.x/configs/pikron-bb/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/pwm-4.1/defconfig | 2 +-
.../arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig | 2 +-
boards/arm/imxrt/teensy-4.x/kernel/Makefile | 4 +-
.../arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c | 4 +-
.../arm/kinetis/freedom-k28f/configs/nsh/defconfig | 2 +-
.../freedom-k28f/configs/nshsdusb/defconfig | 4 +-
.../kinetis/freedom-k64f/configs/cdcacm/defconfig | 2 +-
.../kinetis/freedom-k64f/configs/demo/defconfig | 2 +-
.../kinetis/freedom-k64f/configs/netnsh/defconfig | 2 +-
.../arm/kinetis/freedom-k64f/configs/nsh/defconfig | 2 +-
.../kinetis/freedom-k66f/configs/netnsh/defconfig | 2 +-
.../arm/kinetis/freedom-k66f/configs/nsh/defconfig | 2 +-
.../kinetis/kwikstik-k40/configs/ostest/defconfig | 2 +-
.../arm/kinetis/teensy-3.x/configs/nsh/defconfig | 2 +-
.../kinetis/teensy-3.x/configs/usbnsh/defconfig | 2 +-
.../arm/kinetis/twr-k60n512/configs/nsh/defconfig | 2 +-
.../kinetis/twr-k64f120m/configs/netnsh/defconfig | 2 +-
.../arm/kinetis/twr-k64f120m/configs/nsh/defconfig | 2 +-
boards/arm/kl/freedom-kl25z/configs/nsh/defconfig | 4 +-
boards/arm/kl/freedom-kl26z/configs/nsh/defconfig | 4 +-
boards/arm/kl/teensy-lc/configs/nsh/defconfig | 4 +-
.../lc823450-xgevk/configs/audio/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/bt/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/elf/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/ipl2/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/knsh/defconfig | 4 +-
.../lc823450-xgevk/configs/kostest/defconfig | 4 +-
.../lc823450-xgevk/configs/krndis/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/nsh/defconfig | 4 +-
.../lc823450-xgevk/configs/posix_spawn/defconfig | 4 +-
.../lc823450-xgevk/configs/rndis/defconfig | 4 +-
.../lc823450/lc823450-xgevk/configs/usb/defconfig | 4 +-
boards/arm/lc823450/lc823450-xgevk/kernel/Makefile | 4 +-
.../lc823450-xgevk/kernel/lc823450_userspace.c | 4 +-
.../lincoln60/configs/netnsh/defconfig | 2 +-
.../lpc17xx_40xx/lincoln60/configs/nsh/defconfig | 2 +-
.../lincoln60/configs/thttpd-binfs/defconfig | 4 +-
.../lpc4088-devkit/configs/knsh/defconfig | 2 +-
.../lpc4088-devkit/configs/nsh/defconfig | 4 +-
.../lpc17xx_40xx/lpc4088-devkit/kernel/Makefile | 4 +-
.../lpc4088-devkit/kernel/lpc17_40_userspace.c | 4 +-
.../lpc4088-quickstart/configs/knsh/defconfig | 2 +-
.../lpc4088-quickstart/configs/nsh/defconfig | 2 +-
.../lpc4088-quickstart/kernel/Makefile | 4 +-
.../lpc4088-quickstart/kernel/lpc17_40_userspace.c | 4 +-
.../lpcxpresso-lpc1768/configs/dhcpd/defconfig | 2 +-
.../lpcxpresso-lpc1768/configs/nsh/defconfig | 2 +-
.../lpcxpresso-lpc1768/configs/nx/defconfig | 2 +-
.../lpcxpresso-lpc1768/configs/thttpd/defconfig | 4 +-
.../lpcxpresso-lpc1768/configs/usbmsc/defconfig | 2 +-
.../arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig | 4 +-
boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig | 2 +-
.../lpc17xx_40xx/mbed/configs/userled/defconfig | 2 +-
.../arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig | 2 +-
.../olimex-lpc1766stk/configs/ftpc/defconfig | 2 +-
.../olimex-lpc1766stk/configs/hidkbd/defconfig | 2 +-
.../olimex-lpc1766stk/configs/hidmouse/defconfig | 2 +-
.../olimex-lpc1766stk/configs/nettest/defconfig | 2 +-
.../olimex-lpc1766stk/configs/nsh/defconfig | 2 +-
.../olimex-lpc1766stk/configs/slip-httpd/defconfig | 4 +-
.../configs/thttpd-binfs/defconfig | 4 +-
.../configs/thttpd-nxflat/defconfig | 4 +-
.../olimex-lpc1766stk/configs/usbmsc/defconfig | 2 +-
.../olimex-lpc1766stk/configs/usbserial/defconfig | 2 +-
.../olimex-lpc1766stk/configs/zmodem/defconfig | 2 +-
.../arm/lpc17xx_40xx/open1788/configs/fb/defconfig | 2 +-
.../lpc17xx_40xx/open1788/configs/knsh/defconfig | 2 +-
.../open1788/configs/knxterm/defconfig | 2 +-
.../lpc17xx_40xx/open1788/configs/nsh/defconfig | 2 +-
.../open1788/configs/nxlines/defconfig | 2 +-
.../open1788/configs/pdcurses/defconfig | 2 +-
.../lpc17xx_40xx/open1788/configs/pwfb/defconfig | 2 +-
boards/arm/lpc17xx_40xx/open1788/kernel/Makefile | 4 +-
.../open1788/kernel/lpc17_40_userspace.c | 4 +-
.../lpc17xx_40xx/pnev5180b/configs/knsh/defconfig | 2 +-
.../pnev5180b/configs/nsh-cdcecm/defconfig | 2 +-
.../lpc17xx_40xx/pnev5180b/configs/nsh/defconfig | 2 +-
.../pnev5180b/configs/usbnsh-cdcecm/defconfig | 2 +-
.../pnev5180b/configs/usbnsh/defconfig | 2 +-
boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile | 4 +-
.../pnev5180b/kernel/lpc17_40_userspace.c | 4 +-
.../lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig | 2 +-
.../zkit-arm-1769/configs/hello/defconfig | 4 +-
.../zkit-arm-1769/configs/nsh/defconfig | 2 +-
.../zkit-arm-1769/configs/nxhello/defconfig | 2 +-
.../zkit-arm-1769/configs/thttpd/defconfig | 4 +-
.../mcu123-lpc214x/configs/composite/defconfig | 2 +-
.../lpc214x/mcu123-lpc214x/configs/nsh/defconfig | 2 +-
.../mcu123-lpc214x/configs/usbmsc/defconfig | 2 +-
.../mcu123-lpc214x/configs/usbserial/defconfig | 2 +-
boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig | 2 +-
.../arm/lpc214x/zp214xpa/configs/nxlines/defconfig | 2 +-
.../lpc2378/olimex-lpc2378/configs/nsh/defconfig | 2 +-
boards/arm/lpc31xx/ea3131/configs/nsh/defconfig | 2 +-
boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig | 2 +-
.../arm/lpc31xx/ea3131/configs/usbserial/defconfig | 2 +-
boards/arm/lpc31xx/ea3152/configs/ostest/defconfig | 2 +-
boards/arm/lpc31xx/olimex-lpc-h3131/README.txt | 2 +-
.../lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig | 4 +-
.../lpc43xx/bambino-200e/configs/knsh/defconfig | 2 +-
.../bambino-200e/configs/max31855/defconfig | 2 +-
.../lpc43xx/bambino-200e/configs/netnsh/defconfig | 2 +-
.../arm/lpc43xx/bambino-200e/configs/nsh/defconfig | 2 +-
.../lpc43xx/bambino-200e/configs/usbnsh/defconfig | 2 +-
boards/arm/lpc43xx/bambino-200e/kernel/Makefile | 4 +-
.../lpc43xx/bambino-200e/kernel/lpc43_userspace.c | 4 +-
.../lpc43xx/lpc4330-xplorer/configs/nsh/defconfig | 2 +-
.../arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig | 2 +-
.../arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig | 2 +-
.../lpc43xx/lpc4370-link2/configs/nsh/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/fb/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/lvgl/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/netnsh/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/nsh/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/nxwm/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/pwfb/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/pwlines/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/twm4nx1/defconfig | 2 +-
.../lpcxpresso-lpc54628/configs/twm4nx2/defconfig | 2 +-
.../max326xx/max32660-evsys/configs/nsh/defconfig | 2 +-
boards/arm/moxart/moxa/configs/nsh/defconfig | 2 +-
.../arm/nrf52/nrf52-feather/configs/i2c/defconfig | 2 +-
.../arm/nrf52/nrf52-feather/configs/nsh/defconfig | 2 +-
.../nrf52/nrf52-feather/configs/userleds/defconfig | 2 +-
boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig | 2 +-
.../arm/nrf52/nrf52832-dk/configs/wdog/defconfig | 2 +-
.../arm/nrf52/nrf52832-mdk/configs/nsh/defconfig | 2 +-
.../nrf52/nrf52832-sparkfun/configs/nsh/defconfig | 2 +-
boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig | 2 +-
.../nrf52/nrf52840-dk/configs/highpri/defconfig | 2 +-
boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig | 2 +-
boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig | 2 +-
.../arm/nrf52/nrf52840-dk/configs/sx127x/defconfig | 2 +-
.../arm/nrf52/nrf52840-dk/configs/timer/defconfig | 2 +-
.../nrf52/nrf52840-dongle/configs/nsh/defconfig | 2 +-
.../arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig | 4 +-
boards/arm/phy62xx/phy6222/configs/nsh/defconfig | 4 +-
.../arm/phy62xx/phy6222/configs/phy_sbp/defconfig | 4 +-
.../raspberrypi-pico/configs/audiopack/defconfig | 2 +-
.../raspberrypi-pico/configs/composite/defconfig | 2 +-
.../raspberrypi-pico/configs/displaypack/defconfig | 2 +-
.../raspberrypi-pico/configs/enc28j60/defconfig | 2 +-
.../raspberrypi-pico/configs/lcd1602/defconfig | 2 +-
.../rp2040/raspberrypi-pico/configs/nsh/defconfig | 2 +-
.../raspberrypi-pico/configs/nshsram/defconfig | 2 +-
.../rp2040/raspberrypi-pico/configs/smp/defconfig | 2 +-
.../raspberrypi-pico/configs/spisd/defconfig | 2 +-
.../raspberrypi-pico/configs/ssd1306/defconfig | 2 +-
.../raspberrypi-pico/configs/st7735/defconfig | 2 +-
.../raspberrypi-pico/configs/usbmsc/defconfig | 2 +-
.../raspberrypi-pico/configs/usbnsh/defconfig | 2 +-
.../configs/waveshare-lcd-1.14/defconfig | 2 +-
.../configs/waveshare-lcd-1.3/defconfig | 2 +-
.../arm/s32k1xx/s32k118evb/configs/nsh/defconfig | 4 +-
.../arm/s32k1xx/s32k144evb/configs/nsh/defconfig | 2 +-
.../arm/s32k1xx/s32k146evb/configs/nsh/defconfig | 2 +-
.../arm/s32k1xx/s32k148evb/configs/nsh/defconfig | 2 +-
.../arm/s32k1xx/ucans32k146/configs/can/defconfig | 2 +-
.../arm/s32k1xx/ucans32k146/configs/nsh/defconfig | 2 +-
boards/arm/sam34/arduino-due/configs/nsh/defconfig | 2 +-
.../sam34/flipnclick-sam3x/configs/nsh/defconfig | 2 +-
.../flipnclick-sam3x/configs/nxlines/defconfig | 2 +-
boards/arm/sam34/sam3u-ek/configs/knsh/defconfig | 2 +-
boards/arm/sam34/sam3u-ek/configs/nsh/defconfig | 2 +-
boards/arm/sam34/sam3u-ek/configs/nx/defconfig | 2 +-
boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig | 4 +-
boards/arm/sam34/sam3u-ek/kernel/Makefile | 4 +-
boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c | 4 +-
boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig | 2 +-
boards/arm/sam34/sam4e-ek/README.txt | 2 +-
boards/arm/sam34/sam4e-ek/configs/nsh/defconfig | 2 +-
boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig | 4 +-
boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig | 2 +-
.../arm/sam34/sam4l-xplained/configs/nsh/defconfig | 4 +-
.../sam34/sam4s-xplained-pro/configs/fs/defconfig | 4 +-
.../sam34/sam4s-xplained-pro/configs/nsh/defconfig | 4 +-
.../arm/sam34/sam4s-xplained/configs/nsh/defconfig | 2 +-
.../arm/sama5/giant-board/configs/netnsh/defconfig | 2 +-
boards/arm/sama5/giant-board/configs/nsh/defconfig | 2 +-
.../giant-board/configs/sdmmc-net-nsh/defconfig | 2 +-
.../sama5/giant-board/configs/sdmmcnsh/defconfig | 2 +-
.../sama5/sama5d2-xult/configs/netnsh/defconfig | 2 +-
.../arm/sama5/sama5d2-xult/configs/nsh/defconfig | 2 +-
.../sama5/sama5d2-xult/configs/sdmmcnsh/defconfig | 2 +-
.../sama5d3-xplained/configs/bridge/defconfig | 2 +-
.../ethernet-over-usb-2-high-speed/defconfig | 2 +-
.../sama5/sama5d3-xplained/configs/nsh/defconfig | 2 +-
.../arm/sama5/sama5d3x-ek/configs/demo/defconfig | 2 +-
.../arm/sama5/sama5d3x-ek/configs/hello/defconfig | 2 +-
.../sama5/sama5d3x-ek/configs/norboot/defconfig | 2 +-
boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig | 2 +-
boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig | 2 +-
.../sama5/sama5d3x-ek/configs/nxplayer/defconfig | 2 +-
.../arm/sama5/sama5d3x-ek/configs/nxwm/defconfig | 4 +-
.../arm/sama5/sama5d3x-ek/configs/ov2640/defconfig | 2 +-
boards/arm/sama5/sama5d4-ek/README.txt | 4 +-
.../sama5/sama5d4-ek/configs/at25boot/defconfig | 2 +-
.../arm/sama5/sama5d4-ek/configs/bridge/defconfig | 2 +-
.../sama5/sama5d4-ek/configs/dramboot/defconfig | 2 +-
boards/arm/sama5/sama5d4-ek/configs/elf/defconfig | 4 +-
boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig | 2 +-
boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig | 2 +-
boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig | 4 +-
.../arm/sama5/sama5d4-ek/configs/ramtest/defconfig | 2 +-
.../arm/samd2l2/arduino-m0/configs/nsh/defconfig | 4 +-
.../samd2l2/arduino-m0/configs/usbnsh/defconfig | 4 +-
.../samd2l2/circuit-express/configs/nsh/defconfig | 4 +-
.../circuit-express/configs/usbnsh/defconfig | 4 +-
.../samd2l2/samd20-xplained/configs/nsh/defconfig | 4 +-
.../samd2l2/samd21-xplained/configs/nsh/defconfig | 4 +-
.../samd2l2/saml21-xplained/configs/nsh/defconfig | 4 +-
boards/arm/samd5e5/metro-m4/configs/nsh/defconfig | 4 +-
.../same54-xplained-pro/configs/nsh/defconfig | 4 +-
boards/arm/samv7/same70-qmtech/README.txt | 6 +--
.../configs/mcuboot-confirm/defconfig | 2 +-
.../same70-qmtech/configs/mcuboot-loader/defconfig | 2 +-
.../arm/samv7/same70-qmtech/configs/nsh/defconfig | 2 +-
boards/arm/samv7/same70-qmtech/kernel/Makefile | 4 +-
.../arm/samv7/same70-qmtech/kernel/sam_userspace.c | 4 +-
boards/arm/samv7/same70-xplained/README.txt | 8 ++--
.../samv7/same70-xplained/configs/adc/defconfig | 2 +-
.../configs/mcuboot-confirm/defconfig | 2 +-
.../configs/mcuboot-loader/defconfig | 2 +-
.../configs/mrf24j40-starhub/defconfig | 2 +-
.../samv7/same70-xplained/configs/netnsh/defconfig | 2 +-
.../samv7/same70-xplained/configs/nsh/defconfig | 2 +-
.../samv7/same70-xplained/configs/twm4nx/defconfig | 2 +-
boards/arm/samv7/same70-xplained/kernel/Makefile | 4 +-
.../samv7/same70-xplained/kernel/sam_userspace.c | 4 +-
boards/arm/samv7/samv71-xult/README.txt | 8 ++--
.../arm/samv7/samv71-xult/configs/knsh/defconfig | 2 +-
.../samv71-xult/configs/mcuboot-loader/defconfig | 2 +-
.../samv71-xult/configs/mcuboot-nsh/defconfig | 2 +-
.../arm/samv7/samv71-xult/configs/module/defconfig | 2 +-
.../samv71-xult/configs/mrf24j40-starhub/defconfig | 2 +-
.../samv7/samv71-xult/configs/mxtxplnd/defconfig | 2 +-
.../arm/samv7/samv71-xult/configs/netnsh/defconfig | 2 +-
boards/arm/samv7/samv71-xult/configs/nsh/defconfig | 2 +-
.../arm/samv7/samv71-xult/configs/nxwm/defconfig | 4 +-
boards/arm/samv7/samv71-xult/configs/vnc/defconfig | 2 +-
.../arm/samv7/samv71-xult/configs/vnxwm/defconfig | 4 +-
boards/arm/samv7/samv71-xult/kernel/Makefile | 4 +-
.../arm/samv7/samv71-xult/kernel/sam_userspace.c | 4 +-
boards/arm/stm32/axoloti/configs/nsh/defconfig | 2 +-
.../stm32/b-g431b-esc1/configs/foc_b16/defconfig | 2 +-
.../stm32/b-g431b-esc1/configs/foc_f32/defconfig | 2 +-
.../arm/stm32/b-g431b-esc1/configs/nsh/defconfig | 2 +-
.../arm/stm32/b-g474e-dpow1/configs/nsh/defconfig | 2 +-
.../stm32/clicker2-stm32/configs/knsh/defconfig | 2 +-
.../configs/mrf24j40-6lowpan/defconfig | 2 +-
.../clicker2-stm32/configs/mrf24j40-mac/defconfig | 2 +-
.../configs/mrf24j40-starhub/defconfig | 2 +-
.../configs/mrf24j40-starpoint/defconfig | 2 +-
.../arm/stm32/clicker2-stm32/configs/nsh/defconfig | 2 +-
.../stm32/clicker2-stm32/configs/usbnsh/defconfig | 2 +-
.../clicker2-stm32/configs/xbee-6lowpan/defconfig | 2 +-
boards/arm/stm32/clicker2-stm32/kernel/Makefile | 4 +-
.../stm32/clicker2-stm32/kernel/stm32_userspace.c | 4 +-
boards/arm/stm32/cloudctrl/configs/nsh/defconfig | 2 +-
boards/arm/stm32/emw3162/configs/nsh/defconfig | 2 +-
boards/arm/stm32/emw3162/configs/wlan/defconfig | 2 +-
.../arm/stm32/et-stm32-stamp/configs/nsh/defconfig | 2 +-
.../arm/stm32/fire-stm32v2/configs/nsh/defconfig | 2 +-
.../arm/stm32/hymini-stm32v/configs/nsh/defconfig | 2 +-
.../arm/stm32/hymini-stm32v/configs/nsh2/defconfig | 2 +-
.../stm32/hymini-stm32v/configs/usbmsc/defconfig | 2 +-
.../stm32/hymini-stm32v/configs/usbnsh/defconfig | 2 +-
.../hymini-stm32v/configs/usbserial/defconfig | 2 +-
boards/arm/stm32/maple/configs/nsh/defconfig | 2 +-
boards/arm/stm32/maple/configs/nx/defconfig | 2 +-
boards/arm/stm32/maple/configs/usbnsh/defconfig | 2 +-
.../mikroe-stm32f4/configs/fulldemo/defconfig | 2 +-
.../stm32/mikroe-stm32f4/configs/kostest/defconfig | 2 +-
.../arm/stm32/mikroe-stm32f4/configs/nsh/defconfig | 2 +-
.../arm/stm32/mikroe-stm32f4/configs/nx/defconfig | 2 +-
.../stm32/mikroe-stm32f4/configs/nxlines/defconfig | 2 +-
.../stm32/mikroe-stm32f4/configs/nxtext/defconfig | 2 +-
.../stm32/mikroe-stm32f4/configs/usbnsh/defconfig | 2 +-
boards/arm/stm32/mikroe-stm32f4/kernel/Makefile | 4 +-
.../stm32/mikroe-stm32f4/kernel/stm32_userspace.c | 4 +-
.../arm/stm32/nucleo-f103rb/configs/adc/defconfig | 2 +-
.../nucleo-f103rb/configs/ihm07m1_b16/defconfig | 2 +-
.../arm/stm32/nucleo-f103rb/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-f103rb/configs/pwm/defconfig | 2 +-
.../stm32/nucleo-f103rb/configs/qenco/defconfig | 2 +-
.../arm/stm32/nucleo-f207zg/configs/adc/defconfig | 2 +-
.../arm/stm32/nucleo-f207zg/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-f207zg/configs/pwm/defconfig | 2 +-
.../stm32/nucleo-f302r8/configs/highpri/defconfig | 4 +-
.../nucleo-f302r8/configs/ihm07m1_b16/defconfig | 2 +-
.../nucleo-f302r8/configs/ihm07m1_f32/defconfig | 2 +-
.../arm/stm32/nucleo-f302r8/configs/nsh/defconfig | 4 +-
.../stm32/nucleo-f302r8/configs/qenco/defconfig | 2 +-
.../arm/stm32/nucleo-f303re/configs/adc/defconfig | 2 +-
.../arm/stm32/nucleo-f303re/configs/can/defconfig | 2 +-
.../stm32/nucleo-f303re/configs/hello/defconfig | 2 +-
.../arm/stm32/nucleo-f303re/configs/nsh/defconfig | 2 +-
.../stm32/nucleo-f303re/configs/nxlines/defconfig | 2 +-
.../arm/stm32/nucleo-f303re/configs/pwm/defconfig | 2 +-
.../stm32/nucleo-f303re/configs/serialrx/defconfig | 2 +-
.../arm/stm32/nucleo-f303ze/configs/adc/defconfig | 2 +-
.../arm/stm32/nucleo-f303ze/configs/nsh/defconfig | 2 +-
.../nucleo-f303ze/configs/nxlines_oled/defconfig | 2 +-
.../arm/stm32/nucleo-f334r8/configs/adc/defconfig | 4 +-
.../stm32/nucleo-f334r8/configs/highpri/defconfig | 4 +-
.../arm/stm32/nucleo-f334r8/configs/nsh/defconfig | 4 +-
.../stm32/nucleo-f334r8/configs/spwm1/defconfig | 4 +-
.../stm32/nucleo-f334r8/configs/spwm2/defconfig | 4 +-
.../arm/stm32/nucleo-f410rb/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-f412zg/configs/nsh/defconfig | 2 +-
.../stm32/nucleo-f429zi/configs/netnsh/defconfig | 2 +-
.../arm/stm32/nucleo-f429zi/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/adc/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/can/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/dac/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/gpio/defconfig | 2 +-
.../nucleo-f446re/configs/ihm08m1_b16/defconfig | 2 +-
.../nucleo-f446re/configs/ihm08m1_f32/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/lcd/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-f446re/configs/pwm/defconfig | 2 +-
.../stm32/nucleo-f446re/configs/qenco/defconfig | 2 +-
.../stm32/nucleo-f4x1re/configs/f401-nsh/defconfig | 2 +-
.../configs/f411-mcp2515-extid/defconfig | 2 +-
.../stm32/nucleo-f4x1re/configs/f411-nsh/defconfig | 2 +-
.../arm/stm32/nucleo-g431kb/configs/comp/defconfig | 2 +-
.../arm/stm32/nucleo-g431kb/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-g431kb/configs/pwm/defconfig | 2 +-
.../arm/stm32/nucleo-g431rb/configs/adc/defconfig | 4 +-
.../stm32/nucleo-g431rb/configs/cordic/defconfig | 2 +-
.../nucleo-g431rb/configs/ihm16m1_b16/defconfig | 2 +-
.../nucleo-g431rb/configs/ihm16m1_f32/defconfig | 2 +-
.../arm/stm32/nucleo-g431rb/configs/nsh/defconfig | 2 +-
.../arm/stm32/nucleo-g431rb/configs/pwm/defconfig | 2 +-
.../stm32/nucleo-g431rb/configs/qenco/defconfig | 2 +-
.../arm/stm32/nucleo-l152re/configs/lcd/defconfig | 4 +-
.../arm/stm32/nucleo-l152re/configs/nsh/defconfig | 4 +-
.../olimex-stm32-e407/configs/bmp180/defconfig | 2 +-
.../stm32/olimex-stm32-e407/configs/dac/defconfig | 2 +-
.../olimex-stm32-e407/configs/discover/defconfig | 2 +-
.../olimex-stm32-e407/configs/ina219/defconfig | 2 +-
.../configs/mrf24j40-6lowpan/defconfig | 2 +-
.../configs/mrf24j40-mac/defconfig | 2 +-
.../olimex-stm32-e407/configs/netnsh/defconfig | 2 +-
.../stm32/olimex-stm32-e407/configs/nsh/defconfig | 2 +-
.../olimex-stm32-e407/configs/telnetd/defconfig | 2 +-
.../olimex-stm32-e407/configs/timer/defconfig | 2 +-
.../olimex-stm32-e407/configs/usbnsh/defconfig | 2 +-
.../olimex-stm32-e407/configs/webserver/defconfig | 2 +-
.../olimex-stm32-h405/configs/usbnsh/defconfig | 2 +-
.../stm32/olimex-stm32-h407/configs/nsh/defconfig | 2 +-
.../olimex-stm32-h407/configs/nsh_uext/defconfig | 2 +-
.../stm32/olimex-stm32-p107/configs/nsh/defconfig | 2 +-
.../stm32/olimex-stm32-p207/configs/nsh/defconfig | 2 +-
.../olimex-stm32-p407/configs/audio/defconfig | 2 +-
.../olimex-stm32-p407/configs/dhtxx/defconfig | 2 +-
.../olimex-stm32-p407/configs/hidkbd/defconfig | 2 +-
.../stm32/olimex-stm32-p407/configs/kelf/defconfig | 4 +-
.../olimex-stm32-p407/configs/kmodule/defconfig | 2 +-
.../stm32/olimex-stm32-p407/configs/knsh/defconfig | 2 +-
.../olimex-stm32-p407/configs/module/defconfig | 2 +-
.../olimex-stm32-p407/configs/mqttc/defconfig | 2 +-
.../stm32/olimex-stm32-p407/configs/nsh/defconfig | 2 +-
.../olimex-stm32-p407/configs/zmodem/defconfig | 2 +-
boards/arm/stm32/olimex-stm32-p407/kernel/Makefile | 4 +-
.../olimex-stm32-p407/kernel/stm32_userspace.c | 4 +-
.../stm32/olimexino-stm32/configs/can/defconfig | 4 +-
.../olimexino-stm32/configs/composite/defconfig | 4 +-
.../stm32/olimexino-stm32/configs/nsh/defconfig | 4 +-
.../olimexino-stm32/configs/smallnsh/defconfig | 4 +-
.../stm32/olimexino-stm32/configs/tiny/defconfig | 4 +-
boards/arm/stm32/omnibusf4/configs/nsh/defconfig | 2 +-
boards/arm/stm32/omnibusf4/kernel/Makefile | 4 +-
.../arm/stm32/omnibusf4/kernel/stm32_userspace.c | 4 +-
boards/arm/stm32/photon/configs/adb/defconfig | 4 +-
boards/arm/stm32/photon/configs/nsh/defconfig | 2 +-
boards/arm/stm32/photon/configs/rgbled/defconfig | 2 +-
boards/arm/stm32/photon/configs/usbnsh/defconfig | 2 +-
boards/arm/stm32/photon/configs/wlan/defconfig | 2 +-
boards/arm/stm32/shenzhou/configs/nsh/defconfig | 2 +-
boards/arm/stm32/shenzhou/configs/nxwm/defconfig | 4 +-
boards/arm/stm32/shenzhou/configs/thttpd/defconfig | 2 +-
boards/arm/stm32/stm3210e-eval/README.txt | 4 +-
.../stm3210e-eval/configs/composite/defconfig | 2 +-
.../arm/stm32/stm3210e-eval/configs/nsh/defconfig | 2 +-
.../arm/stm32/stm3210e-eval/configs/nsh2/defconfig | 2 +-
.../arm/stm32/stm3210e-eval/configs/nx/defconfig | 2 +-
.../stm32/stm3210e-eval/configs/nxterm/defconfig | 2 +-
.../arm/stm32/stm3210e-eval/configs/pm/defconfig | 2 +-
.../stm32/stm3210e-eval/configs/usbmsc/defconfig | 2 +-
.../stm3210e-eval/configs/usbserial/defconfig | 2 +-
.../stm32/stm3220g-eval/configs/dhcpd/defconfig | 2 +-
.../stm32/stm3220g-eval/configs/nettest/defconfig | 2 +-
.../arm/stm32/stm3220g-eval/configs/nsh/defconfig | 2 +-
.../arm/stm32/stm3220g-eval/configs/nsh2/defconfig | 2 +-
.../arm/stm32/stm3220g-eval/configs/nxwm/defconfig | 2 +-
.../stm32/stm3220g-eval/configs/telnetd/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/dhcpd/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/discover/defconfig | 2 +-
.../arm/stm32/stm3240g-eval/configs/fb/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/knxwm/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/nettest/defconfig | 2 +-
.../arm/stm32/stm3240g-eval/configs/nsh/defconfig | 2 +-
.../arm/stm32/stm3240g-eval/configs/nsh2/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/nxterm/defconfig | 2 +-
.../arm/stm32/stm3240g-eval/configs/nxwm/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/telnetd/defconfig | 2 +-
.../stm3240g-eval/configs/webserver/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/xmlrpc/defconfig | 4 +-
boards/arm/stm32/stm3240g-eval/kernel/Makefile | 4 +-
.../stm32/stm3240g-eval/kernel/stm32_userspace.c | 4 +-
boards/arm/stm32/stm32_tiny/configs/nsh/defconfig | 2 +-
.../arm/stm32/stm32_tiny/configs/usbnsh/defconfig | 2 +-
.../stm32/stm32butterfly2/configs/nsh/defconfig | 2 +-
.../stm32/stm32butterfly2/configs/nshnet/defconfig | 2 +-
.../stm32butterfly2/configs/nshusbdev/defconfig | 2 +-
.../stm32butterfly2/configs/nshusbhost/defconfig | 2 +-
.../stm32/stm32f103-minimum/configs/adb/defconfig | 4 +-
.../stm32f103-minimum/configs/apds9960/defconfig | 2 +-
.../stm32f103-minimum/configs/audio_tone/defconfig | 2 +-
.../stm32f103-minimum/configs/buttons/defconfig | 2 +-
.../stm32f103-minimum/configs/hello/defconfig | 4 +-
.../stm32f103-minimum/configs/jlx12864g/defconfig | 2 +-
.../stm32f103-minimum/configs/lcd1602/defconfig | 2 +-
.../stm32f103-minimum/configs/mcp2515/defconfig | 2 +-
.../stm32f103-minimum/configs/nrf24/defconfig | 2 +-
.../stm32/stm32f103-minimum/configs/nsh/defconfig | 2 +-
.../stm32/stm32f103-minimum/configs/pwm/defconfig | 2 +-
.../stm32f103-minimum/configs/rfid-rc522/defconfig | 2 +-
.../stm32f103-minimum/configs/rgbled/defconfig | 2 +-
.../stm32f103-minimum/configs/sensors/defconfig | 2 +-
.../stm32f103-minimum/configs/usbnsh/defconfig | 2 +-
.../stm32f103-minimum/configs/userled/defconfig | 2 +-
.../stm32f103-minimum/configs/veml6070/defconfig | 2 +-
.../stm32f334-disco/configs/buckboost/defconfig | 4 +-
.../stm32/stm32f334-disco/configs/nsh/defconfig | 4 +-
.../stm32f334-disco/configs/powerled/defconfig | 4 +-
.../stm32/stm32f3discovery/configs/nsh/defconfig | 2 +-
.../stm32f3discovery/configs/usbnsh/defconfig | 2 +-
.../stm32/stm32f411-minimum/configs/nsh/defconfig | 2 +-
.../stm32/stm32f411e-disco/configs/nsh/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/adc/defconfig | 2 +-
.../stm32f429i-disco/configs/extflash/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/fb/defconfig | 2 +-
.../stm32f429i-disco/configs/highpri/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/lcd/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/lvgl/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/nsh/defconfig | 2 +-
.../stm32f429i-disco/configs/nxhello/defconfig | 2 +-
.../stm32/stm32f429i-disco/configs/nxwm/defconfig | 2 +-
.../stm32f429i-disco/configs/usbmsc/defconfig | 2 +-
.../stm32f429i-disco/configs/usbnsh/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/adb/defconfig | 4 +-
.../stm32/stm32f4discovery/configs/audio/defconfig | 2 +-
.../stm32f4discovery/configs/canard/defconfig | 2 +-
.../stm32f4discovery/configs/cxxtest/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/elf/defconfig | 4 +-
.../stm32/stm32f4discovery/configs/ipv6/defconfig | 2 +-
.../stm32f4discovery/configs/kostest/defconfig | 2 +-
.../stm32f4discovery/configs/lcd1602/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/lwl/defconfig | 2 +-
.../stm32f4discovery/configs/max31855/defconfig | 2 +-
.../stm32f4discovery/configs/max7219/defconfig | 2 +-
.../stm32f4discovery/configs/mmcsdspi/defconfig | 2 +-
.../configs/modbus_slave/defconfig | 2 +-
.../stm32f4discovery/configs/module/defconfig | 2 +-
.../stm32f4discovery/configs/netnsh/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/nsh/defconfig | 2 +-
.../stm32f4discovery/configs/nxlines/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/pm/defconfig | 2 +-
.../stm32f4discovery/configs/posix_spawn/defconfig | 2 +-
.../stm32f4discovery/configs/pseudoterm/defconfig | 2 +-
.../stm32f4discovery/configs/rgbled/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/rndis/defconfig | 4 +-
.../stm32f4discovery/configs/sporadic/defconfig | 2 +-
.../stm32f4discovery/configs/st7789/defconfig | 2 +-
.../stm32f4discovery/configs/testlibcxx/defconfig | 2 +-
.../stm32f4discovery/configs/usbmsc/defconfig | 2 +-
.../stm32f4discovery/configs/usbnsh/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/wifi/defconfig | 2 +-
.../stm32f4discovery/configs/winbuild/Make.defs | 56 ----------------------
.../stm32f4discovery/configs/xen1210/defconfig | 2 +-
boards/arm/stm32/stm32f4discovery/kernel/Makefile | 4 +-
.../stm32f4discovery/kernel/stm32_userspace.c | 4 +-
.../stm32/stm32ldiscovery/configs/chrono/defconfig | 4 +-
.../stm32/stm32ldiscovery/configs/nsh/defconfig | 4 +-
.../stm32/stm32vldiscovery/configs/nsh/defconfig | 4 +-
.../viewtool-stm32f107/configs/ft80x/defconfig | 2 +-
.../viewtool-stm32f107/configs/highpri/defconfig | 2 +-
.../viewtool-stm32f107/configs/netnsh/defconfig | 2 +-
.../stm32/viewtool-stm32f107/configs/nsh/defconfig | 2 +-
.../configs/tcpblaster/defconfig | 2 +-
.../b-l072z-lrwan1/configs/adc/defconfig | 4 +-
.../b-l072z-lrwan1/configs/nsh/defconfig | 4 +-
.../b-l072z-lrwan1/configs/nxlines_oled/defconfig | 4 +-
.../b-l072z-lrwan1/configs/sx127x/defconfig | 4 +-
.../nucleo-f072rb/configs/nsh/defconfig | 4 +-
.../nucleo-f091rc/configs/nsh/defconfig | 4 +-
.../nucleo-f091rc/configs/sx127x/defconfig | 4 +-
.../nucleo-g070rb/configs/nsh/defconfig | 4 +-
.../nucleo-g071rb/configs/nsh/defconfig | 4 +-
.../nucleo-l073rz/configs/nsh/defconfig | 4 +-
.../nucleo-l073rz/configs/sx127x/defconfig | 4 +-
.../stm32f051-discovery/configs/nsh/defconfig | 4 +-
.../stm32f072-discovery/configs/nsh/defconfig | 4 +-
.../stm32f7/nucleo-144/configs/f722-nsh/defconfig | 2 +-
.../nucleo-144/configs/f746-evalos/defconfig | 2 +-
.../stm32f7/nucleo-144/configs/f746-nsh/defconfig | 2 +-
.../nucleo-144/configs/f746-pysim/defconfig | 2 +-
.../nucleo-144/configs/f767-evalos/defconfig | 2 +-
.../nucleo-144/configs/f767-netnsh/defconfig | 2 +-
.../stm32f7/nucleo-144/configs/f767-nsh/defconfig | 2 +-
.../arm/stm32f7/stm32f746-ws/configs/nsh/defconfig | 4 +-
.../stm32f746g-disco/configs/audio/defconfig | 2 +-
.../stm32f7/stm32f746g-disco/configs/fb/defconfig | 2 +-
.../stm32f746g-disco/configs/lvgl/defconfig | 2 +-
.../stm32f746g-disco/configs/netnsh/defconfig | 2 +-
.../stm32f7/stm32f746g-disco/configs/nsh/defconfig | 2 +-
.../stm32f746g-disco/configs/nxdemo/defconfig | 2 +-
.../stm32f746g-disco/configs/nxterm/defconfig | 2 +-
.../arm/stm32f7/stm32f746g-disco/kernel/Makefile | 4 +-
.../stm32f746g-disco/kernel/stm32_userspace.c | 4 +-
.../stm32f769i-disco/configs/netnsh/defconfig | 2 +-
.../stm32f7/stm32f769i-disco/configs/nsh/defconfig | 2 +-
.../arm/stm32f7/stm32f769i-disco/kernel/Makefile | 4 +-
.../stm32f769i-disco/kernel/stm32_userspace.c | 4 +-
.../stm32h7/nucleo-h743zi/configs/elf/defconfig | 2 +-
.../stm32h7/nucleo-h743zi/configs/netnsh/defconfig | 2 +-
.../stm32h7/nucleo-h743zi/configs/nsh/defconfig | 2 +-
.../nucleo-h743zi/configs/nxlines_oled/defconfig | 2 +-
.../nucleo-h743zi/configs/otg_fs_host/defconfig | 2 +-
.../stm32h7/nucleo-h743zi/configs/pwm/defconfig | 2 +-
boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile | 4 +-
.../stm32h7/nucleo-h743zi/kernel/stm32_userspace.c | 4 +-
.../stm32h7/nucleo-h743zi2/configs/jumbo/defconfig | 2 +-
.../nucleo-h743zi2/configs/netnsh/defconfig | 2 +-
.../stm32h7/nucleo-h743zi2/configs/nsh/defconfig | 2 +-
.../stm32h7/stm32h747i-disco/configs/nsh/defconfig | 2 +-
.../arm/stm32h7/stm32h747i-disco/kernel/Makefile | 4 +-
.../stm32h747i-disco/kernel/stm32_userspace.c | 4 +-
.../stm32l4/b-l475e-iot01a/configs/nsh/defconfig | 2 +-
.../configs/spirit-6lowpan/defconfig | 2 +-
.../configs/spirit-starhub/defconfig | 2 +-
.../configs/spirit-starpoint/defconfig | 2 +-
.../stm32l4/nucleo-l432kc/configs/nsh/defconfig | 2 +-
.../stm32l4/nucleo-l432kc/configs/spwm/defconfig | 2 +-
.../stm32l4/nucleo-l452re/configs/nsh/defconfig | 2 +-
.../stm32l4/nucleo-l476rg/configs/nsh/defconfig | 2 +-
.../stm32l4/nucleo-l476rg/configs/nxdemo/defconfig | 2 +-
.../stm32l4/nucleo-l496zg/configs/nsh/defconfig | 2 +-
.../stm32l4/stm32l476-mdk/configs/nsh/defconfig | 2 +-
.../stm32l476vg-disco/configs/knsh/defconfig | 2 +-
.../stm32l476vg-disco/configs/nsh/defconfig | 2 +-
.../arm/stm32l4/stm32l476vg-disco/kernel/Makefile | 4 +-
.../stm32l476vg-disco/kernel/stm32l4_userspace.c | 4 +-
.../stm32l4r9ai-disco/configs/knsh/defconfig | 4 +-
.../stm32l4r9ai-disco/configs/nsh/defconfig | 2 +-
.../arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile | 4 +-
.../stm32l4r9ai-disco/kernel/stm32l4_userspace.c | 4 +-
.../stm32l5/nucleo-l552ze/configs/nsh/defconfig | 2 +-
.../stm32l5/stm32l562e-dk/configs/nsh/defconfig | 2 +-
.../olimex-strp711/configs/nettest/defconfig | 2 +-
.../str71x/olimex-strp711/configs/nsh/defconfig | 2 +-
boards/arm/tiva/dk-tm4c129x/README.txt | 2 +-
boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig | 2 +-
boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/httpd/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/nettest/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/nsh/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/nxflat/defconfig | 4 +-
boards/arm/tiva/eagle100/configs/thttpd/defconfig | 4 +-
boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig | 2 +-
.../arm/tiva/launchxl-cc1310/configs/nsh/defconfig | 2 +-
.../tiva/launchxl-cc1312r1/configs/nsh/defconfig | 2 +-
boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig | 2 +-
.../tiva/lm3s6965-ek/configs/discover/defconfig | 2 +-
boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig | 2 +-
boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig | 2 +-
.../tiva/lm3s6965-ek/configs/qemu-flat/defconfig | 2 +-
.../tiva/lm3s6965-ek/configs/qemu-nxflat/defconfig | 2 +-
.../lm3s6965-ek/configs/qemu-protected/defconfig | 2 +-
.../arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig | 2 +-
boards/arm/tiva/lm3s6965-ek/kernel/Makefile | 4 +-
boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c | 4 +-
boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig | 2 +-
boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig | 2 +-
.../tiva/lm4f120-launchpad/configs/nsh/defconfig | 2 +-
.../tm4c123g-launchpad/configs/mcp2515/defconfig | 2 +-
.../tiva/tm4c123g-launchpad/configs/nsh/defconfig | 2 +-
boards/arm/tiva/tm4c1294-launchpad/README.txt | 2 +-
.../tiva/tm4c1294-launchpad/configs/ipv6/defconfig | 2 +-
.../tiva/tm4c1294-launchpad/configs/nsh/defconfig | 2 +-
.../tms570/launchxl-tms57004/configs/nsh/defconfig | 2 +-
.../tms570ls31x-usb-kit/configs/nsh/defconfig | 2 +-
.../arm/xmc4/xmc4500-relax/configs/nsh/defconfig | 2 +-
.../arm/xmc4/xmc4700-relax/configs/nsh/defconfig | 2 +-
boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig | 2 +-
.../avr/at32uc3/avr32dev1/configs/ostest/defconfig | 2 +-
.../at90usb/micropendous3/configs/hello/defconfig | 4 +-
.../avr/at90usb/teensy-2.0/configs/hello/defconfig | 4 +-
.../avr/at90usb/teensy-2.0/configs/nsh/defconfig | 4 +-
.../at90usb/teensy-2.0/configs/usbmsc/defconfig | 4 +-
boards/avr/atmega/amber/configs/hello/defconfig | 4 +-
.../arduino-mega2560/configs/hello/defconfig | 4 +-
.../atmega/arduino-mega2560/configs/nsh/defconfig | 4 +-
.../atmega/moteino-mega/configs/hello/defconfig | 4 +-
.../avr/atmega/moteino-mega/configs/nsh/defconfig | 4 +-
.../hc/m9s12/demo9s12ne64/configs/ostest/defconfig | 4 +-
boards/hc/m9s12/ne64badge/configs/ostest/defconfig | 4 +-
boards/mips/pic32mx/mirtoo/configs/nsh/defconfig | 2 +-
boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig | 2 +-
.../pic32mx-starterkit/configs/nsh/defconfig | 2 +-
.../pic32mx-starterkit/configs/nsh2/defconfig | 2 +-
.../mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig | 2 +-
.../pic32mx/sure-pic32mx/configs/nsh/defconfig | 2 +-
.../pic32mx/sure-pic32mx/configs/usbnsh/defconfig | 2 +-
boards/mips/pic32mx/ubw32/configs/nsh/defconfig | 2 +-
.../pic32mz/chipkit-wifire/configs/nsh/defconfig | 2 +-
.../flipnclick-pic32mz/configs/nsh/defconfig | 2 +-
.../flipnclick-pic32mz/configs/nxlines/defconfig | 2 +-
.../pic32mz-starterkit/configs/nsh/defconfig | 2 +-
boards/misoc/lm32/misoc/configs/hello/defconfig | 2 +-
boards/misoc/lm32/misoc/configs/nsh/defconfig | 4 +-
boards/or1k/mor1kx/or1k/configs/nsh/defconfig | 4 +-
.../renesas/m16c/skp16c26/configs/ostest/defconfig | 4 +-
.../rx65n/rx65n-grrose/configs/ipv6/defconfig | 4 +-
.../rx65n/rx65n-grrose/configs/netnsh/defconfig | 4 +-
.../rx65n/rx65n-grrose/configs/nsh/defconfig | 4 +-
.../rx65n/rx65n-rsk1mb/configs/netnsh/defconfig | 4 +-
.../rx65n/rx65n-rsk1mb/configs/nsh/defconfig | 4 +-
.../rx65n/rx65n-rsk2mb/configs/ipv6/defconfig | 4 +-
.../rx65n/rx65n-rsk2mb/configs/netnsh/defconfig | 4 +-
.../rx65n/rx65n-rsk2mb/configs/nsh/defconfig | 4 +-
boards/renesas/rx65n/rx65n/configs/nsh/defconfig | 4 +-
.../renesas/sh1/us7032evb1/configs/nsh/defconfig | 4 +-
.../sh1/us7032evb1/configs/ostest/defconfig | 4 +-
boards/risc-v/bl602/bl602evb/configs/elf/defconfig | 4 +-
boards/risc-v/bl602/bl602evb/configs/fpu/defconfig | 4 +-
.../risc-v/bl602/bl602evb/configs/gpio/defconfig | 4 +-
boards/risc-v/bl602/bl602evb/configs/i2c/defconfig | 4 +-
boards/risc-v/bl602/bl602evb/configs/nsh/defconfig | 4 +-
boards/risc-v/bl602/bl602evb/configs/spi/defconfig | 4 +-
.../bl602/bl602evb/configs/spiflash/defconfig | 4 +-
.../risc-v/bl602/bl602evb/configs/timer/defconfig | 4 +-
.../risc-v/bl602/bl602evb/configs/wifi/defconfig | 4 +-
.../risc-v/c906/smartl-c906/configs/elf/defconfig | 4 +-
.../risc-v/c906/smartl-c906/configs/fpu/defconfig | 4 +-
.../risc-v/c906/smartl-c906/configs/knsh/defconfig | 4 +-
.../c906/smartl-c906/configs/module/defconfig | 4 +-
.../risc-v/c906/smartl-c906/configs/nsh/defconfig | 4 +-
.../c906/smartl-c906/configs/sotest/defconfig | 4 +-
boards/risc-v/c906/smartl-c906/kernel/Makefile | 4 +-
.../c906/smartl-c906/kernel/c906_userspace.c | 4 +-
.../esp32c3/esp32c3-devkit/configs/adc/defconfig | 2 +-
.../esp32c3-devkit/configs/autopm/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/ble/defconfig | 2 +-
.../esp32c3-devkit/configs/bmp180/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/efuse/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/elf/defconfig | 4 +-
.../esp32c3/esp32c3-devkit/configs/gpio/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/lvgl/defconfig | 2 +-
.../configs/mcuboot_confirm/defconfig | 2 +-
.../esp32c3-devkit/configs/module/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/nsh/defconfig | 2 +-
.../esp32c3-devkit/configs/oneshot/defconfig | 2 +-
.../esp32c3-devkit/configs/ostest/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/pm/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/pwm/defconfig | 2 +-
.../esp32c3-devkit/configs/random/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/romfs/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/rtc/defconfig | 2 +-
.../esp32c3-devkit/configs/sotest/defconfig | 2 +-
.../esp32c3-devkit/configs/spiflash/defconfig | 2 +-
.../esp32c3-devkit/configs/sta_softap/defconfig | 2 +-
.../esp32c3-devkit/configs/tickless/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/timer/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/uid/defconfig | 2 +-
.../esp32c3-devkit/configs/usbconsole/defconfig | 2 +-
.../esp32c3/esp32c3-devkit/configs/wapi/defconfig | 2 +-
.../esp32c3-devkit/configs/watchdog/defconfig | 2 +-
.../esp32c3-devkit/configs/watcher/defconfig | 2 +-
.../fe310/hifive1-revb/configs/nsh/defconfig | 4 +-
boards/risc-v/k210/maix-bit/configs/elf/defconfig | 4 +-
boards/risc-v/k210/maix-bit/configs/knsh/defconfig | 4 +-
.../k210/maix-bit/configs/knsh_smp/defconfig | 4 +-
.../risc-v/k210/maix-bit/configs/kostest/defconfig | 4 +-
.../risc-v/k210/maix-bit/configs/module/defconfig | 4 +-
boards/risc-v/k210/maix-bit/configs/nsh/defconfig | 4 +-
.../k210/maix-bit/configs/posix_spawn/defconfig | 4 +-
boards/risc-v/k210/maix-bit/configs/smp/defconfig | 4 +-
boards/risc-v/k210/maix-bit/configs/smp2/defconfig | 4 +-
boards/risc-v/k210/maix-bit/kernel/Makefile | 4 +-
.../risc-v/k210/maix-bit/kernel/k210_userspace.c | 4 +-
boards/risc-v/litex/arty_a7/configs/nsh/defconfig | 4 +-
boards/risc-v/mpfs/common/kernel/Makefile | 4 +-
boards/risc-v/mpfs/common/kernel/mpfs_userspace.c | 4 +-
boards/risc-v/mpfs/icicle/configs/hwtest/defconfig | 4 +-
boards/risc-v/mpfs/icicle/configs/nsh/defconfig | 4 +-
.../risc-v/mpfs/icicle/configs/opensbi/defconfig | 4 +-
.../risc-v/mpfs/m100pfsevp/configs/nsh/defconfig | 4 +-
.../qemu-rv32/rv32-virt/configs/nsh/defconfig | 2 +-
.../rv32m1/rv32m1-vega/configs/buttons/defconfig | 2 +-
.../rv32m1/rv32m1-vega/configs/nsh-itcm/defconfig | 2 +-
.../rv32m1/rv32m1-vega/configs/nsh/defconfig | 2 +-
boards/sim/sim/sim/README.txt | 4 +-
boards/sim/sim/sim/configs/alsa/defconfig | 2 +-
boards/sim/sim/sim/configs/asan/defconfig | 2 +-
boards/sim/sim/sim/configs/bas/defconfig | 2 +-
boards/sim/sim/sim/configs/bastest/defconfig | 2 +-
boards/sim/sim/sim/configs/bluetooth/defconfig | 2 +-
boards/sim/sim/sim/configs/bthcisock/defconfig | 2 +-
boards/sim/sim/sim/configs/btuart/defconfig | 2 +-
boards/sim/sim/sim/configs/configdata/defconfig | 2 +-
boards/sim/sim/sim/configs/cxxtest/defconfig | 2 +-
boards/sim/sim/sim/configs/duktape/defconfig | 2 +-
boards/sim/sim/sim/configs/elf/defconfig | 2 +-
boards/sim/sim/sim/configs/fb/defconfig | 2 +-
boards/sim/sim/sim/configs/foc/defconfig | 2 +-
boards/sim/sim/sim/configs/ipforward/defconfig | 2 +-
boards/sim/sim/sim/configs/kasan/defconfig | 2 +-
boards/sim/sim/sim/configs/libcxxtest/defconfig | 2 +-
boards/sim/sim/sim/configs/linuxi2c/defconfig | 2 +-
boards/sim/sim/sim/configs/linuxspi/defconfig | 2 +-
boards/sim/sim/sim/configs/loadable/defconfig | 4 +-
boards/sim/sim/sim/configs/lvgl/defconfig | 2 +-
boards/sim/sim/sim/configs/minibasic/defconfig | 2 +-
boards/sim/sim/sim/configs/module/defconfig | 2 +-
boards/sim/sim/sim/configs/module32/defconfig | 2 +-
boards/sim/sim/sim/configs/mount/defconfig | 2 +-
boards/sim/sim/sim/configs/mtdpart/defconfig | 2 +-
boards/sim/sim/sim/configs/mtdrwb/defconfig | 2 +-
boards/sim/sim/sim/configs/nettest/defconfig | 2 +-
boards/sim/sim/sim/configs/nimble/defconfig | 2 +-
boards/sim/sim/sim/configs/note/defconfig | 2 +-
boards/sim/sim/sim/configs/nsh/defconfig | 2 +-
boards/sim/sim/sim/configs/nsh2/defconfig | 2 +-
boards/sim/sim/sim/configs/nshcromfs/defconfig | 2 +-
boards/sim/sim/sim/configs/nx/defconfig | 2 +-
boards/sim/sim/sim/configs/nx11/defconfig | 2 +-
boards/sim/sim/sim/configs/nxffs/defconfig | 2 +-
boards/sim/sim/sim/configs/nxlines/defconfig | 2 +-
boards/sim/sim/sim/configs/nxwm/defconfig | 2 +-
boards/sim/sim/sim/configs/ostest/defconfig | 2 +-
boards/sim/sim/sim/configs/pf_ieee802154/defconfig | 2 +-
boards/sim/sim/sim/configs/pktradio/defconfig | 2 +-
boards/sim/sim/sim/configs/posix_spawn/defconfig | 2 +-
boards/sim/sim/sim/configs/rc/defconfig | 2 +-
boards/sim/sim/sim/configs/romfs/defconfig | 2 +-
boards/sim/sim/sim/configs/rpproxy/defconfig | 2 +-
boards/sim/sim/sim/configs/rpserver/defconfig | 2 +-
boards/sim/sim/sim/configs/sensor/defconfig | 2 +-
boards/sim/sim/sim/configs/sixlowpan/defconfig | 2 +-
boards/sim/sim/sim/configs/smartfs/defconfig | 2 +-
boards/sim/sim/sim/configs/smp/defconfig | 2 +-
boards/sim/sim/sim/configs/sotest/defconfig | 2 +-
boards/sim/sim/sim/configs/sotest32/defconfig | 2 +-
boards/sim/sim/sim/configs/spiffs/defconfig | 2 +-
boards/sim/sim/sim/configs/tcpblaster/defconfig | 2 +-
boards/sim/sim/sim/configs/tcploop/defconfig | 2 +-
boards/sim/sim/sim/configs/touchscreen/defconfig | 2 +-
boards/sim/sim/sim/configs/udgram/defconfig | 2 +-
boards/sim/sim/sim/configs/unionfs/defconfig | 2 +-
boards/sim/sim/sim/configs/userfs/defconfig | 2 +-
boards/sim/sim/sim/configs/ustream/defconfig | 2 +-
boards/sim/sim/sim/configs/vpnkit/defconfig | 2 +-
boards/x86/qemu/qemu-i486/configs/nsh/defconfig | 2 +-
boards/x86/qemu/qemu-i486/configs/ostest/defconfig | 2 +-
.../intel64/qemu-intel64/configs/nsh/defconfig | 4 +-
.../intel64/qemu-intel64/configs/ostest/defconfig | 4 +-
.../esp32/esp32-devkitc/configs/autopm/defconfig | 4 +-
.../esp32/esp32-devkitc/configs/ble/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/blewifi/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/buttons/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/elf/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/leds/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/mcp2515/defconfig | 2 +-
.../esp32-devkitc/configs/mcuboot_agent/defconfig | 2 +-
.../configs/mcuboot_confirm/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/mmcsdspi/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/module/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/mqttc/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/netnsh/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/nsh/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/oneshot/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/ostest/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/pm/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/psram/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/random/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/rtc/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/smp/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/sotest/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/spiflash/defconfig | 2 +-
.../esp32-devkitc/configs/sta_softap/defconfig | 4 +-
.../esp32/esp32-devkitc/configs/tickless/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/timer/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/wapi/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/wapi_smp/defconfig | 4 +-
.../esp32/esp32-devkitc/configs/watchdog/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/watcher/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/wifinsh/defconfig | 4 +-
.../esp32-ethernet-kit/configs/autopm/defconfig | 4 +-
.../esp32-ethernet-kit/configs/buttons/defconfig | 2 +-
.../esp32-ethernet-kit/configs/ethernet/defconfig | 2 +-
.../configs/mcuboot_agent/defconfig | 2 +-
.../configs/mcuboot_confirm/defconfig | 2 +-
.../esp32/esp32-ethernet-kit/configs/nsh/defconfig | 2 +-
.../esp32-ethernet-kit/configs/oneshot/defconfig | 2 +-
.../esp32/esp32-ethernet-kit/configs/rtc/defconfig | 2 +-
.../esp32-ethernet-kit/configs/tickless/defconfig | 2 +-
.../esp32-ethernet-kit/configs/wapi/defconfig | 4 +-
.../esp32-wrover-kit/configs/autopm/defconfig | 4 +-
.../esp32-wrover-kit/configs/bmp180/defconfig | 2 +-
.../esp32-wrover-kit/configs/buttons/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/gpio/defconfig | 2 +-
.../esp32-wrover-kit/configs/lcd1602/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/leds/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/lvgl/defconfig | 2 +-
.../configs/mcuboot_agent/defconfig | 2 +-
.../configs/mcuboot_confirm/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/nsh/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/nx/defconfig | 2 +-
.../esp32-wrover-kit/configs/oneshot/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/rtc/defconfig | 2 +-
.../esp32-wrover-kit/configs/tickless/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/wapi/defconfig | 4 +-
.../esp32/ttgo_lora_esp32/configs/nsh/defconfig | 2 +-
.../esp32s2/esp32s2-saola-1/configs/gpio/defconfig | 2 +-
.../esp32s2-saola-1/configs/mcuboot_nsh/defconfig | 2 +-
.../esp32s2/esp32s2-saola-1/configs/nsh/defconfig | 2 +-
.../esp32s2-saola-1/configs/oneshot/defconfig | 2 +-
.../esp32s2-saola-1/configs/random/defconfig | 2 +-
.../esp32s2-saola-1/configs/timer/defconfig | 3 +-
.../z16/z16f/z16f2800100zcog/configs/nsh/defconfig | 2 +-
.../z16f/z16f2800100zcog/configs/ostest/defconfig | 4 +-
.../ez80/ez80f910200kitg/configs/ostest/defconfig | 4 +-
.../ez80/ez80f910200zco/configs/dhcpd/defconfig | 4 +-
.../ez80/ez80f910200zco/configs/httpd/defconfig | 4 +-
.../ez80/ez80f910200zco/configs/nettest/defconfig | 4 +-
.../z80/ez80/ez80f910200zco/configs/nsh/defconfig | 2 +-
.../z80/ez80/ez80f910200zco/configs/poll/defconfig | 4 +-
.../z80/ez80/makerlisp/configs/nsh_flash/defconfig | 2 +-
.../z80/ez80/makerlisp/configs/nsh_ram/defconfig | 2 +-
boards/z80/ez80/makerlisp/configs/sdboot/defconfig | 2 +-
boards/z80/ez80/z20x/configs/hello/defconfig | 2 +-
boards/z80/ez80/z20x/configs/nsh/defconfig | 2 +-
boards/z80/ez80/z20x/configs/sdboot/defconfig | 2 +-
boards/z80/ez80/z20x/configs/w25boot/defconfig | 2 +-
boards/z80/z180/p112/configs/ostest/defconfig | 22 ++++-----
.../z80/z8/z8encore000zco/configs/ostest/defconfig | 4 +-
.../z80/z8/z8f64200100kit/configs/ostest/defconfig | 4 +-
boards/z80/z80/z80sim/configs/nsh/defconfig | 4 +-
boards/z80/z80/z80sim/configs/ostest/defconfig | 4 +-
930 files changed, 1195 insertions(+), 1257 deletions(-)
diff --git a/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig
index 3c84b6f..55a9c8a 100644
--- a/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig
+++ b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig
@@ -29,6 +29,7 @@ CONFIG_FS_FAT=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -47,4 +48,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig
index 34066c1..74a7a97 100644
--- a/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig
+++ b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig
@@ -31,6 +31,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -48,5 +49,4 @@ CONFIG_START_MONTH=7
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO=y
diff --git a/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig
index a212138..b7ef314 100644
--- a/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig
+++ b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig
@@ -29,6 +29,7 @@ CONFIG_FS_FAT=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -46,4 +47,3 @@ CONFIG_START_YEAR=2015
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/c5471/c5471evm/configs/httpd/defconfig b/boards/arm/c5471/c5471evm/configs/httpd/defconfig
index a23e5b6..7d97ff3 100644
--- a/boards/arm/c5471/c5471evm/configs/httpd/defconfig
+++ b/boards/arm/c5471/c5471evm/configs/httpd/defconfig
@@ -19,6 +19,8 @@ CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_EXAMPLES_WEBSERVER=y
CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_INIT_ENTRYPOINT="webserver_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_NET=y
CONFIG_NETUTILS_NETLIB=y
CONFIG_NETUTILS_WEBSERVER=y
@@ -38,6 +40,4 @@ CONFIG_START_DAY=13
CONFIG_START_MONTH=2
CONFIG_START_YEAR=2007
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="webserver_main"
CONFIG_WATCHDOG=y
diff --git a/boards/arm/c5471/c5471evm/configs/nettest/defconfig b/boards/arm/c5471/c5471evm/configs/nettest/defconfig
index 7ecb7f3..1919780 100644
--- a/boards/arm/c5471/c5471evm/configs/nettest/defconfig
+++ b/boards/arm/c5471/c5471evm/configs/nettest/defconfig
@@ -21,6 +21,8 @@ CONFIG_DISABLE_PTHREAD=y
CONFIG_EXAMPLES_NETTEST=y
CONFIG_EXAMPLES_NETTEST_NOMAC=y
CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_INIT_ENTRYPOINT="nettest_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_NET=y
CONFIG_NETUTILS_NETLIB=y
CONFIG_NET_ICMP=y
@@ -37,6 +39,4 @@ CONFIG_START_DAY=13
CONFIG_START_MONTH=2
CONFIG_START_YEAR=2007
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="nettest_main"
CONFIG_WATCHDOG=y
diff --git a/boards/arm/c5471/c5471evm/configs/nsh/defconfig b/boards/arm/c5471/c5471evm/configs/nsh/defconfig
index 73f83f3..a3d70ae 100644
--- a/boards/arm/c5471/c5471evm/configs/nsh/defconfig
+++ b/boards/arm/c5471/c5471evm/configs/nsh/defconfig
@@ -21,6 +21,8 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_NET=y
CONFIG_NETDB_DNSCLIENT=y
CONFIG_NETDB_DNSCLIENT_ENTRIES=4
@@ -49,6 +51,4 @@ CONFIG_START_MONTH=2
CONFIG_START_YEAR=2007
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WATCHDOG=y
diff --git a/boards/arm/cxd56xx/spresense/configs/audio/defconfig b/boards/arm/cxd56xx/spresense/configs/audio/defconfig
index 53d64c4..747690f 100644
--- a/boards/arm/cxd56xx/spresense/configs/audio/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/audio/defconfig
@@ -43,6 +43,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_SMARTFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
CONFIG_MTD_BYTE_WRITE=y
@@ -84,4 +85,3 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=1
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig b/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig
index 9398284..7cc3be1 100644
--- a/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig
@@ -22,7 +22,6 @@ CONFIG_BOARD_LOOPSPERMSEC=5434
CONFIG_BOOT_RUNFROMISRAM=y
CONFIG_BUILTIN=y
CONFIG_CLOCK_MONOTONIC=y
-CONFIG_CXD56_AUDIO=y
CONFIG_CXD56_BINARY=y
CONFIG_CXD56_I2C0=y
CONFIG_CXD56_I2C=y
@@ -41,6 +40,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_SMARTFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
CONFIG_MTD_BYTE_WRITE=y
@@ -82,4 +82,3 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=1
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/camera/defconfig b/boards/arm/cxd56xx/spresense/configs/camera/defconfig
index b38de68..0f9e011 100644
--- a/boards/arm/cxd56xx/spresense/configs/camera/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/camera/defconfig
@@ -43,6 +43,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_SMARTFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
CONFIG_MTD_BYTE_WRITE=y
@@ -84,6 +85,5 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=1
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
CONFIG_VIDEO_ISX012=y
CONFIG_VIDEO_STREAM=y
diff --git a/boards/arm/cxd56xx/spresense/configs/charger/defconfig b/boards/arm/cxd56xx/spresense/configs/charger/defconfig
index 0f3e4b8..b7af062 100644
--- a/boards/arm/cxd56xx/spresense/configs/charger/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/charger/defconfig
@@ -33,6 +33,7 @@ CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_READLINE=y
@@ -52,4 +53,3 @@ CONFIG_START_YEAR=2021
CONFIG_SYSTEM_CLE=y
CONFIG_SYSTEM_NSH=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/elf/defconfig b/boards/arm/cxd56xx/spresense/configs/elf/defconfig
index c4c2b44..a53d5ef 100644
--- a/boards/arm/cxd56xx/spresense/configs/elf/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/elf/defconfig
@@ -34,6 +34,7 @@ CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
+CONFIG_INIT_ENTRYPOINT="elf_main"
CONFIG_LIBC_ENVPATH=y
CONFIG_PATH_INITIAL="/mnt/romfs"
CONFIG_PREALLOC_TIMERS=4
@@ -51,4 +52,3 @@ CONFIG_START_MONTH=2
CONFIG_START_YEAR=2020
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="elf_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig b/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig
index ceb2cf7..c69d038 100644
--- a/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig
@@ -46,6 +46,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_SMARTFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_LCD=y
CONFIG_LCD_ILI9340=y
CONFIG_LCD_ILI9340_IFACE0=y
@@ -95,6 +96,5 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=1
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
CONFIG_VIDEO_ISX012=y
CONFIG_VIDEO_STREAM=y
diff --git a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig
index b69558f..55a4647 100644
--- a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig
@@ -55,6 +55,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_SMARTFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_LCD=y
CONFIG_LCD_ILI9340=y
CONFIG_LCD_ILI9340_IFACE0=y
@@ -105,4 +106,3 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_COMPOSITE=y
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig
index bb5b511..2aa4ac1 100644
--- a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig
@@ -46,6 +46,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_SMARTFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_LCD=y
CONFIG_LCD_ILI9340=y
CONFIG_LCD_ILI9340_IFACE0=y
@@ -93,4 +94,3 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_COMPOSITE=y
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/lte/defconfig b/boards/arm/cxd56xx/spresense/configs/lte/defconfig
index 869fb99..52d2b1b 100644
--- a/boards/arm/cxd56xx/spresense/configs/lte/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/lte/defconfig
@@ -40,6 +40,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_SMARTFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
CONFIG_MODEM=y
@@ -81,4 +82,3 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=1
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/module/defconfig b/boards/arm/cxd56xx/spresense/configs/module/defconfig
index a2c1355..a115089 100644
--- a/boards/arm/cxd56xx/spresense/configs/module/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/module/defconfig
@@ -32,6 +32,7 @@ CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
+CONFIG_INIT_ENTRYPOINT="module_main"
CONFIG_LIBC_ENVPATH=y
CONFIG_LIBC_EXECFUNCS=y
CONFIG_MODULE=y
@@ -50,4 +51,3 @@ CONFIG_START_MONTH=2
CONFIG_START_YEAR=2020
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="module_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig
index f6bd466..62154ca 100644
--- a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig
@@ -53,6 +53,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_SMARTFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
CONFIG_MTD_BYTE_WRITE=y
@@ -93,5 +94,4 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=1
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
CONFIG_VIDEO_STREAM=y
diff --git a/boards/arm/cxd56xx/spresense/configs/nsh/defconfig b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig
index e5fc64c..fd11507 100644
--- a/boards/arm/cxd56xx/spresense/configs/nsh/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig
@@ -30,6 +30,7 @@ CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_READLINE=y
@@ -49,4 +50,3 @@ CONFIG_START_YEAR=2011
CONFIG_SYSTEM_CLE=y
CONFIG_SYSTEM_NSH=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/nsh_trace/defconfig b/boards/arm/cxd56xx/spresense/configs/nsh_trace/defconfig
index f08776e..6ab865b 100644
--- a/boards/arm/cxd56xx/spresense/configs/nsh_trace/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/nsh_trace/defconfig
@@ -32,6 +32,7 @@ CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_READLINE=y
@@ -57,4 +58,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_SYSTEM=y
CONFIG_SYSTEM_TRACE=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig
index ad39da8..07a260d 100644
--- a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig
@@ -36,6 +36,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="posix_spawn_main"
CONFIG_LIBC_ENVPATH=y
CONFIG_LIBC_EXECFUNCS=y
CONFIG_PATH_INITIAL="/mnt/romfs"
@@ -51,4 +52,3 @@ CONFIG_SPI=y
CONFIG_START_DAY=29
CONFIG_START_YEAR=2020
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="posix_spawn_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
index a85e63f..6bd3828 100644
--- a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
@@ -60,6 +60,8 @@ CONFIG_FTP_TMPDIR="/mnt/sd0"
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_IOB_NBUFFERS=128
CONFIG_LIBC_ENVPATH=y
CONFIG_LIBC_EXECFUNCS=y
@@ -157,5 +159,3 @@ CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_USBDEV=y
CONFIG_USBDEV_DMA=y
CONFIG_USBDEV_DUALSPEED=y
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
index 66f67f9..6261ba6 100644
--- a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
@@ -62,6 +62,8 @@ CONFIG_FTP_TMPDIR="/mnt/sd0"
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_IOB_NBUFFERS=128
CONFIG_LIBC_ENVPATH=y
CONFIG_LIBC_EXECFUNCS=y
@@ -163,5 +165,3 @@ CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_USBDEV=y
CONFIG_USBDEV_DMA=y
CONFIG_USBDEV_DUALSPEED=y
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/smp/defconfig b/boards/arm/cxd56xx/spresense/configs/smp/defconfig
index f65c77d..1bfa929 100644
--- a/boards/arm/cxd56xx/spresense/configs/smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/smp/defconfig
@@ -35,6 +35,7 @@ CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_READLINE=y
@@ -60,4 +61,3 @@ CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_FPUSIZE=64
CONFIG_TESTING_SMP=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig
index 3ea1bcc..b4e1b30 100644
--- a/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig
@@ -47,6 +47,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_SMARTFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
CONFIG_MTD_BYTE_WRITE=y
@@ -90,4 +91,3 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_COMPOSITE=y
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig
index e31f829..b1a6d24 100644
--- a/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig
@@ -40,6 +40,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_SMARTFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
CONFIG_MTD_BYTE_WRITE=y
@@ -80,4 +81,3 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=1
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USER_ENTRYPOINT="spresense_main"
diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
index 1af640f..c428420 100644
--- a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
@@ -72,6 +72,8 @@ CONFIG_FTP_TMPDIR="/mnt/sd0"
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_LCD=y
CONFIG_LCD_ILI9340=y
CONFIG_LCD_ILI9340_IFACE0=y
@@ -167,8 +169,6 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=1
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="spresense_main"
CONFIG_WIRELESS_GS2200M=y
CONFIG_WL_GS2200M=y
CONFIG_WL_GS2200M_DISABLE_DHCPC=y
diff --git a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
index 03fb60e..470dd0c 100644
--- a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
@@ -75,6 +75,8 @@ CONFIG_FTP_TMPDIR="/mnt/sd0"
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="spresense_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_LCD=y
CONFIG_LCD_ILI9340=y
CONFIG_LCD_ILI9340_IFACE0=y
@@ -176,8 +178,6 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=1
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="spresense_main"
CONFIG_WIRELESS_GS2200M=y
CONFIG_WL_GS2200M=y
CONFIG_WL_GS2200M_DISABLE_DHCPC=y
diff --git a/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig b/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig
index a915314..34450f3 100644
--- a/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig
+++ b/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig
@@ -20,6 +20,8 @@ CONFIG_DM9X_BASE=0xd0000300
CONFIG_DM9X_IRQ=27
CONFIG_EXAMPLES_NETTEST=y
CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_INIT_ENTRYPOINT="nettest_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_NETUTILS_NETLIB=y
@@ -41,5 +43,3 @@ CONFIG_START_MONTH=8
CONFIG_START_YEAR=2008
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="nettest_main"
diff --git a/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig b/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig
index 76a7691..1656acf 100644
--- a/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig
+++ b/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig
@@ -21,6 +21,8 @@ CONFIG_DM9X_IRQ=27
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_MMCSD=y
CONFIG_NET=y
CONFIG_NETDB_DNSCLIENT=y
@@ -54,5 +56,3 @@ CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig b/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig
index aee5677..f3bd37b 100644
--- a/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig
+++ b/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig
@@ -20,6 +20,8 @@ CONFIG_DM9X_BASE=0xd0000300
CONFIG_DM9X_IRQ=27
CONFIG_EXAMPLES_POLL=y
CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_INIT_ENTRYPOINT="poll_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_NETUTILS_NETLIB=y
@@ -43,5 +45,3 @@ CONFIG_START_MONTH=11
CONFIG_START_YEAR=2008
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="poll_main"
diff --git a/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig b/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig
index 7ebc569..9d5de9d 100644
--- a/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig
+++ b/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig
@@ -21,6 +21,8 @@ CONFIG_DM9X_BASE=0xd0000300
CONFIG_DM9X_IRQ=27
CONFIG_EXAMPLES_UDP=y
CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_INIT_ENTRYPOINT="udpclient_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_NETUTILS_NETLIB=y
@@ -43,5 +45,3 @@ CONFIG_START_MONTH=8
CONFIG_START_YEAR=2008
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="udpclient_main"
diff --git a/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig b/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig
index f7a1fd0..30c1f12 100644
--- a/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig
+++ b/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig
@@ -20,6 +20,8 @@ CONFIG_DM9X_BASE=0xd0000300
CONFIG_DM9X_IRQ=27
CONFIG_EXAMPLES_WEBSERVER=y
CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_INIT_ENTRYPOINT="webserver_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_NETUTILS_NETLIB=y
@@ -42,5 +44,3 @@ CONFIG_START_MONTH=8
CONFIG_START_YEAR=2008
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="webserver_main"
diff --git a/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig b/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig
index 58a3e7e..dee5c6f 100644
--- a/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig
+++ b/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EFM32_GPIO_IRQ=y
CONFIG_EFM32_LEUART0=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LEUART0_SERIAL_CONSOLE=y
CONFIG_NSH_FILEIOSIZE=256
CONFIG_NSH_LINELEN=78
@@ -34,4 +35,3 @@ CONFIG_START_MONTH=5
CONFIG_START_YEAR=2010
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig b/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig
index c1ff849..dd9c045 100644
--- a/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig
+++ b/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EFM32_GPIO_IRQ=y
CONFIG_EFM32_LEUART0=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LEUART0_BAUD=9600
CONFIG_LEUART0_SERIAL_CONSOLE=y
CONFIG_NSH_FILEIOSIZE=256
@@ -35,4 +36,3 @@ CONFIG_START_MONTH=5
CONFIG_START_YEAR=2010
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig b/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig
index 64599e4..040961e 100644
--- a/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig
+++ b/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EFM32_GPIO_IRQ=y
CONFIG_EFM32_LEUART1=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LEUART1_SERIAL_CONSOLE=y
CONFIG_NSH_FILEIOSIZE=256
CONFIG_NSH_LINELEN=78
@@ -34,4 +35,3 @@ CONFIG_START_MONTH=5
CONFIG_START_YEAR=2010
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/eoss3/quickfeather/configs/nsh/defconfig b/boards/arm/eoss3/quickfeather/configs/nsh/defconfig
index 82e169e..c25835c 100644
--- a/boards/arm/eoss3/quickfeather/configs/nsh/defconfig
+++ b/boards/arm/eoss3/quickfeather/configs/nsh/defconfig
@@ -23,6 +23,8 @@ CONFIG_DISABLE_MQUEUE=y
CONFIG_EOSS3_UART=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_DISABLE_IFCONFIG=y
CONFIG_NSH_DISABLE_IFUPDOWN=y
@@ -42,5 +44,3 @@ CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3
CONFIG_TESTING_OSTEST_STACKSIZE=4096
CONFIG_UART_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imx6/sabre-6quad/configs/elf/defconfig b/boards/arm/imx6/sabre-6quad/configs/elf/defconfig
index 1300349..7beac77 100644
--- a/boards/arm/imx6/sabre-6quad/configs/elf/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/elf/defconfig
@@ -37,6 +37,7 @@ CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_IMX6_UART1=y
CONFIG_IMX_DDR_SIZE=1073741824
+CONFIG_INIT_ENTRYPOINT="elf_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_PL310_LOCKDOWN_BY_LINE=y
CONFIG_PL310_LOCKDOWN_BY_MASTER=y
@@ -53,4 +54,3 @@ CONFIG_START_MONTH=5
CONFIG_START_YEAR=2021
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="elf_main"
diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
index 734d64e..070d6a0 100644
--- a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
@@ -42,6 +42,8 @@ CONFIG_IMX6_ENET=y
CONFIG_IMX6_UART1=y
CONFIG_IMX_DDR_SIZE=1073741824
CONFIG_IMX_ENET_NTXBUFFERS=1
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_ENVPATH=y
CONFIG_LIBC_EXECFUNCS=y
@@ -99,5 +101,3 @@ CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig
index 679336a..5fdc392 100644
--- a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig
@@ -42,6 +42,8 @@ CONFIG_IMX6_ENET=y
CONFIG_IMX6_UART1=y
CONFIG_IMX_DDR_SIZE=1073741824
CONFIG_IMX_ENET_NTXBUFFERS=1
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_ENVPATH=y
CONFIG_LIBC_EXECFUNCS=y
@@ -102,5 +104,3 @@ CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y
CONFIG_TESTING_SMP=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig
index 20dac96..5cbccd0 100644
--- a/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig
@@ -34,6 +34,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IMX6_UART1=y
CONFIG_IMX_DDR_SIZE=1073741824
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -63,4 +64,3 @@ CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig b/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig
index 7020a31..b097013 100644
--- a/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig
@@ -39,6 +39,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IMX6_UART1=y
CONFIG_IMX_DDR_SIZE=1073741824
+CONFIG_INIT_ENTRYPOINT="posix_spawn_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_ENVPATH=y
CONFIG_LIBC_EXECFUNCS=y
@@ -58,4 +59,3 @@ CONFIG_START_MONTH=5
CONFIG_START_YEAR=2021
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="posix_spawn_main"
diff --git a/boards/arm/imx6/sabre-6quad/configs/smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/smp/defconfig
index 440b38f..7ebc973 100644
--- a/boards/arm/imx6/sabre-6quad/configs/smp/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/smp/defconfig
@@ -34,6 +34,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IMX6_UART1=y
CONFIG_IMX_DDR_SIZE=1073741824
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -66,4 +67,3 @@ CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y
CONFIG_TESTING_SMP=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig
index 7b26255..6d02ee1 100644
--- a/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig
+++ b/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig
@@ -31,6 +31,7 @@ CONFIG_IMXRT_ENET_PHYINIT=y
CONFIG_IMXRT_GPIO1_0_15_IRQ=y
CONFIG_IMXRT_GPIO_IRQ=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_RXBUFSIZE=1024
CONFIG_LPUART1_SERIAL_CONSOLE=y
@@ -60,4 +61,3 @@ CONFIG_START_MONTH=3
CONFIG_SYSTEM_CLE_CMD_HISTORY=y
CONFIG_SYSTEM_COLOR_CLE=y
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig
index ca47ea3..bd7ebbf 100644
--- a/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig
+++ b/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig
@@ -26,6 +26,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT1020_EVK_QSPI_FLASH=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_RXBUFSIZE=1024
CONFIG_LPUART1_SERIAL_CONSOLE=y
@@ -47,4 +48,3 @@ CONFIG_START_MONTH=3
CONFIG_SYSTEM_CLE_CMD_HISTORY=y
CONFIG_SYSTEM_COLOR_CLE=y
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig
index 1eab4e9..49d4572 100644
--- a/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig
+++ b/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig
@@ -37,6 +37,7 @@ CONFIG_IMXRT_GPIO_IRQ=y
CONFIG_IMXRT_LPUART1=y
CONFIG_IMXRT_USDHC1=y
CONFIG_IMXRT_USDHC1_WIDTH_D1_D4=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_NCHAINS=8
@@ -68,4 +69,3 @@ CONFIG_START_MONTH=3
CONFIG_SYSTEM_CLE_CMD_HISTORY=y
CONFIG_SYSTEM_COLOR_CLE=y
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig
index dcaa91c..67f4565 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_BUILD_PROTECTED=y
CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NSH_ARCHINIT=y
@@ -40,4 +41,3 @@ CONFIG_START_DAY=8
CONFIG_START_MONTH=6
CONFIG_SYSTEM_NSH=y
CONFIG_SYS_RESERVED=9
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
index a7a2c10..47d8e04 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
@@ -20,6 +20,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBCXX=y
CONFIG_LIBCXXABI=y
@@ -37,4 +38,3 @@ CONFIG_SCHED_CPULOAD=y
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig
index 7fecacb..6d08850 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_ENET=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_HOSTNAME="i.MXRT1050 EVK"
CONFIG_LPUART1_SERIAL_CONSOLE=y
@@ -59,4 +60,3 @@ CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING6=y
CONFIG_SYSTEM_PING=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig
index c316f3d..6e24b89 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_BUILTIN=y
CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NSH_ARCHINIT=y
@@ -34,4 +35,3 @@ CONFIG_RAM_START=0x20200000
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1050-evk/kernel/Makefile b/boards/arm/imxrt/imxrt1050-evk/kernel/Makefile
index 8c41c6e..aae89b0 100644
--- a/boards/arm/imxrt/imxrt1050-evk/kernel/Makefile
+++ b/boards/arm/imxrt/imxrt1050-evk/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
index 084da3c..cbd09289 100644
--- a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/can/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/can/defconfig
index a49d054..12859b5 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/can/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/can/defconfig
@@ -51,6 +51,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_FLEXCAN3=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NET=y
@@ -75,4 +76,3 @@ CONFIG_SIG_DEFAULT=y
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/canfd/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/canfd/defconfig
index 0a4081e..50a3ad6 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/canfd/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/canfd/defconfig
@@ -52,6 +52,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_FLEXCAN3=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NET=y
@@ -76,4 +77,3 @@ CONFIG_SIG_DEFAULT=y
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig
index b83b40f..3b8a7ea 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_BUILD_PROTECTED=y
CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NSH_ARCHINIT=y
@@ -40,4 +41,3 @@ CONFIG_START_DAY=8
CONFIG_START_MONTH=6
CONFIG_SYSTEM_NSH=y
CONFIG_SYS_RESERVED=9
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
index c98032b..717f7e0 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
@@ -20,6 +20,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBCXX=y
CONFIG_LIBCXXABI=y
@@ -37,4 +38,3 @@ CONFIG_SCHED_CPULOAD=y
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
index ace1258..b8f0dc8 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
@@ -38,6 +38,7 @@ CONFIG_IMXRT_LCD_VBACKPORCH=12
CONFIG_IMXRT_LCD_VRAMBASE=0x20240000
CONFIG_IMXRT_LPI2C1=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_FT5X06=y
CONFIG_INTELHEX_BINARY=y
@@ -57,5 +58,4 @@ CONFIG_SCHED_HPWORK=y
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig
index 3a75ecc..081cd30 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_ENET=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=128
CONFIG_LIBC_HOSTNAME="i.MXRT1060 EVK"
@@ -67,4 +68,3 @@ CONFIG_SYSTEM_DHCPC_RENEW=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING6=y
CONFIG_SYSTEM_PING=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig
index a9f6119..5930459 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_BUILTIN=y
CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NSH_ARCHINIT=y
@@ -34,4 +35,3 @@ CONFIG_RAM_START=0x20200000
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig
index c216a36..a089807 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig
@@ -25,6 +25,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_BOOTLOADER_HEAP=y
CONFIG_IMXRT_DTCM_HEAP=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_MM_REGIONS=3
@@ -39,4 +40,3 @@ CONFIG_RAM_START=0x20200000
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1060-evk/kernel/Makefile b/boards/arm/imxrt/imxrt1060-evk/kernel/Makefile
index f1f4926..fbfdd68 100644
--- a/boards/arm/imxrt/imxrt1060-evk/kernel/Makefile
+++ b/boards/arm/imxrt/imxrt1060-evk/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
index 88c30e2..73a3843 100644
--- a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/can/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/can/defconfig
index cb56968..deb3c87 100644
--- a/boards/arm/imxrt/imxrt1064-evk/configs/can/defconfig
+++ b/boards/arm/imxrt/imxrt1064-evk/configs/can/defconfig
@@ -51,6 +51,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_FLEXCAN3=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NET=y
@@ -75,4 +76,3 @@ CONFIG_SIG_DEFAULT=y
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/canfd/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/canfd/defconfig
index 30cb640..c70b190 100644
--- a/boards/arm/imxrt/imxrt1064-evk/configs/canfd/defconfig
+++ b/boards/arm/imxrt/imxrt1064-evk/configs/canfd/defconfig
@@ -52,6 +52,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_FLEXCAN3=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NET=y
@@ -76,4 +77,3 @@ CONFIG_SIG_DEFAULT=y
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/knsh/defconfig
index c82f345..48269bf 100644
--- a/boards/arm/imxrt/imxrt1064-evk/configs/knsh/defconfig
+++ b/boards/arm/imxrt/imxrt1064-evk/configs/knsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_BUILD_PROTECTED=y
CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NSH_ARCHINIT=y
@@ -40,4 +41,3 @@ CONFIG_START_DAY=8
CONFIG_START_MONTH=6
CONFIG_SYSTEM_NSH=y
CONFIG_SYS_RESERVED=9
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/libcxxtest/defconfig
index 5d4bf2d..30dcbd6 100644
--- a/boards/arm/imxrt/imxrt1064-evk/configs/libcxxtest/defconfig
+++ b/boards/arm/imxrt/imxrt1064-evk/configs/libcxxtest/defconfig
@@ -20,6 +20,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBCXX=y
CONFIG_LIBCXXABI=y
@@ -37,4 +38,3 @@ CONFIG_SCHED_CPULOAD=y
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig
index b0d2cfb..4b5d1cd 100644
--- a/boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig
+++ b/boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig
@@ -38,6 +38,7 @@ CONFIG_IMXRT_LCD_VBACKPORCH=12
CONFIG_IMXRT_LCD_VRAMBASE=0x20240000
CONFIG_IMXRT_LPI2C1=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_FT5X06=y
CONFIG_INTELHEX_BINARY=y
@@ -57,5 +58,4 @@ CONFIG_SCHED_HPWORK=y
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/netnsh/defconfig
index a757489..411846b 100644
--- a/boards/arm/imxrt/imxrt1064-evk/configs/netnsh/defconfig
+++ b/boards/arm/imxrt/imxrt1064-evk/configs/netnsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_ENET=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=128
CONFIG_LIBC_HOSTNAME="i.MXRT1060 EVK"
@@ -67,4 +68,3 @@ CONFIG_SYSTEM_DHCPC_RENEW=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING6=y
CONFIG_SYSTEM_PING=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/nsh/defconfig
index 898d977..142ebed 100644
--- a/boards/arm/imxrt/imxrt1064-evk/configs/nsh/defconfig
+++ b/boards/arm/imxrt/imxrt1064-evk/configs/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_BUILTIN=y
CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NSH_ARCHINIT=y
@@ -34,4 +35,3 @@ CONFIG_RAM_START=0x20200000
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/nshocram/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/nshocram/defconfig
index 6a41767..930bdf6 100644
--- a/boards/arm/imxrt/imxrt1064-evk/configs/nshocram/defconfig
+++ b/boards/arm/imxrt/imxrt1064-evk/configs/nshocram/defconfig
@@ -25,6 +25,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_BOOTLOADER_HEAP=y
CONFIG_IMXRT_DTCM_HEAP=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_MM_REGIONS=3
@@ -39,4 +40,3 @@ CONFIG_RAM_START=0x20200000
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/imxrt1064-evk/kernel/Makefile b/boards/arm/imxrt/imxrt1064-evk/kernel/Makefile
index 301e7d5..0158b33 100644
--- a/boards/arm/imxrt/imxrt1064-evk/kernel/Makefile
+++ b/boards/arm/imxrt/imxrt1064-evk/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
index 87ae5e0..7c5cd67 100644
--- a/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig
index de28f0b..f220608 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig
@@ -29,6 +29,7 @@ CONFIG_IMXRT_FLEXCAN1=y
CONFIG_IMXRT_FLEXCAN2=y
CONFIG_IMXRT_FLEXCAN3=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NET=y
@@ -54,4 +55,3 @@ CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/teensy-4.x/configs/enc-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/enc-4.1/defconfig
index 451a8d3..b5ade91 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/enc-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/enc-4.1/defconfig
@@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_ENC1=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_NCHAINS=24
@@ -44,5 +45,4 @@ CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WQUEUE_NOTIFIER=y
diff --git a/boards/arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig
index 7a620c9..3806ed6 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig
@@ -27,6 +27,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPSPI4=y
CONFIG_IMXRT_LPUART1=y
CONFIG_IMXRT_USBDEV=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_FRAMEBUFFER=y
@@ -55,5 +56,4 @@ CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig
index 001f98a..d977e10 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig
@@ -27,6 +27,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_ENET=y
CONFIG_IMXRT_LPUART1=y
CONFIG_IMXRT_USBDEV=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_HOSTNAME="Teensy 4.x"
CONFIG_NET=y
@@ -67,4 +68,3 @@ CONFIG_SYSTEM_PING6=y
CONFIG_SYSTEM_PING=y
CONFIG_TEENSY_41=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig
index 7b57dc5..bd8a1ef 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig
@@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART6=y
CONFIG_IMXRT_USBDEV=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -38,4 +39,3 @@ CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig
index a9a9d53..a7ce478 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig
@@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
CONFIG_IMXRT_USBDEV=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -39,4 +40,3 @@ CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig b/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig
index b5a15a7..65342f2 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig
@@ -60,6 +60,7 @@ CONFIG_IMXRT_FLEXCAN_TXMB=1
CONFIG_IMXRT_LPSPI4=y
CONFIG_IMXRT_LPUART1=y
CONFIG_IMXRT_SNVS_LPSRTC=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_FRAMEBUFFER=y
@@ -145,5 +146,4 @@ CONFIG_SYSTEM_PING=y
CONFIG_SYSTEM_TEE=y
CONFIG_TEENSY_41=y
CONFIG_USEC_PER_TICK=1000
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/imxrt/teensy-4.x/configs/pwm-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/pwm-4.1/defconfig
index 9f76a8a..e0742ba 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/pwm-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/pwm-4.1/defconfig
@@ -30,6 +30,7 @@ CONFIG_IMXRT_FLEXPWM2=y
CONFIG_IMXRT_FLEXPWM2_MOD1=y
CONFIG_IMXRT_FLEXPWM2_MOD2=y
CONFIG_IMXRT_LPUART1=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_NCHAINS=24
@@ -52,5 +53,4 @@ CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WQUEUE_NOTIFIER=y
diff --git a/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig
index 0d36e16..be10f8f 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig
@@ -32,6 +32,7 @@ CONFIG_IMXRT_USBDEV=y
CONFIG_IMXRT_USDHC1=y
CONFIG_IMXRT_USDHC1_INVERT_CD=y
CONFIG_IMXRT_USDHC1_WIDTH_D1_D4=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -55,4 +56,3 @@ CONFIG_START_MONTH=3
CONFIG_SYSTEM_NSH=y
CONFIG_TEENSY_41=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imxrt/teensy-4.x/kernel/Makefile b/boards/arm/imxrt/teensy-4.x/kernel/Makefile
index 9747245..98ab878 100644
--- a/boards/arm/imxrt/teensy-4.x/kernel/Makefile
+++ b/boards/arm/imxrt/teensy-4.x/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c b/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
index 02abff2..64cb615 100644
--- a/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig
index 01ff516..f954067 100644
--- a/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig
+++ b/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BOARD_LOOPSPERMSEC=10401
CONFIG_BUILTIN=y
CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_LPUART0=y
CONFIG_KINETIS_SERIALBRK_BSDCOMPAT=y
@@ -44,4 +45,3 @@ CONFIG_START_DAY=2
CONFIG_START_MONTH=5
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig b/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig
index 0113286..6dda565 100644
--- a/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig
+++ b/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig
@@ -30,6 +30,8 @@ CONFIG_FRDMK28F_SDHC_AUTOMOUNT=y
CONFIG_FS_AUTOMOUNTER=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=2048
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_GPIOIRQ=y
CONFIG_KINETIS_LPUART0=y
@@ -83,5 +85,3 @@ CONFIG_SYSTEM_NSH_STACKSIZE=2048
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
CONFIG_USBDEV=y
-CONFIG_USERMAIN_STACKSIZE=2048
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/freedom-k64f/configs/cdcacm/defconfig b/boards/arm/kinetis/freedom-k64f/configs/cdcacm/defconfig
index 8bc1036..a24c3dc 100644
--- a/boards/arm/kinetis/freedom-k64f/configs/cdcacm/defconfig
+++ b/boards/arm/kinetis/freedom-k64f/configs/cdcacm/defconfig
@@ -27,6 +27,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_FTM0=y
CONFIG_KINETIS_FTM0_CHANNEL=2
@@ -64,4 +65,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_USBDEV=y
CONFIG_USBDEV_DUALSPEED=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig b/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig
index 4e0ceba..13699fa 100644
--- a/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig
+++ b/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig
@@ -29,6 +29,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_ENET=y
CONFIG_KINETIS_ENET_MDIOPULLUP=y
@@ -72,4 +73,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig b/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig
index c2b7be6..61412d4 100644
--- a/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig
+++ b/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_ETH0_PHY_KSZ8081=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_ENET=y
CONFIG_KINETIS_ENET_MDIOPULLUP=y
@@ -65,4 +66,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig
index fe3c64c..041fec9 100644
--- a/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig
+++ b/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig
@@ -27,6 +27,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_FTM0=y
CONFIG_KINETIS_FTM0_CHANNEL=2
@@ -60,4 +61,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig b/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig
index 6fece40..9a587a6 100644
--- a/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig
+++ b/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig
@@ -27,6 +27,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_KINETIS_EMAC_RMIICLK1588CLKIN=y
CONFIG_KINETIS_ENET=y
CONFIG_KINETIS_ENET_MDIOPULLUP=y
@@ -81,4 +82,3 @@ CONFIG_TASK_NAME_SIZE=32
CONFIG_UART1_BAUD=57600
CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_USEC_PER_TICK=1000
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig
index 73c0f27..e6301f7 100644
--- a/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig
+++ b/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig
@@ -39,6 +39,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_I2C_RESET=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -99,4 +100,3 @@ CONFIG_TASK_NAME_SIZE=32
CONFIG_UART1_BAUD=57600
CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_USEC_PER_TICK=1000
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig b/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig
index d67dc72..88bb20a 100644
--- a/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig
+++ b/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig
@@ -19,6 +19,7 @@ CONFIG_BOARD_LOOPSPERMSEC=9535
CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
+CONFIG_INIT_ENTRYPOINT="ostest_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_UART5=y
CONFIG_PREALLOC_TIMERS=4
@@ -34,4 +35,3 @@ CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3
CONFIG_TESTING_OSTEST_STACKSIZE=2048
CONFIG_UART5_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="ostest_main"
diff --git a/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig b/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig
index 2a945a9..c210cb7 100644
--- a/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig
+++ b/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_SERIALBRK_BSDCOMPAT=y
CONFIG_KINETIS_UART0=y
@@ -48,4 +49,3 @@ CONFIG_START_YEAR=2011
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig b/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig
index 1569267..7bc867c 100644
--- a/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig
+++ b/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=6024
CONFIG_BUILTIN=y
CONFIG_CDCACM=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_SERIALBRK_BSDCOMPAT=y
CONFIG_KINETIS_UART0=y
@@ -63,4 +64,3 @@ CONFIG_USBMONITOR_TRACECONTROLLER=y
CONFIG_USBMONITOR_TRACEINIT=y
CONFIG_USBMONITOR_TRACEINTERRUPTS=y
CONFIG_USBMONITOR_TRACETRANSFERS=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig b/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig
index 5b53177..e310332 100644
--- a/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig
+++ b/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig
@@ -19,6 +19,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=9535
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_UART3=y
CONFIG_NSH_FILEIOSIZE=512
@@ -36,4 +37,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig b/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig
index 8248bb5..df77c5d 100644
--- a/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig
+++ b/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_AUTOMOUNTER=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_ENET=y
CONFIG_KINETIS_GPIOIRQ=y
@@ -58,4 +59,3 @@ CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=10
CONFIG_TWR_K64F120M_SDHC_AUTOMOUNT=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig b/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig
index 4e96a21..6c4004b 100644
--- a/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig
+++ b/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig
@@ -19,6 +19,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_AUTOMOUNTER=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_GPIOIRQ=y
CONFIG_KINETIS_PORTBINTS=y
@@ -43,4 +44,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=10
CONFIG_TWR_K64F120M_SDHC_AUTOMOUNT=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig
index 047ef89..ca9cd07 100644
--- a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig
+++ b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig
@@ -25,6 +25,8 @@ CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXAMPLES_PWM=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_KL_TPM0=y
CONFIG_KL_TPM0_PWM=y
CONFIG_KL_UART0=y
@@ -53,5 +55,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_TLS_NELEM=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig
index 0427de7..52e4b99 100644
--- a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig
+++ b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig
@@ -25,6 +25,8 @@ CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXAMPLES_PWM=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_KL_TPM0=y
CONFIG_KL_TPM0_PWM=y
CONFIG_KL_UART0=y
@@ -53,5 +55,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_TLS_NELEM=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/kl/teensy-lc/configs/nsh/defconfig b/boards/arm/kl/teensy-lc/configs/nsh/defconfig
index 3a21506..fecbd2a 100644
--- a/boards/arm/kl/teensy-lc/configs/nsh/defconfig
+++ b/boards/arm/kl/teensy-lc/configs/nsh/defconfig
@@ -31,6 +31,8 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_INTELHEX_BINARY=y
CONFIG_KL_I2C0=y
CONFIG_KL_I2C1=y
@@ -65,5 +67,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_TLS_NELEM=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig
index c0cd24b..a42c762 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig
@@ -52,6 +52,8 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_MAXBUS=1
CONFIG_I2C_RESET=y
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LC823450_I2C0=y
CONFIG_LC823450_I2C1=y
@@ -141,6 +143,4 @@ CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=2
CONFIG_USBMSC_EPBULKOUT=1
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WM8776_SWAP_HPOUT=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
index defb717..8240b2c 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
@@ -52,6 +52,8 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_MAXBUS=1
CONFIG_I2C_RESET=y
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_BUFSIZE=192
CONFIG_IOB_NBUFFERS=256
@@ -169,6 +171,4 @@ CONFIG_USBDEV=y
CONFIG_USBDEV_BUSPOWERED=y
CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBDEV_MAXPOWER=500
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WM8776_SWAP_HPOUT=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig
index 7ee4863..c868458 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig
@@ -30,6 +30,8 @@ CONFIG_EXAMPLES_ELF=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
+CONFIG_INIT_ENTRYPOINT="elf_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LC823450_UART0=y
CONFIG_LIBC_ENVPATH=y
@@ -68,5 +70,3 @@ CONFIG_TASK_NAME_SIZE=24
CONFIG_UART0_RXBUFSIZE=512
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART0_TXBUFSIZE=2048
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="elf_main"
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig
index 7a14d71..4946295 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig
@@ -27,6 +27,8 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_FATTIME=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="ipl2_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LC823450_IPL2=y
CONFIG_LC823450_MTD=y
@@ -71,5 +73,3 @@ CONFIG_USBDEV=y
CONFIG_USBDEV_BUSPOWERED=y
CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBDEV_MAXPOWER=500
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="ipl2_main"
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig
index 4d23ea0..a2cde26 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig
@@ -35,6 +35,8 @@ CONFIG_HRT_TIMER=y
CONFIG_I2C=y
CONFIG_I2CTOOL_MAXBUS=1
CONFIG_I2C_RESET=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LC823450_I2C0=y
CONFIG_LC823450_I2C1=y
@@ -114,5 +116,3 @@ CONFIG_TASK_NAME_SIZE=24
CONFIG_UART0_RXBUFSIZE=512
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART0_TXBUFSIZE=2048
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig
index 6a7d595..6a498ba 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig
@@ -19,6 +19,8 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
+CONFIG_INIT_ENTRYPOINT="ostest_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LC823450_MTM0_TICK=y
CONFIG_LC823450_SPIFI=y
@@ -46,5 +48,3 @@ CONFIG_TESTING_OSTEST_STACKSIZE=2048
CONFIG_UART0_RXBUFSIZE=512
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART0_TXBUFSIZE=2048
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="ostest_main"
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
index f9c45b3..9f8a081 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
@@ -59,6 +59,8 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_MAXBUS=1
CONFIG_I2C_RESET=y
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_BUFSIZE=128
CONFIG_IOB_NBUFFERS=64
@@ -184,6 +186,4 @@ CONFIG_USBDEV=y
CONFIG_USBDEV_BUSPOWERED=y
CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBDEV_MAXPOWER=500
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WM8776_SWAP_HPOUT=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig
index 922cd1b..7ad92b5 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig
@@ -41,6 +41,8 @@ CONFIG_HRT_TIMER=y
CONFIG_I2C=y
CONFIG_I2CTOOL_MAXBUS=1
CONFIG_I2C_RESET=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LC823450_I2C0=y
CONFIG_LC823450_I2C1=y
@@ -119,5 +121,3 @@ CONFIG_TESTING_SMP=y
CONFIG_UART0_RXBUFSIZE=512
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART0_TXBUFSIZE=2048
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig
index 0dc4714..15771d0 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig
@@ -28,6 +28,8 @@ CONFIG_ELF=y
CONFIG_EXAMPLES_POSIXSPAWN=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="posix_spawn_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LC823450_UART0=y
CONFIG_LIBC_ENVPATH=y
@@ -67,5 +69,3 @@ CONFIG_TASK_NAME_SIZE=24
CONFIG_UART0_RXBUFSIZE=512
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART0_TXBUFSIZE=2048
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="posix_spawn_main"
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
index c082cae..14740a3 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
@@ -59,6 +59,8 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_MAXBUS=1
CONFIG_I2C_RESET=y
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=128
CONFIG_LC823450_I2C0=y
@@ -189,6 +191,4 @@ CONFIG_USBDEV_BUSPOWERED=y
CONFIG_USBDEV_DMA=y
CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBDEV_MAXPOWER=500
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WM8776_SWAP_HPOUT=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig
index a27e62d..703edbf 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig
@@ -47,6 +47,8 @@ CONFIG_HRT_TIMER=y
CONFIG_I2C=y
CONFIG_I2CTOOL_MAXBUS=1
CONFIG_I2C_RESET=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LC823450_I2C0=y
CONFIG_LC823450_I2C1=y
@@ -141,5 +143,3 @@ CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=2
CONFIG_USBMSC_EPBULKOUT=1
CONFIG_USBMSC_REMOVABLE=y
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lc823450/lc823450-xgevk/kernel/Makefile b/boards/arm/lc823450/lc823450-xgevk/kernel/Makefile
index 384fde4..b18cfab 100644
--- a/boards/arm/lc823450/lc823450-xgevk/kernel/Makefile
+++ b/boards/arm/lc823450/lc823450-xgevk/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c b/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c
index 981a65f..ed7aea7 100644
--- a/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c
+++ b/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c
@@ -73,13 +73,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig
index 1c2a9bb..9b5e949 100644
--- a/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig
@@ -19,6 +19,7 @@ CONFIG_BOARD_LOOPSPERMSEC=7982
CONFIG_ETH0_PHY_KSZ8041=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC17_40_EMACRAM_SIZE=7296
CONFIG_LPC17_40_ETHERNET=y
CONFIG_LPC17_40_ETH_NRXDESC=6
@@ -64,4 +65,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig
index 1794862..522d587 100644
--- a/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig
@@ -16,6 +16,7 @@ CONFIG_ARCH_CHIP_LPC17XX_40XX=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=7982
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC17_40_SSP0=y
CONFIG_LPC17_40_UART0=y
CONFIG_MM_REGIONS=2
@@ -35,4 +36,3 @@ CONFIG_START_YEAR=2010
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig
index 7906130..291ddcd 100644
--- a/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig
+++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig
@@ -26,6 +26,8 @@ CONFIG_FS_BINFS=y
CONFIG_FS_ROMFS=y
CONFIG_FS_UNIONFS=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="thttp_main"
+CONFIG_INIT_STACKSIZE=6144
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_LPC17_40_EMACRAM_SIZE=9696
@@ -70,5 +72,3 @@ CONFIG_THTTPD_IOBUFFERSIZE=512
CONFIG_UART0_RXBUFSIZE=64
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART0_TXBUFSIZE=64
-CONFIG_USERMAIN_STACKSIZE=6144
-CONFIG_USER_ENTRYPOINT="thttp_main"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig
index f27ff57..174059a 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig
@@ -27,6 +27,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_GPDMA=y
CONFIG_LPC17_40_SDCARD=y
@@ -59,4 +60,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYS_RESERVED=9
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig
index 28826f1..7adccc8 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig
@@ -30,6 +30,8 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_THROTTLE=0
@@ -81,5 +83,3 @@ CONFIG_SYSTEM_MDIO=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile
index a302099..477f62f 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
index e18acc2..2eb8444 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig
index b510a57..ff8e778 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig
@@ -27,6 +27,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_GPDMA=y
CONFIG_LPC17_40_UART0=y
@@ -55,4 +56,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYS_RESERVED=9
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig
index 60e0772..02d69da 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig
@@ -23,6 +23,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_GPDMA=y
CONFIG_LPC17_40_UART0=y
@@ -46,4 +47,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/Makefile b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/Makefile
index 4f5babe..6885a5c 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/Makefile
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
index 28c0e361..42acdef 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig
index eb204b1..0353b39 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig
@@ -21,6 +21,7 @@ CONFIG_DISABLE_PTHREAD=y
CONFIG_ETH0_PHY_LAN8720=y
CONFIG_EXAMPLES_DHCPD=y
CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_INIT_ENTRYPOINT="dhcpd_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EMACRAM_SIZE=15776
CONFIG_LPC17_40_ETHERNET=y
@@ -47,4 +48,3 @@ CONFIG_START_YEAR=2011
CONFIG_STDIO_DISABLE_BUFFERING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="dhcpd_main"
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig
index 6786061..f1c46a3 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=8079
CONFIG_ETH0_PHY_LAN8720=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EMACRAM_SIZE=7296
CONFIG_LPC17_40_ETHERNET=y
@@ -67,4 +68,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig
index d370ade..c073fde 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig
@@ -28,6 +28,7 @@ CONFIG_EXAMPLES_NX_COLOR2=1
CONFIG_EXAMPLES_NX_FONTCOLOR=0
CONFIG_EXAMPLES_NX_TBCOLOR=1
CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=4
+CONFIG_INIT_ENTRYPOINT="nx_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_MAXCONTRAST=255
@@ -61,4 +62,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART3_SERIAL_CONSOLE=y
CONFIG_UG9664HSWAG01_POWER=y
-CONFIG_USER_ENTRYPOINT="nx_main"
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig
index 5ebf896..22b441e 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig
@@ -21,6 +21,8 @@ CONFIG_ETH0_PHY_LAN8720=y
CONFIG_EXAMPLES_THTTPD=y
CONFIG_EXAMPLES_THTTPD_NOMAC=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="thttp_main"
+CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EMACRAM_SIZE=15776
CONFIG_LPC17_40_ETHERNET=y
@@ -53,5 +55,3 @@ CONFIG_THTTPD_CGI_PRIORITY=50
CONFIG_THTTPD_CGI_STACKSIZE=1024
CONFIG_THTTPD_IOBUFFERSIZE=1024
CONFIG_UART3_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=8192
-CONFIG_USER_ENTRYPOINT="thttp_main"
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig
index d17c3d7..bb9bf11 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig
@@ -16,6 +16,7 @@ CONFIG_ARCH_CHIP_LPC17XX_40XX=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARDCTL=y
CONFIG_BOARD_LOOPSPERMSEC=8079
+CONFIG_INIT_ENTRYPOINT="msconn_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_SSP1=y
CONFIG_LPC17_40_UART3=y
@@ -47,4 +48,3 @@ CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USER_ENTRYPOINT="msconn_main"
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig
index 424588f..38fcb0e 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig
@@ -62,6 +62,8 @@ CONFIG_FS_ROMFS=y
CONFIG_FS_TMPFS=y
CONFIG_FS_UNIONFS=y
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_DLFCN=y
CONFIG_LIBC_ENVPATH=y
@@ -165,5 +167,3 @@ CONFIG_SYSTEM_TELNET_CLIENT=y
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_USBDEV_COMPOSITE=y
CONFIG_USBHOST_COMPOSITE=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig
index 34e4100..80661f7 100644
--- a/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig
@@ -22,6 +22,7 @@ CONFIG_ARCH_CHIP_LPC17XX_40XX=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=7982
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC17_40_SSP0=y
CONFIG_LPC17_40_UART0=y
CONFIG_MMCSD=y
@@ -45,4 +46,3 @@ CONFIG_START_YEAR=2010
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/mbed/configs/userled/defconfig b/boards/arm/lpc17xx_40xx/mbed/configs/userled/defconfig
index 7518947..2e6263b 100644
--- a/boards/arm/lpc17xx_40xx/mbed/configs/userled/defconfig
+++ b/boards/arm/lpc17xx_40xx/mbed/configs/userled/defconfig
@@ -25,6 +25,7 @@ CONFIG_BOARD_LOOPSPERMSEC=7982
CONFIG_BUILTIN=y
CONFIG_EXAMPLES_LEDS=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC17_40_SSP0=y
CONFIG_LPC17_40_UART0=y
CONFIG_MMCSD=y
@@ -51,4 +52,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_USERLED=y
CONFIG_USERLED_LOWER=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig
index 65657ab..6e27101 100644
--- a/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig
@@ -23,6 +23,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=7982
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC17_40_SSP0=y
CONFIG_LPC17_40_UART0=y
CONFIG_MMCSD=y
@@ -46,4 +47,3 @@ CONFIG_START_YEAR=2017
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig
index 8b4b8a7..f6dbe55 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig
@@ -24,6 +24,7 @@ CONFIG_ETH0_PHY_KS8721=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EMACRAM_SIZE=8512
CONFIG_LPC17_40_ETHERNET=y
@@ -73,4 +74,3 @@ CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_BAUD=57600
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig
index b899c92..44f9a4f 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig
@@ -23,6 +23,7 @@ CONFIG_EXAMPLES_HIDKBD=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_UART0=y
@@ -53,4 +54,3 @@ CONFIG_UART0_BAUD=57600
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_ISOC_DISABLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig
index 4f76a60..4a5e40e 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig
@@ -26,6 +26,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_ETHERNET=y
CONFIG_LPC17_40_UART0=y
@@ -70,4 +71,3 @@ CONFIG_UART0_BAUD=57600
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_USBHOST_HIDMOUSE=y
CONFIG_USBHOST_ISOC_DISABLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig
index 36cc7bc..cf5899f 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig
@@ -23,6 +23,7 @@ CONFIG_DISABLE_PTHREAD=y
CONFIG_ETH0_PHY_KS8721=y
CONFIG_EXAMPLES_NETTEST=y
CONFIG_EXAMPLES_NETTEST_NOMAC=y
+CONFIG_INIT_ENTRYPOINT="nettest_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EMACRAM_SIZE=7296
CONFIG_LPC17_40_ETHERNET=y
@@ -50,4 +51,3 @@ CONFIG_STDIO_DISABLE_BUFFERING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_BAUD=57600
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nettest_main"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig
index d2a546f..ae78462 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig
@@ -28,6 +28,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EMACRAM_SIZE=7296
CONFIG_LPC17_40_ETHERNET=y
@@ -78,4 +79,3 @@ CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_BAUD=57600
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig
index a60fae3..402d024 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig
@@ -21,6 +21,8 @@ CONFIG_DISABLE_PTHREAD=y
CONFIG_EXAMPLES_THTTPD=y
CONFIG_EXAMPLES_THTTPD_NOMAC=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="thttp_main"
+CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_UART0=y
CONFIG_LPC17_40_UART1=y
@@ -53,5 +55,3 @@ CONFIG_THTTPD_IOBUFFERSIZE=1024
CONFIG_UART0_BAUD=57600
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_BAUD=57600
-CONFIG_USERMAIN_STACKSIZE=8192
-CONFIG_USER_ENTRYPOINT="thttp_main"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig
index d5cc527..5f501b8 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig
@@ -25,6 +25,8 @@ CONFIG_FS_BINFS=y
CONFIG_FS_ROMFS=y
CONFIG_FS_UNIONFS=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="thttp_main"
+CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EMACRAM_SIZE=15776
CONFIG_LPC17_40_ETHERNET=y
@@ -55,5 +57,3 @@ CONFIG_THTTPD_CGI_BYTECOUNT=20000
CONFIG_THTTPD_IOBUFFERSIZE=1024
CONFIG_UART0_BAUD=57600
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=8192
-CONFIG_USER_ENTRYPOINT="thttp_main"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig
index 378f9bd..15cfd13 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig
@@ -22,6 +22,8 @@ CONFIG_ETH0_PHY_KS8721=y
CONFIG_EXAMPLES_THTTPD=y
CONFIG_EXAMPLES_THTTPD_NOMAC=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="thttp_main"
+CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EMACRAM_SIZE=15776
CONFIG_LPC17_40_ETHERNET=y
@@ -55,5 +57,3 @@ CONFIG_THTTPD_CGI_STACKSIZE=1024
CONFIG_THTTPD_IOBUFFERSIZE=1024
CONFIG_UART0_BAUD=57600
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=8192
-CONFIG_USER_ENTRYPOINT="thttp_main"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig
index f7cb77c..f3c5290 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig
@@ -19,6 +19,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARDCTL=y
CONFIG_BOARD_LOOPSPERMSEC=8111
+CONFIG_INIT_ENTRYPOINT="msconn_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_SSP1=y
CONFIG_LPC17_40_UART0=y
@@ -49,4 +50,3 @@ CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USER_ENTRYPOINT="msconn_main"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig
index 4b3e822..13a610b 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig
@@ -18,6 +18,7 @@ CONFIG_BOARDCTL=y
CONFIG_BOARD_LOOPSPERMSEC=8111
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXAMPLES_USBSERIAL=y
+CONFIG_INIT_ENTRYPOINT="usbserial_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_UART0=y
CONFIG_LPC17_40_USBDEV=y
@@ -39,4 +40,3 @@ CONFIG_START_YEAR=2010
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_BAUD=57600
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="usbserial_main"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig
index 5dbbf29..6deb38e 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig
@@ -26,6 +26,7 @@ CONFIG_ETH0_PHY_KS8721=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EMACRAM_SIZE=7296
CONFIG_LPC17_40_ETHERNET=y
@@ -84,4 +85,3 @@ CONFIG_UART0_BAUD=57600
CONFIG_UART0_RXBUFSIZE=1024
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_BAUD=2400
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig
index 855117c..90533f0 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig
@@ -20,6 +20,7 @@ CONFIG_BUILTIN=y
CONFIG_DEV_LOOP=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_FB=y
+CONFIG_INIT_ENTRYPOINT="fb_main"
CONFIG_LPC17_40_EXTDRAM=y
CONFIG_LPC17_40_EXTDRAMSIZE=67108864
CONFIG_LPC17_40_GPDMA=y
@@ -46,5 +47,4 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_READLINE=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="fb_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig
index 6dd1048..a95121e 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig
@@ -27,6 +27,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_GPDMA=y
CONFIG_LPC17_40_SDCARD=y
@@ -59,4 +60,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYS_RESERVED=9
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig
index 540c9d8..d7eb83c 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig
@@ -26,6 +26,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="nxterm_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EXTDRAM=y
CONFIG_LPC17_40_EXTDRAMSIZE=67108864
@@ -69,4 +70,3 @@ CONFIG_SYSTEM_CLE=y
CONFIG_SYS_RESERVED=9
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nxterm_main"
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig
index 74e0501..e22a997 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_GPDMA=y
CONFIG_LPC17_40_SDCARD=y
@@ -50,4 +51,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig
index 7938c37..6a59f7e 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig
@@ -22,6 +22,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="nxlines_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EXTDRAM=y
CONFIG_LPC17_40_EXTDRAMSIZE=67108864
@@ -53,4 +54,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_READLINE=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nxlines_main"
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig
index 5ce255b..5dfe314 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig
@@ -26,6 +26,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
CONFIG_GRAPHICS_PDCURSES=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_DJOYSTICK=y
CONFIG_INTELHEX_BINARY=y
@@ -67,5 +68,4 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig
index f2710c4..8b003c1 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig
@@ -29,6 +29,7 @@ CONFIG_EXAMPLES_PWFB_COLOR3=0xff76
CONFIG_EXAMPLES_PWFB_FONTCOLOR=0x0000
CONFIG_EXAMPLES_PWFB_FONTID=1
CONFIG_EXAMPLES_PWFB_TBCOLOR=0xad55
+CONFIG_INIT_ENTRYPOINT="pwfb_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EXTDRAM=y
CONFIG_LPC17_40_EXTDRAMHEAP_OFFSET=393216
@@ -62,4 +63,3 @@ CONFIG_START_YEAR=2019
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="pwfb_main"
diff --git a/boards/arm/lpc17xx_40xx/open1788/kernel/Makefile b/boards/arm/lpc17xx_40xx/open1788/kernel/Makefile
index fc22107..9059643 100644
--- a/boards/arm/lpc17xx_40xx/open1788/kernel/Makefile
+++ b/boards/arm/lpc17xx_40xx/open1788/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
index 420f629..4425b0b 100644
--- a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/defconfig
index 542c60b..a16f6f7 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/defconfig
@@ -14,6 +14,7 @@ CONFIG_ARCH_CHIP_LPC17XX_40XX=y
CONFIG_ARM_MPU=y
CONFIG_BOARD_LOOPSPERMSEC=11992
CONFIG_BUILD_PROTECTED=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC17_40_UART0=y
CONFIG_MM_REGIONS=2
CONFIG_NUTTX_USERSPACE=0x00020000
@@ -23,4 +24,3 @@ CONFIG_RAM_START=0x10000000
CONFIG_SYSTEM_NSH=y
CONFIG_SYS_RESERVED=9
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh-cdcecm/defconfig b/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh-cdcecm/defconfig
index 979bd2a..c81aa2b 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh-cdcecm/defconfig
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh-cdcecm/defconfig
@@ -17,6 +17,7 @@ CONFIG_CDCECM_EPBULKIN=5
CONFIG_CDCECM_EPBULKOUT=2
CONFIG_FS_BINFS=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC17_40_UART0=y
CONFIG_LPC17_40_USBDEV=y
CONFIG_LPC17_40_USBDEV_NOVBUS=y
@@ -36,4 +37,3 @@ CONFIG_SCHED_LPWORK=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh/defconfig
index c94ae8d..0385cbf 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh/defconfig
@@ -12,10 +12,10 @@ CONFIG_ARCH_CHIP="lpc17xx_40xx"
CONFIG_ARCH_CHIP_LPC1769=y
CONFIG_ARCH_CHIP_LPC17XX_40XX=y
CONFIG_BOARD_LOOPSPERMSEC=11992
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC17_40_UART0=y
CONFIG_MM_REGIONS=2
CONFIG_RAM_SIZE=32768
CONFIG_RAM_START=0x10000000
CONFIG_SYSTEM_NSH=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh-cdcecm/defconfig b/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh-cdcecm/defconfig
index 3283696..ddb2fcb 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh-cdcecm/defconfig
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh-cdcecm/defconfig
@@ -20,6 +20,7 @@ CONFIG_CDCECM_COMPOSITE=y
CONFIG_COMPOSITE_IAD=y
CONFIG_FS_BINFS=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC17_40_UART0=y
CONFIG_LPC17_40_USBDEV=y
CONFIG_LPC17_40_USBDEV_NOVBUS=y
@@ -41,4 +42,3 @@ CONFIG_SCHED_LPWORK=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_USBDEV_COMPOSITE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh/defconfig b/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh/defconfig
index 1542c3a..8d8de34 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh/defconfig
@@ -15,6 +15,7 @@ CONFIG_BOARD_LOOPSPERMSEC=11992
CONFIG_CDCACM=y
CONFIG_CDCACM_EPBULKIN=5
CONFIG_CDCACM_EPBULKOUT=2
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC17_40_UART0=y
CONFIG_LPC17_40_USBDEV=y
CONFIG_LPC17_40_USBDEV_NOVBUS=y
@@ -25,4 +26,3 @@ CONFIG_RAM_SIZE=32768
CONFIG_RAM_START=0x10000000
CONFIG_SYSTEM_NSH=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile
index 727ba43..d789a96 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
index c8ea4d3..54a5a3b 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig
index e7a37f2..39aee10 100644
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig
@@ -32,6 +32,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_LIBC_HOSTNAME="c027"
@@ -104,4 +105,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_IFLOWCONTROL=y
CONFIG_UART1_OFLOWCONTROL=y
CONFIG_UART2_BAUD=9600
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig
index 2905037..0d0e8b0 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig
@@ -22,6 +22,8 @@ CONFIG_DISABLE_PTHREAD=y
CONFIG_ETH0_PHY_DP83848C=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="hello_main"
+CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EMACRAM_SIZE=15776
CONFIG_LPC17_40_ETHERNET=y
@@ -47,5 +49,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=8192
-CONFIG_USER_ENTRYPOINT="hello_main"
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig
index 141c68a..bc55a78 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig
@@ -28,6 +28,7 @@ CONFIG_ETH0_PHY_DP83848C=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_EMACRAM_SIZE=7296
CONFIG_LPC17_40_ETHERNET=y
@@ -73,4 +74,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig
index 9fb12c3..4384a5d 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig
@@ -32,6 +32,7 @@ CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x00
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xFF
+CONFIG_INIT_ENTRYPOINT="nxhello_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_MAXCONTRAST=255
@@ -90,4 +91,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nxhello_main"
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig
index 3a37cce..9cb6c95 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig
@@ -24,6 +24,8 @@ CONFIG_EXAMPLES_THTTPD=y
CONFIG_EXAMPLES_THTTPD_DRIPADDR=0xac100002
CONFIG_EXAMPLES_THTTPD_NOMAC=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="thttp_main"
+CONFIG_INIT_STACKSIZE=8192
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_40_ETHERNET=y
CONFIG_LPC17_40_ETH_NRXDESC=18
@@ -58,5 +60,3 @@ CONFIG_THTTPD_CGI_STACKSIZE=1024
CONFIG_THTTPD_IOBUFFERSIZE=1024
CONFIG_THTTPD_IPADDR=0xac100064
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=8192
-CONFIG_USER_ENTRYPOINT="thttp_main"
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig
index a27ab8a..7a7afa1 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig
+++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig
@@ -30,6 +30,7 @@ CONFIG_COMPOSITE_SERIALSTR="12345"
CONFIG_COMPOSITE_VENDORID=0x03eb
CONFIG_COMPOSITE_VERSIONNO=0x0101
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="conn_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -56,4 +57,3 @@ CONFIG_USBMSC_NRDREQS=2
CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USER_ENTRYPOINT="conn_main"
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig
index 165b050..f8865f8 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig
+++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MMCSD=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_FILEIOSIZE=512
@@ -40,4 +41,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_BAUD=38400
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_BAUD=38400
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig
index d52227e..d514d2e 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig
+++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig
@@ -19,6 +19,7 @@ CONFIG_ARM_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARDCTL=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="msconn_main"
CONFIG_MMCSD=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=32768
@@ -44,4 +45,3 @@ CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USER_ENTRYPOINT="msconn_main"
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig
index 2b7f08e..d79f6d9 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig
+++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig
@@ -19,6 +19,7 @@ CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXAMPLES_USBSERIAL=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="usbserial_main"
CONFIG_PL2303=y
CONFIG_PL2303_EPBULKIN=5
CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
@@ -36,4 +37,3 @@ CONFIG_UART0_BAUD=38400
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_BAUD=38400
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="usbserial_main"
diff --git a/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig b/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig
index aaa6833..7325ed8 100644
--- a/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig
+++ b/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig
@@ -16,6 +16,7 @@ CONFIG_ARCH_CHIP_LPC214X=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
@@ -31,4 +32,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_BAUD=38400
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_BAUD=38400
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig b/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig
index 4091a7d..479c8b6 100644
--- a/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig
+++ b/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig
@@ -25,6 +25,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=1
CONFIG_EXAMPLES_NXLINES_LINECOLOR=0x01
CONFIG_EXAMPLES_NXLINES_LINEWIDTH=4
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nxlines_main"
CONFIG_LCD=y
CONFIG_LCD_MAXCONTRAST=255
CONFIG_LCD_UG2864AMBAG01=y
@@ -51,4 +52,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_BAUD=38400
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_BAUD=38400
-CONFIG_USER_ENTRYPOINT="nxlines_main"
diff --git a/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig b/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig
index 18f35ff..2064bda 100644
--- a/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig
+++ b/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig
@@ -15,6 +15,7 @@ CONFIG_ARCH_CHIP_LPC2378=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC2378_UART0=y
CONFIG_LPC2378_UART2=y
CONFIG_NSH_FILEIOSIZE=512
@@ -35,4 +36,3 @@ CONFIG_UART0_RXBUFSIZE=128
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART0_TXBUFSIZE=128
CONFIG_UART2_BAUD=576000
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig b/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig
index f5ad78d..950928e 100644
--- a/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig
+++ b/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig
@@ -22,6 +22,7 @@ CONFIG_BOARD_LOOPSPERMSEC=16945
CONFIG_BOOT_RUNFROMISRAM=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC31_UART=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_FILEIOSIZE=512
@@ -40,4 +41,3 @@ CONFIG_START_YEAR=2010
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig b/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig
index dee4985..f93b475 100644
--- a/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig
+++ b/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_BUILD_2PASS=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC31_SPI=y
CONFIG_LPC31_UART=y
CONFIG_M25P_SPIMODE=3
@@ -53,4 +54,3 @@ CONFIG_START_YEAR=2010
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig
index 06aa7f0..5ec8da6 100644
--- a/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig
+++ b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig
@@ -21,6 +21,7 @@ CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_EXAMPLES_USBSERIAL=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="usbserial_main"
CONFIG_LPC31_UART=y
CONFIG_LPC31_USBOTG=y
CONFIG_PL2303=y
@@ -47,4 +48,3 @@ CONFIG_UART_SERIAL_CONSOLE=y
CONFIG_USBDEV=y
CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBDEV_TRACE=y
-CONFIG_USER_ENTRYPOINT="usbserial_main"
diff --git a/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig b/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig
index 87a63fa..dc98207 100644
--- a/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig
+++ b/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig
@@ -21,6 +21,7 @@ CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="ostest_main"
CONFIG_LPC31_UART=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=196608
@@ -37,4 +38,3 @@ CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3
CONFIG_TESTING_OSTEST_STACKSIZE=2048
CONFIG_UART_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="ostest_main"
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt b/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt
index c171940..cb0cef6 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt
@@ -693,7 +693,7 @@ Configurations
CONFIG_EXAMPLES_HIDKBD_DEVNAME="/dev/kbda"
RTOS Features
- CONFIG_USER_ENTRYPOINT="hidkbd_main"
+ CONFIG_INIT_ENTRYPOINT="hidkbd_main"
These settings disable NSH:
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig b/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig
index 665868e..f43a405 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig
@@ -25,6 +25,8 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
CONFIG_IDLETHREAD_STACKSIZE=768
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_LPC31_UART=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_FILEIOSIZE=512
@@ -46,5 +48,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_UART_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig
index 79011f3..079e2dd 100644
--- a/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig
+++ b/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig
@@ -25,6 +25,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC43_BOOT_SPIFI=y
CONFIG_LPC43_TMR0=y
CONFIG_LPC43_UART1=y
@@ -53,4 +54,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TIMER=y
CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig
index 4e2ded6..4728a63 100644
--- a/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig
+++ b/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig
@@ -26,6 +26,7 @@ CONFIG_EXAMPLES_TIMER=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC43_BOOT_SPIFI=y
CONFIG_LPC43_SSP0=y
CONFIG_LPC43_SSP1=y
@@ -58,4 +59,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TIMER=y
CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig
index 05119ba..93cf715 100644
--- a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig
+++ b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig
@@ -18,6 +18,7 @@ CONFIG_BOARD_LOOPSPERMSEC=18535
CONFIG_BUILTIN=y
CONFIG_DISCOVER_DESCR="BAMBINO"
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LIBC_HOSTNAME="Bambino-200E"
CONFIG_LIBM=y
CONFIG_LPC43_BOOT_SPIFI=y
@@ -81,4 +82,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig
index fb5fa54..0983b00 100644
--- a/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig
+++ b/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_EXAMPLES_TIMER=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC43_BOOT_SPIFI=y
CONFIG_LPC43_TMR0=y
CONFIG_LPC43_UART1=y
@@ -52,4 +53,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TIMER=y
CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig
index 2dc1dd9..20d1409 100644
--- a/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig
+++ b/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig
@@ -22,6 +22,7 @@ CONFIG_CDCACM=y
CONFIG_CDCACM_CONSOLE=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC43_BOOT_SPIFI=y
CONFIG_LPC43_TMR0=y
CONFIG_LPC43_UART1=y
@@ -47,4 +48,3 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc43xx/bambino-200e/kernel/Makefile b/boards/arm/lpc43xx/bambino-200e/kernel/Makefile
index c151e6b..ce220fb 100644
--- a/boards/arm/lpc43xx/bambino-200e/kernel/Makefile
+++ b/boards/arm/lpc43xx/bambino-200e/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c b/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c
index c724e69..60c8942 100644
--- a/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c
+++ b/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c
@@ -73,13 +73,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig
index 795d98f..19db902 100644
--- a/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig
+++ b/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC43_USART0=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -41,4 +42,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig
index d5442e4..870d11f 100644
--- a/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig
+++ b/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig
@@ -35,6 +35,7 @@ CONFIG_FS_FAT=y
CONFIG_I2C=y
CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MAXBUS=1
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC43_ADC0=y
CONFIG_LPC43_BOOT_FLASHA=y
CONFIG_LPC43_I2C0=y
@@ -72,4 +73,3 @@ CONFIG_USBDEV_BUSPOWERED=y
CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBDEV_MAXPOWER=500
CONFIG_USEC_PER_TICK=1000
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig
index dcf1984..06da502 100644
--- a/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig
+++ b/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BOARD_LOOPSPERMSEC=18535
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC43_BOOT_FLASHA=y
CONFIG_LPC43_USART0=y
CONFIG_MM_REGIONS=2
@@ -41,4 +42,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig
index ab6bdf7..931cd8c 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig
+++ b/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig
@@ -33,6 +33,7 @@ CONFIG_FS_FAT=y
CONFIG_I2C=y
CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MAXBUS=1
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPC43_BOOT_SPIFI=y
CONFIG_LPC43_I2C0=y
CONFIG_LPC43_SPIFI=y
@@ -69,4 +70,3 @@ CONFIG_USBDEV_BUSPOWERED=y
CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBDEV_MAXPOWER=500
CONFIG_USEC_PER_TICK=1000
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig
index 3943b37..8a19b50 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig
@@ -30,6 +30,7 @@ CONFIG_FT5X06_SINGLEPOINT=y
CONFIG_FT5X06_SWAPXY=y
CONFIG_GRAPHICS_PDCURSES=y
CONFIG_I2CTOOL_MAXBUS=9
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_FT5X06=y
CONFIG_LPC54_EMC=y
@@ -78,5 +79,4 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig
index 27863c6..e22b3eb 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig
@@ -27,6 +27,7 @@ CONFIG_FT5X06_SWAPXY=y
CONFIG_GRAPHICS_LVGL=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="lvgldemo_main"
CONFIG_INPUT=y
CONFIG_INPUT_FT5X06=y
CONFIG_INTELHEX_BINARY=y
@@ -59,5 +60,4 @@ CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="lvgldemo_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig
index acd40ff..87b97ff 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BOARD_LOOPSPERMSEC=21082
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_LAN8720=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -68,4 +69,3 @@ CONFIG_SYSTEM_PING6=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig
index 65c068d..3ce06cc 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig
@@ -26,6 +26,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_I2C=y
CONFIG_I2CTOOL_MAXBUS=9
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -59,4 +60,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig
index 6b8c499..73491f8 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig
@@ -29,6 +29,7 @@ CONFIG_FT5X06_SINGLEPOINT=y
CONFIG_FT5X06_SWAPXY=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
CONFIG_INPUT=y
CONFIG_INPUT_FT5X06=y
CONFIG_LPC54_EMC=y
@@ -98,4 +99,3 @@ CONFIG_START_MONTH=12
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nxwm_main"
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig
index 3bae17b..444ea08 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig
@@ -32,6 +32,7 @@ CONFIG_EXAMPLES_PWFB_FONTCOLOR=0x0000
CONFIG_EXAMPLES_PWFB_FONTID=1
CONFIG_EXAMPLES_PWFB_TBCOLOR=0xad55
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="pwfb_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC54_EMC=y
CONFIG_LPC54_EMC_DYNAMIC_CS0=y
@@ -70,4 +71,3 @@ CONFIG_START_YEAR=2019
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="pwfb_main"
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig
index b948525..c99b6f5 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig
@@ -23,6 +23,7 @@ CONFIG_BOARD_LOOPSPERMSEC=21082
CONFIG_EXAMPLES_PWLINES=y
CONFIG_EXAMPLES_PWLINES_BPP=16
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="pwlines_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC54_EMC=y
CONFIG_LPC54_EMC_DYNAMIC_CS0=y
@@ -63,4 +64,3 @@ CONFIG_START_YEAR=2019
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="pwlines_main"
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
index 2e1817b..1c332cf 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
@@ -29,6 +29,7 @@ CONFIG_FT5X06_THRESHY=8
CONFIG_GRAPHICS_TWM4NX=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="twm4nx_main"
CONFIG_INPUT=y
CONFIG_INPUT_FT5X06=y
CONFIG_LIBC_HOSTNAME="LPCXpresso-LPC54628"
@@ -99,4 +100,3 @@ CONFIG_TWM4NX_ICONMGR_NCOLUMNS=2
CONFIG_TWM4NX_KEYBOARD_DEVPATH="/dev/console"
CONFIG_TWM4NX_TOUCHSCREEN=y
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="twm4nx_main"
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
index 28ab62c..2eff373 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
@@ -29,6 +29,7 @@ CONFIG_FT5X06_THRESHY=8
CONFIG_GRAPHICS_TWM4NX=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="twm4nx_main"
CONFIG_INPUT=y
CONFIG_INPUT_FT5X06=y
CONFIG_LIBC_HOSTNAME="LPCXpresso-LPC54628"
@@ -101,4 +102,3 @@ CONFIG_TWM4NX_ICONMGR_NCOLUMNS=2
CONFIG_TWM4NX_KEYBOARD_DEVPATH="/dev/console"
CONFIG_TWM4NX_TOUCHSCREEN=y
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="twm4nx_main"
diff --git a/boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig b/boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig
index 746fc1b..b8b1269 100644
--- a/boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig
+++ b/boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_ARMV7M_USEBASEPRI=y
CONFIG_BOARD_LOOPSPERMSEC=8192
CONFIG_BUILTIN=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX326XX_UART1=y
CONFIG_NSH_ARCHINIT=y
@@ -38,4 +39,3 @@ CONFIG_START_DAY=17
CONFIG_START_MONTH=11
CONFIG_SYSTEM_NSH=y
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/moxart/moxa/configs/nsh/defconfig b/boards/arm/moxart/moxa/configs/nsh/defconfig
index 780f4d1..cfc10b9 100644
--- a/boards/arm/moxart/moxa/configs/nsh/defconfig
+++ b/boards/arm/moxart/moxa/configs/nsh/defconfig
@@ -55,6 +55,7 @@ CONFIG_FTMAC100_BASE=0x90900000
CONFIG_FTMAC100_IRQ=25
CONFIG_FTMAC100_MAC0_ENV_ADDR=0x80000050
CONFIG_HAVE_CXX=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_IOB_NBUFFERS=24
CONFIG_LIBC_EXECFUNCS=y
CONFIG_LIBC_LONG_LONG=y
@@ -92,4 +93,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52-feather/configs/i2c/defconfig b/boards/arm/nrf52/nrf52-feather/configs/i2c/defconfig
index dc201db..c50926e 100644
--- a/boards/arm/nrf52/nrf52-feather/configs/i2c/defconfig
+++ b/boards/arm/nrf52/nrf52-feather/configs/i2c/defconfig
@@ -23,6 +23,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_I2C=y
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_I2C0_MASTER=y
CONFIG_NRF52_UART0=y
@@ -45,4 +46,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig b/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig
index 0e8f7d4..5506c61 100644
--- a/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5500
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_UART0=y
CONFIG_NSH_ARCHINIT=y
@@ -39,4 +40,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig b/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig
index f7735ca..345c6b9 100644
--- a/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig
+++ b/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig
@@ -23,6 +23,7 @@ CONFIG_EXAMPLES_LEDS=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_UART0=y
CONFIG_NSH_ARCHINIT=y
@@ -45,4 +46,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_USERLED=y
CONFIG_USERLED_LOWER=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig b/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig
index 583166a..ce6d797 100644
--- a/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5500
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_UART0=y
CONFIG_NSH_ARCHINIT=y
@@ -39,4 +40,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig b/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig
index 2781b06..91583f3 100644
--- a/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig
+++ b/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig
@@ -22,6 +22,7 @@ CONFIG_EXAMPLES_WATCHDOG=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_UART0=y
CONFIG_NRF52_WDT=y
@@ -43,4 +44,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52832-mdk/configs/nsh/defconfig b/boards/arm/nrf52/nrf52832-mdk/configs/nsh/defconfig
index c018ab1..d834be6 100644
--- a/boards/arm/nrf52/nrf52832-mdk/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52832-mdk/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5500
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_UART0=y
CONFIG_NSH_ARCHINIT=y
@@ -39,4 +40,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52832-sparkfun/configs/nsh/defconfig b/boards/arm/nrf52/nrf52832-sparkfun/configs/nsh/defconfig
index 7af6600..094ced1 100644
--- a/boards/arm/nrf52/nrf52832-sparkfun/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52832-sparkfun/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5500
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_UART0=y
CONFIG_NSH_ARCHINIT=y
@@ -39,4 +40,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig
index 7725055..31623ed 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig
@@ -26,6 +26,7 @@ CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_SAADC=y
CONFIG_NRF52_UART0=y
@@ -47,4 +48,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig
index fde9891..2546941 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig
@@ -22,6 +22,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5500
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="highpri_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52840DK_HIGHPRI=y
CONFIG_NRF52_TIMER0=y
@@ -38,4 +39,3 @@ CONFIG_START_MONTH=3
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="highpri_main"
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig
index bb29917..0e9a82a 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5500
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_UART0=y
CONFIG_NSH_ARCHINIT=y
@@ -39,4 +40,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig
index 0199446..f9349bc 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig
@@ -22,6 +22,7 @@ CONFIG_EXAMPLES_PWM=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_PWM0=y
CONFIG_NRF52_PWM0_CH0=y
@@ -51,4 +52,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/sx127x/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/sx127x/defconfig
index 7d48d60..1d4ca4f 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/sx127x/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/sx127x/defconfig
@@ -25,6 +25,7 @@ CONFIG_EXAMPLES_SX127X_RFFREQ=433000000
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPWAN_SX127X=y
CONFIG_LPWAN_SX127X_RXSUPPORT=y
CONFIG_LPWAN_SX127X_TXSUPPORT=y
@@ -51,4 +52,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig
index 4d10f82..8fe3b11 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig
@@ -22,6 +22,7 @@ CONFIG_EXAMPLES_TIMER=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_RTC0=y
CONFIG_NRF52_TIMER0=y
@@ -44,4 +45,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig b/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig
index 879d8e8..bea3673 100644
--- a/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5500
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_NRF52_UART0=y
CONFIG_NSH_ARCHINIT=y
@@ -39,4 +40,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig
index 5508600..432e5fa 100644
--- a/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig
+++ b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig
@@ -25,6 +25,8 @@ CONFIG_BOARD_LOOPSPERMSEC=2988
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_SMALL=y
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
@@ -52,5 +54,3 @@ CONFIG_TLS_NELEM=0
CONFIG_UART1_RXBUFSIZE=64
CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_UART1_TXBUFSIZE=64
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/phy62xx/phy6222/configs/nsh/defconfig b/boards/arm/phy62xx/phy6222/configs/nsh/defconfig
index 81c9a1a..93f6e44 100644
--- a/boards/arm/phy62xx/phy6222/configs/nsh/defconfig
+++ b/boards/arm/phy62xx/phy6222/configs/nsh/defconfig
@@ -23,6 +23,8 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
CONFIG_FS_LITTLEFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_MM_CIRCBUF=y
CONFIG_MM_SMALL=y
CONFIG_MTD=y
@@ -45,5 +47,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_TLS_NELEM=0
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig b/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig
index 34f77a1..a715659 100644
--- a/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig
+++ b/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig
@@ -47,6 +47,8 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DEV_GPIO=y
CONFIG_EXAMPLES_HELLO=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_INTELHEX_BINARY=y
CONFIG_IOEXPANDER=y
CONFIG_IOEXPANDER_MULTIPIN=y
@@ -75,5 +77,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_TLS_NELEM=0
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig
index d912686..82e0845 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig
@@ -42,6 +42,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MMCSD=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -69,4 +70,3 @@ CONFIG_SYSTEM_SPITOOL=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig
index 5fc7ff6..b7d433f 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig
@@ -42,6 +42,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MMCSD=y
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
CONFIG_NSH_ARCHINIT=y
@@ -72,4 +73,3 @@ CONFIG_USBDEV_COMPOSITE=y
CONFIG_USBMSC=y
CONFIG_USBMSC_COMPOSITE=y
CONFIG_USBMSC_NOT_STALL_BULKEP=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig
index 7840fa9..e2276dc 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig
@@ -54,6 +54,7 @@ CONFIG_EXAMPLES_NX_BPP=16
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LCD=y
CONFIG_LCD_DEV=y
CONFIG_LCD_FRAMEBUFFER=y
@@ -95,5 +96,4 @@ CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_USBDEV=y
CONFIG_USBDEV_BUSPOWERED=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig
index 3679dbb..59dfa70 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig
@@ -30,6 +30,7 @@ CONFIG_ENC28J60=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NET=y
CONFIG_NETDB_DNSCLIENT=y
CONFIG_NETDB_DNSSERVER_NOADDR=y
@@ -79,5 +80,4 @@ CONFIG_SYSTEM_TELNET_CLIENT=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WQUEUE_NOTIFIER=y
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig
index a56416d..622d7e2 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig
@@ -29,6 +29,7 @@ CONFIG_EXAMPLES_HELLO=y
CONFIG_EXAMPLES_SLCD=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LCD_BACKPACK=y
CONFIG_LCD_LCD1602=y
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
@@ -54,4 +55,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig
index 56eca82..b098cf4 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig
@@ -28,6 +28,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -46,4 +47,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig
index ffd7e50..f48e75e 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig
@@ -28,6 +28,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -46,4 +47,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig
index ae7e627..edc33b1 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig
@@ -29,6 +29,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -52,4 +53,3 @@ CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_SMP=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig
index 630f853..27e3d9b 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig
@@ -34,6 +34,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MMCSD=y
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
CONFIG_NSH_ARCHINIT=y
@@ -58,4 +59,3 @@ CONFIG_SYSTEM_SPITOOL=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig
index c02aed3..ea515a6 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig
@@ -39,6 +39,7 @@ CONFIG_EXAMPLES_NXLINES_LINEWIDTH=1
CONFIG_EXAMPLES_NX_BPP=1
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LCD=y
CONFIG_LCD_DEV=y
CONFIG_LCD_FRAMEBUFFER=y
@@ -73,4 +74,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig
index eb34efb..904676b 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig
@@ -30,6 +30,7 @@ CONFIG_EXAMPLES_FB=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LCD=y
CONFIG_LCD_FRAMEBUFFER=y
CONFIG_LCD_PORTRAIT=y
@@ -56,5 +57,4 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig
index be93ae0..96e3cd6 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig
@@ -36,6 +36,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MMCSD=y
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
CONFIG_NSH_ARCHINIT=y
@@ -65,4 +66,3 @@ CONFIG_USBDEV=y
CONFIG_USBDEV_BUSPOWERED=y
CONFIG_USBMSC=y
CONFIG_USBMSC_NOT_STALL_BULKEP=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig
index 1f3a36f..8cb210d 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig
@@ -31,6 +31,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -50,4 +51,3 @@ CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_USBDEV=y
CONFIG_USBDEV_BUSPOWERED=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig
index 946c9c8..3a60c32 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig
@@ -51,6 +51,7 @@ CONFIG_EXAMPLES_NX_BPP=16
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LCD=y
CONFIG_LCD_DEV=y
CONFIG_LCD_FRAMEBUFFER=y
@@ -92,5 +93,4 @@ CONFIG_SYSTEM_SPITOOL=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig
index fd7156c..be5f154 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig
@@ -51,6 +51,7 @@ CONFIG_EXAMPLES_NX_BPP=16
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LCD=y
CONFIG_LCD_DEV=y
CONFIG_LCD_FRAMEBUFFER=y
@@ -89,5 +90,4 @@ CONFIG_SYSTEM_SPITOOL=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig
index a11980d..ce022dc 100644
--- a/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig
@@ -23,6 +23,8 @@ CONFIG_BINFMT_DISABLE=y
CONFIG_BOARD_LOOPSPERMSEC=2988
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_LPUART0_RXBUFSIZE=64
CONFIG_LPUART0_SERIAL_CONSOLE=y
CONFIG_LPUART0_TXBUFSIZE=64
@@ -51,5 +53,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_TLS_NELEM=0
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig
index 948b834..483a0e0 100644
--- a/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig
@@ -23,6 +23,7 @@ CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_MOTOROLA_SREC=y
CONFIG_NSH_ARCHINIT=y
@@ -42,4 +43,3 @@ CONFIG_START_MONTH=9
CONFIG_START_YEAR=2021
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig
index 6fe3c51..9ff9bda 100644
--- a/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig
@@ -23,6 +23,7 @@ CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_MOTOROLA_SREC=y
CONFIG_NSH_ARCHINIT=y
@@ -42,4 +43,3 @@ CONFIG_START_MONTH=9
CONFIG_START_YEAR=2021
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig
index 86dea79..94be788 100644
--- a/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig
@@ -23,6 +23,7 @@ CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_MOTOROLA_SREC=y
CONFIG_NSH_ARCHINIT=y
@@ -42,4 +43,3 @@ CONFIG_START_MONTH=9
CONFIG_START_YEAR=2021
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/s32k1xx/ucans32k146/configs/can/defconfig b/boards/arm/s32k1xx/ucans32k146/configs/can/defconfig
index 5fc15f7..b3e5cb1 100644
--- a/boards/arm/s32k1xx/ucans32k146/configs/can/defconfig
+++ b/boards/arm/s32k1xx/ucans32k146/configs/can/defconfig
@@ -34,6 +34,7 @@ CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MAXADDR=0x7f
CONFIG_I2CTOOL_MAXBUS=0
CONFIG_I2CTOOL_MINADDR=0x00
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NET=y
CONFIG_NETDEV_IFINDEX=y
@@ -72,4 +73,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_SPITOOL=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/s32k1xx/ucans32k146/configs/nsh/defconfig b/boards/arm/s32k1xx/ucans32k146/configs/nsh/defconfig
index 0560d86..87a12fc 100644
--- a/boards/arm/s32k1xx/ucans32k146/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/ucans32k146/configs/nsh/defconfig
@@ -23,6 +23,7 @@ CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -41,4 +42,3 @@ CONFIG_START_MONTH=9
CONFIG_START_YEAR=2021
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/arduino-due/configs/nsh/defconfig b/boards/arm/sam34/arduino-due/configs/nsh/defconfig
index 88efae5..9e09c1f 100644
--- a/boards/arm/sam34/arduino-due/configs/nsh/defconfig
+++ b/boards/arm/sam34/arduino-due/configs/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_BUILTIN=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -40,4 +41,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig b/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig
index 94e65a4..90fdece 100644
--- a/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig
+++ b/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -40,4 +41,3 @@ CONFIG_START_MONTH=6
CONFIG_START_YEAR=2013
CONFIG_SYSTEM_NSH=y
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig b/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig
index 7d5057f..723f13c 100644
--- a/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig
+++ b/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig
@@ -28,6 +28,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LCD=y
CONFIG_LCD_HILETGO=y
CONFIG_LCD_MAXCONTRAST=255
@@ -55,4 +56,3 @@ CONFIG_START_DAY=11
CONFIG_START_MONTH=2
CONFIG_SYSTEM_NSH=y
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig b/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig
index c244ed9..b41e173 100644
--- a/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig
+++ b/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_ARM_MPU=y
CONFIG_BOARD_LOOPSPERMSEC=8720
CONFIG_BUILD_PROTECTED=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MMCSD=y
CONFIG_MM_REGIONS=3
CONFIG_NSH_DISABLE_DD=y
@@ -50,4 +51,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYS_RESERVED=9
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig b/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig
index b711979..a4ee49f 100644
--- a/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig
@@ -22,6 +22,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=8720
CONFIG_BUILTIN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -41,4 +42,3 @@ CONFIG_START_YEAR=2009
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/sam3u-ek/configs/nx/defconfig b/boards/arm/sam34/sam3u-ek/configs/nx/defconfig
index 8319338..f9d2264 100644
--- a/boards/arm/sam34/sam3u-ek/configs/nx/defconfig
+++ b/boards/arm/sam34/sam3u-ek/configs/nx/defconfig
@@ -34,6 +34,7 @@ CONFIG_EXAMPLES_NX_COLOR1=0xe73f
CONFIG_EXAMPLES_NX_COLOR2=0xdefb
CONFIG_EXAMPLES_NX_FONTCOLOR=0x0000
CONFIG_EXAMPLES_NX_TBCOLOR=0xad55
+CONFIG_INIT_ENTRYPOINT="nx_main"
CONFIG_LCD=y
CONFIG_LCD_MAXCONTRAST=1
CONFIG_LCD_MAXPOWER=31
@@ -56,4 +57,3 @@ CONFIG_START_MONTH=4
CONFIG_START_YEAR=2010
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nx_main"
diff --git a/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig b/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig
index b6725d5..aca8008 100644
--- a/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig
+++ b/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig
@@ -29,6 +29,8 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=8720
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INPUT=y
CONFIG_INPUT_ADS7843E=y
CONFIG_LCD=y
@@ -91,5 +93,3 @@ CONFIG_START_MONTH=6
CONFIG_START_YEAR=2013
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="nxwm_main"
diff --git a/boards/arm/sam34/sam3u-ek/kernel/Makefile b/boards/arm/sam34/sam3u-ek/kernel/Makefile
index 141a884..f7a7a49 100644
--- a/boards/arm/sam34/sam3u-ek/kernel/Makefile
+++ b/boards/arm/sam34/sam3u-ek/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
index 0c2ede6..327d7b6 100644
--- a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
+++ b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig b/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig
index 38ae5b6..b5c0751 100644
--- a/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig
@@ -18,6 +18,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_DISABLE_IFUPDOWN=y
@@ -36,4 +37,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=24
CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/sam4e-ek/README.txt b/boards/arm/sam34/sam4e-ek/README.txt
index 44f53da..4b37fee 100644
--- a/boards/arm/sam34/sam4e-ek/README.txt
+++ b/boards/arm/sam34/sam4e-ek/README.txt
@@ -1108,7 +1108,7 @@ Configurations
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_IDLETHREAD_STACKSIZE=1024
- CONFIG_USERMAIN_STACKSIZE=2048
+ CONFIG_INIT_STACKSIZE=2048
CONFIG_PTHREAD_STACK_DEFAULT=2048
... and others ...
diff --git a/boards/arm/sam34/sam4e-ek/configs/nsh/defconfig b/boards/arm/sam34/sam4e-ek/configs/nsh/defconfig
index 0946740..dd77ebc 100644
--- a/boards/arm/sam34/sam4e-ek/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4e-ek/configs/nsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_ETH0_PHY_KSZ8051=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_IOB_NBUFFERS=24
CONFIG_MM_REGIONS=2
CONFIG_MTD=y
@@ -81,4 +82,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig b/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig
index 97b65ad..e2057bb 100644
--- a/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig
+++ b/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig
@@ -32,6 +32,8 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INPUT=y
CONFIG_INPUT_ADS7843E=y
CONFIG_INTELHEX_BINARY=y
@@ -138,5 +140,3 @@ CONFIG_START_YEAR=2014
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="nxwm_main"
diff --git a/boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig b/boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig
index 921d78c..85422e2 100644
--- a/boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig
+++ b/boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig
@@ -34,6 +34,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MM_REGIONS=2
CONFIG_MTD=y
CONFIG_MTD_AT25=y
@@ -91,4 +92,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig b/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig
index 5f02bd0..226ab69 100644
--- a/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig
@@ -23,6 +23,8 @@ CONFIG_BUILTIN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_MM_REGIONS=3
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -44,5 +46,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_USART0_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sam34/sam4s-xplained-pro/configs/fs/defconfig b/boards/arm/sam34/sam4s-xplained-pro/configs/fs/defconfig
index 3588d16..fed19c7 100644
--- a/boards/arm/sam34/sam4s-xplained-pro/configs/fs/defconfig
+++ b/boards/arm/sam34/sam4s-xplained-pro/configs/fs/defconfig
@@ -36,6 +36,8 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_INTELHEX_BINARY=y
CONFIG_JULIAN_TIME=y
CONFIG_LIBC_STRERROR=y
@@ -93,8 +95,6 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=15
CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_USBDEV=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WATCHDOG=y
CONFIG_WDT_ENABLED_ON_RESET=y
CONFIG_WDT_THREAD_STACKSIZE=512
diff --git a/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig b/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig
index 405c6f1..1aa297c 100644
--- a/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig
@@ -38,6 +38,8 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_INTELHEX_BINARY=y
CONFIG_JULIAN_TIME=y
CONFIG_LIBC_STRERROR=y
@@ -86,8 +88,6 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=15
CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_USBDEV=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WATCHDOG=y
CONFIG_WDT_ENABLED_ON_RESET=y
CONFIG_WDT_THREAD_STACKSIZE=512
diff --git a/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig b/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig
index ec2d773..ac95af1 100644
--- a/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig
@@ -25,6 +25,7 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_READLINE=y
@@ -42,4 +43,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/giant-board/configs/netnsh/defconfig b/boards/arm/sama5/giant-board/configs/netnsh/defconfig
index ab28fac..c01a417 100644
--- a/boards/arm/sama5/giant-board/configs/netnsh/defconfig
+++ b/boards/arm/sama5/giant-board/configs/netnsh/defconfig
@@ -41,6 +41,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HIDKBD_POLLUSEC=80000
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_THROTTLE=0
@@ -110,4 +111,3 @@ CONFIG_USBHOST_COMPOSITE=y
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_HUB=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/giant-board/configs/nsh/defconfig b/boards/arm/sama5/giant-board/configs/nsh/defconfig
index ca17fe1..193b917 100644
--- a/boards/arm/sama5/giant-board/configs/nsh/defconfig
+++ b/boards/arm/sama5/giant-board/configs/nsh/defconfig
@@ -33,6 +33,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HIDKBD_POLLUSEC=80000
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -71,4 +72,3 @@ CONFIG_UIMAGE_ENTRY_POINT=0x20008040
CONFIG_UIMAGE_LOAD_ADDRESS=0x20008000
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig b/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig
index b2a0b5f..6a946ff 100644
--- a/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig
+++ b/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig
@@ -47,6 +47,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HIDKBD_POLLUSEC=80000
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=72
CONFIG_IOB_THROTTLE=16
@@ -146,4 +147,3 @@ CONFIG_USBHOST_COMPOSITE=y
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_HUB=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig b/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig
index d2f4cec..cf964d1 100644
--- a/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig
+++ b/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig
@@ -47,6 +47,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HIDKBD_POLLUSEC=80000
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=72
CONFIG_IOB_THROTTLE=16
@@ -133,4 +134,3 @@ CONFIG_USBDEV_TRACE=y
CONFIG_USBDEV_TRACE_NRECORDS=512
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig
index d6eb117..8c34958 100644
--- a/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig
+++ b/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig
@@ -43,6 +43,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HIDKBD_POLLUSEC=80000
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_THROTTLE=0
@@ -113,4 +114,3 @@ CONFIG_USBHOST_COMPOSITE=y
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_HUB=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig
index 2f47a0c..ec6f919 100644
--- a/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig
@@ -35,6 +35,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HIDKBD_POLLUSEC=80000
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -74,4 +75,3 @@ CONFIG_UIMAGE_ENTRY_POINT=0x20008040
CONFIG_UIMAGE_LOAD_ADDRESS=0x20008000
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig
index 9b61d26..8a5d9ed 100644
--- a/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig
+++ b/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig
@@ -49,6 +49,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HIDKBD_POLLUSEC=80000
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=72
CONFIG_IOB_THROTTLE=16
@@ -137,4 +138,3 @@ CONFIG_USBDEV_TRACE=y
CONFIG_USBDEV_TRACE_NRECORDS=512
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig
index c341a3e..ecbb78a 100644
--- a/boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig
+++ b/boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig
@@ -33,6 +33,7 @@ CONFIG_FS_FAT=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="bridge_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NET=y
CONFIG_NETUTILS_NETLIB=y
@@ -71,4 +72,3 @@ CONFIG_START_YEAR=2014
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_SYSTEM_READLINE=y
-CONFIG_USER_ENTRYPOINT="bridge_main"
diff --git a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig
index 0eecf76..e1aab72 100644
--- a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig
+++ b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig
@@ -42,6 +42,7 @@ CONFIG_FS_PROCFS_EXCLUDE_VERSION=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=72
CONFIG_IOB_THROTTLE=16
@@ -120,4 +121,3 @@ CONFIG_USBDEV_DMA=y
CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBDEV_TRACE=y
CONFIG_USBDEV_TRACE_NRECORDS=512
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig
index 10f1344..752f524 100644
--- a/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig
@@ -30,6 +30,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -52,4 +53,3 @@ CONFIG_START_MONTH=7
CONFIG_START_YEAR=2014
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig
index 49903ff..466c7fb 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig
@@ -31,6 +31,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -92,4 +93,3 @@ CONFIG_USBHOST_MSC=y
CONFIG_USBMSC=y
CONFIG_USBMSC_EPBULKIN=2
CONFIG_USBMSC_EPBULKOUT=1
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig
index ffc7205..ed0e4d1 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig
@@ -21,6 +21,7 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="hello_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=114688
@@ -37,4 +38,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="hello_main"
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig
index 995e5fc..1f6755d 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig
@@ -21,6 +21,7 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nor_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=114688
@@ -41,4 +42,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nor_main"
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig
index 63c87c3..6e38e23 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig
@@ -31,6 +31,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -54,4 +55,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig
index 6493bfa..6d8a327 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig
@@ -28,6 +28,7 @@ CONFIG_FLASH_VSTART=0x10000000
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nx_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_MQ_MAXMSGSIZE=64
@@ -68,4 +69,3 @@ CONFIG_START_YEAR=2013
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_READLINE=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nx_main"
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig
index 5d0e821..36e0edd 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig
@@ -38,6 +38,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2C=y
CONFIG_I2C_RESET=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -91,6 +92,5 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NXPLAYER=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WM8904_NUM_BUFFERS=8
CONFIG_WM8904_WORKER_STACKSIZE=1536
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig
index ea49898..d7a81d5 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig
@@ -27,6 +27,8 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBM=y
@@ -118,5 +120,3 @@ CONFIG_START_MONTH=10
CONFIG_START_YEAR=2013
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="nxwm_main"
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig
index 4cf0470..cc22fb2 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig
@@ -25,6 +25,7 @@ CONFIG_FLASH_SIZE=134217728
CONFIG_FLASH_START=0x10000000
CONFIG_FLASH_VSTART=0x10000000
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="ov2640_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_PREALLOC_TIMERS=4
@@ -59,5 +60,4 @@ CONFIG_START_MONTH=12
CONFIG_START_YEAR=2013
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="ov2640_main"
CONFIG_VIDEO_OV2640=y
diff --git a/boards/arm/sama5/sama5d4-ek/README.txt b/boards/arm/sama5/sama5d4-ek/README.txt
index 4bd42df..4e75593 100644
--- a/boards/arm/sama5/sama5d4-ek/README.txt
+++ b/boards/arm/sama5/sama5d4-ek/README.txt
@@ -3998,8 +3998,8 @@ Configurations
CONFIG_BUILD_KERNEL=y : Kernel build enabled
RTOS Features -> Tasks and Scheduling
- CONFIG_INIT_FILEPATH=y : Start-up is via an ELF file
- CONFIG_USER_INITPATH="/bin/init" : The location of the startup
+ CONFIG_INIT_FILE=y : Start-up is via an ELF file
+ CONFIG_INIT_FILEPATH="/bin/init" : The location of the startup
CONFIG_SCHED_HAVE_PARENT=y : Needed to handle task exit
RTOS Features -> System call support
diff --git a/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig
index 4bb7bdf..776cea4 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig
@@ -25,6 +25,7 @@ CONFIG_FS_FAT=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="at25_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_HEX2BIN=y
CONFIG_MTD=y
@@ -54,4 +55,3 @@ CONFIG_START_YEAR=2014
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_READLINE=y
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="at25_main"
diff --git a/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig b/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig
index a6f3f77..785da93 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig
@@ -31,6 +31,7 @@ CONFIG_FS_FAT=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="bridge_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NET=y
CONFIG_NETUTILS_NETLIB=y
@@ -79,4 +80,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_SYSTEM_READLINE=y
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="bridge_main"
diff --git a/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig
index 4d5f1bf..010ed03 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig
@@ -25,6 +25,7 @@ CONFIG_FS_FAT=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="dram_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_HEX2BIN=y
CONFIG_PREALLOC_TIMERS=4
@@ -49,4 +50,3 @@ CONFIG_START_YEAR=2014
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_READLINE=y
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="dram_main"
diff --git a/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig b/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig
index 071956f..59ce948 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig
@@ -48,6 +48,8 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2C=y
CONFIG_I2C_RESET=y
+CONFIG_INIT_ENTRYPOINT="elf_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_INTELHEX_BINARY=y
CONFIG_LIB_SYSCALL=y
CONFIG_MM_PGALLOC=y
@@ -75,5 +77,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_READLINE=y
CONFIG_SYS_RESERVED=1
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="elf_main"
diff --git a/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig
index c433068..d9405c2 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig
@@ -50,6 +50,7 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MAXBUS=0
CONFIG_I2C_RESET=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_MXT=y
CONFIG_INTELHEX_BINARY=y
@@ -152,6 +153,5 @@ CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_ISOC_DISABLE=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WM8904_NUM_BUFFERS=8
CONFIG_WM8904_WORKER_STACKSIZE=1536
diff --git a/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig
index e274ef7..943e50c 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig
@@ -49,6 +49,7 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MAXBUS=0
CONFIG_I2C_RESET=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_MXT=y
CONFIG_INTELHEX_BINARY=y
@@ -154,6 +155,5 @@ CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_ISOC_DISABLE=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WM8904_NUM_BUFFERS=8
CONFIG_WM8904_WORKER_STACKSIZE=1536
diff --git a/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig b/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig
index 172d3db..4ca7476 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig
@@ -50,6 +50,8 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MAXBUS=0
CONFIG_I2C_RESET=y
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INPUT=y
CONFIG_INPUT_MXT=y
CONFIG_INTELHEX_BINARY=y
@@ -188,5 +190,3 @@ CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_ISOC_DISABLE=y
CONFIG_USBHOST_MSC=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="nxwm_main"
diff --git a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
index da6dcfd..bb5f1ab 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
@@ -28,6 +28,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_DISABLEBG=y
@@ -90,4 +91,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig b/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig
index e319112..4fecd19 100644
--- a/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig
@@ -36,6 +36,8 @@ CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_PTHREAD_STACK_DEFAULT=1536
CONFIG_RAM_SIZE=32768
@@ -58,5 +60,3 @@ CONFIG_USART3_TXBUFSIZE=64
CONFIG_USART4_RXBUFSIZE=64
CONFIG_USART4_TXBUFSIZE=64
CONFIG_USART5_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig b/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig
index 691b05a..405ad69 100644
--- a/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig
+++ b/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig
@@ -39,6 +39,8 @@ CONFIG_CDCACM_CONSOLE=y
CONFIG_DEFAULT_SMALL=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_PTHREAD_STACK_DEFAULT=1536
CONFIG_RAM_SIZE=32768
@@ -56,5 +58,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_USBDEV=y
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samd2l2/circuit-express/configs/nsh/defconfig b/boards/arm/samd2l2/circuit-express/configs/nsh/defconfig
index ed9c861..c38fcb9 100644
--- a/boards/arm/samd2l2/circuit-express/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/circuit-express/configs/nsh/defconfig
@@ -40,6 +40,8 @@ CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEBUG_WARN=y
CONFIG_DEFAULT_SMALL=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_PTHREAD_STACK_DEFAULT=1536
CONFIG_RAM_SIZE=32768
@@ -58,5 +60,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_USART4_RXBUFSIZE=64
CONFIG_USART4_SERIAL_CONSOLE=y
CONFIG_USART4_TXBUFSIZE=64
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samd2l2/circuit-express/configs/usbnsh/defconfig b/boards/arm/samd2l2/circuit-express/configs/usbnsh/defconfig
index a39a556..483a652 100644
--- a/boards/arm/samd2l2/circuit-express/configs/usbnsh/defconfig
+++ b/boards/arm/samd2l2/circuit-express/configs/usbnsh/defconfig
@@ -38,6 +38,8 @@ CONFIG_CDCACM=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_USBCONSOLE=y
CONFIG_PTHREAD_STACK_DEFAULT=1536
@@ -60,5 +62,3 @@ CONFIG_USART4_RXBUFSIZE=64
CONFIG_USART4_SERIAL_CONSOLE=y
CONFIG_USART4_TXBUFSIZE=64
CONFIG_USBDEV=y
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig
index 5fd83b5..46af36d 100644
--- a/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig
@@ -38,6 +38,8 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_PTHREAD_STACK_DEFAULT=1536
CONFIG_RAM_SIZE=32768
@@ -59,5 +61,3 @@ CONFIG_USART3_TXBUFSIZE=64
CONFIG_USART4_RXBUFSIZE=64
CONFIG_USART4_SERIAL_CONSOLE=y
CONFIG_USART4_TXBUFSIZE=64
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig
index 9a76833..ac0e0e8 100644
--- a/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig
@@ -38,6 +38,8 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_PTHREAD_STACK_DEFAULT=1536
@@ -59,5 +61,3 @@ CONFIG_USART3_TXBUFSIZE=64
CONFIG_USART4_RXBUFSIZE=64
CONFIG_USART4_SERIAL_CONSOLE=y
CONFIG_USART4_TXBUFSIZE=64
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig
index b9c1fe7..2870ea2 100644
--- a/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig
@@ -38,6 +38,8 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_PTHREAD_STACK_DEFAULT=1536
@@ -62,5 +64,3 @@ CONFIG_USART3_TXBUFSIZE=64
CONFIG_USART4_RXBUFSIZE=64
CONFIG_USART4_SERIAL_CONSOLE=y
CONFIG_USART4_TXBUFSIZE=64
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig b/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig
index 2ca5ab6..46c7520 100644
--- a/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig
+++ b/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig
@@ -19,6 +19,8 @@ CONFIG_BUILTIN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
@@ -42,5 +44,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_USART3_RXBUFSIZE=64
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=64
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig b/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig
index 5590723..f66d0d8 100644
--- a/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig
+++ b/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig
@@ -19,6 +19,8 @@ CONFIG_BUILTIN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
@@ -43,5 +45,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART3_RXBUFSIZE=64
CONFIG_USART3_TXBUFSIZE=64
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/same70-qmtech/README.txt b/boards/arm/samv7/same70-qmtech/README.txt
index 76b33cd..a278765 100644
--- a/boards/arm/samv7/same70-qmtech/README.txt
+++ b/boards/arm/samv7/same70-qmtech/README.txt
@@ -742,7 +742,7 @@ Configuration sub-directories
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_IDLETHREAD_STACKSIZE=1024
- CONFIG_USERMAIN_STACKSIZE=2048
+ CONFIG_INIT_STACKSIZE=2048
CONFIG_PTHREAD_STACK_DEFAULT=2048
... and others ...
@@ -795,7 +795,7 @@ Configuration sub-directories
CONFIG_MCUBOOT_ENABLE_LOGGING=y
CONFIG_SAMV7_FORMAT_MCUBOOT=y
- CONFIG_USER_ENTRYPOINT="mcuboot_loader_main"
+ CONFIG_INIT_ENTRYPOINT="mcuboot_loader_main"
mcuboot-confirm:
This configuration exercises the MCUboot compatible application slot
@@ -815,4 +815,4 @@ Configuration sub-directories
CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_SAMV7_FORMAT_MCUBOOT=y
- CONFIG_USER_ENTRYPOINT="mcuboot_confirm_main"
+ CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
diff --git a/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig b/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig
index 0b848a6..c84e640 100644
--- a/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig
+++ b/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig
@@ -32,6 +32,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y
@@ -62,4 +63,3 @@ CONFIG_START_YEAR=2021
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="mcuboot_confirm_main"
diff --git a/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig b/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig
index ec31b08..71f4f1f 100644
--- a/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig
+++ b/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig
@@ -32,6 +32,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="mcuboot_loader_main"
CONFIG_MCUBOOT_BOOTLOADER=y
CONFIG_MCUBOOT_ENABLE_LOGGING=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -63,4 +64,3 @@ CONFIG_START_YEAR=2021
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="mcuboot_loader_main"
diff --git a/boards/arm/samv7/same70-qmtech/configs/nsh/defconfig b/boards/arm/samv7/same70-qmtech/configs/nsh/defconfig
index bdc32fd..1ef1f31 100644
--- a/boards/arm/samv7/same70-qmtech/configs/nsh/defconfig
+++ b/boards/arm/samv7/same70-qmtech/configs/nsh/defconfig
@@ -33,6 +33,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y
CONFIG_NSH_ARCHINIT=y
@@ -61,4 +62,3 @@ CONFIG_START_YEAR=2021
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/same70-qmtech/kernel/Makefile b/boards/arm/samv7/same70-qmtech/kernel/Makefile
index 1cf8976..6581fb6 100644
--- a/boards/arm/samv7/same70-qmtech/kernel/Makefile
+++ b/boards/arm/samv7/same70-qmtech/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c b/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c
index a02ae6b..41405d8 100644
--- a/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c
+++ b/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/samv7/same70-xplained/README.txt b/boards/arm/samv7/same70-xplained/README.txt
index cfda0dc..cc4df62 100644
--- a/boards/arm/samv7/same70-xplained/README.txt
+++ b/boards/arm/samv7/same70-xplained/README.txt
@@ -1415,7 +1415,7 @@ Configuration sub-directories
CONFIG_SCHED_HPWORKSTACKSIZE=2048
CONFIG_IDLETHREAD_STACKSIZE=1024
- CONFIG_USERMAIN_STACKSIZE=2048
+ CONFIG_INIT_STACKSIZE=2048
CONFIG_PTHREAD_STACK_MIN=256
CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
@@ -1518,7 +1518,7 @@ Configuration sub-directories
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_IDLETHREAD_STACKSIZE=1024
- CONFIG_USERMAIN_STACKSIZE=2048
+ CONFIG_INIT_STACKSIZE=2048
CONFIG_PTHREAD_STACK_DEFAULT=2048
... and others ...
@@ -1717,7 +1717,7 @@ Configuration sub-directories
CONFIG_MCUBOOT_ENABLE_LOGGING=y
CONFIG_SAMV7_FORMAT_MCUBOOT=y
- CONFIG_USER_ENTRYPOINT="mcuboot_loader_main"
+ CONFIG_INIT_ENTRYPOINT="mcuboot_loader_main"
mcuboot-confirm:
This configuration exercises the MCUboot compatible application slot
@@ -1737,4 +1737,4 @@ Configuration sub-directories
CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_SAMV7_FORMAT_MCUBOOT=y
- CONFIG_USER_ENTRYPOINT="mcuboot_confirm_main"
+ CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
diff --git a/boards/arm/samv7/same70-xplained/configs/adc/defconfig b/boards/arm/samv7/same70-xplained/configs/adc/defconfig
index 2a923d2..0090301 100644
--- a/boards/arm/samv7/same70-xplained/configs/adc/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/adc/defconfig
@@ -45,6 +45,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y
CONFIG_MTD=y
@@ -86,4 +87,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig b/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig
index 4fbf4c2..5089a97 100644
--- a/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig
@@ -41,6 +41,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y
@@ -77,4 +78,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="mcuboot_confirm_main"
diff --git a/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig b/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig
index 4ddd819..fba8684 100644
--- a/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig
@@ -41,6 +41,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_INIT_ENTRYPOINT="mcuboot_loader_main"
CONFIG_MCUBOOT_BOOTLOADER=y
CONFIG_MCUBOOT_ENABLE_LOGGING=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -78,4 +79,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="mcuboot_loader_main"
diff --git a/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig
index 4c78cbd..c1a0bb3 100644
--- a/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig
@@ -48,6 +48,7 @@ CONFIG_IEEE802154_MAC=y
CONFIG_IEEE802154_MACDEV=y
CONFIG_IEEE802154_MRF24J40=y
CONFIG_IEEE802154_NETDEV=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_BUFSIZE=128
CONFIG_IOB_NBUFFERS=32
@@ -122,6 +123,5 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING6=y
CONFIG_SYSTEM_TELNET_CLIENT=y
CONFIG_UART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WIRELESS=y
CONFIG_WIRELESS_IEEE802154=y
diff --git a/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig b/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig
index 6a32f32..ab4fc06 100644
--- a/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig
@@ -41,6 +41,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_IOB_NBUFFERS=24
CONFIG_LIBC_HOSTNAME="SAME70-Xplained"
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -105,4 +106,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/same70-xplained/configs/nsh/defconfig b/boards/arm/samv7/same70-xplained/configs/nsh/defconfig
index d4398b2..a2596f9 100644
--- a/boards/arm/samv7/same70-xplained/configs/nsh/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/nsh/defconfig
@@ -41,6 +41,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y
CONFIG_MTD=y
@@ -77,4 +78,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig
index 1a232b2..095e98f 100644
--- a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig
@@ -42,6 +42,7 @@ CONFIG_GRAPHICS_TWM4NX=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_I2C_DRIVER=y
+CONFIG_INIT_ENTRYPOINT="twm4nx_main"
CONFIG_IOB_NBUFFERS=24
CONFIG_LIBC_HOSTNAME="SAME70-Xplained"
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -116,7 +117,6 @@ CONFIG_START_YEAR=2019
CONFIG_SYSTEM_PING=y
CONFIG_TWM4NX_ARCHINIT=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="twm4nx_main"
CONFIG_VNCSERVER=y
CONFIG_VNCSERVER_COLORFMT_RGB8=y
CONFIG_VNCSERVER_PRIO=120
diff --git a/boards/arm/samv7/same70-xplained/kernel/Makefile b/boards/arm/samv7/same70-xplained/kernel/Makefile
index e0b6632..f53dc64 100644
--- a/boards/arm/samv7/same70-xplained/kernel/Makefile
+++ b/boards/arm/samv7/same70-xplained/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
index 1a58a1f..b669eb5 100644
--- a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
+++ b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt
index 891c46e..7fd9ce8 100644
--- a/boards/arm/samv7/samv71-xult/README.txt
+++ b/boards/arm/samv7/samv71-xult/README.txt
@@ -2087,7 +2087,7 @@ Configuration sub-directories
CONFIG_SCHED_HPWORKSTACKSIZE=2048
CONFIG_IDLETHREAD_STACKSIZE=1024
- CONFIG_USERMAIN_STACKSIZE=2048
+ CONFIG_INIT_STACKSIZE=2048
CONFIG_PTHREAD_STACK_MIN=256
CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
@@ -2200,7 +2200,7 @@ Configuration sub-directories
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_IDLETHREAD_STACKSIZE=1024
- CONFIG_USERMAIN_STACKSIZE=2048
+ CONFIG_INIT_STACKSIZE=2048
CONFIG_PTHREAD_STACK_DEFAULT=2048
... and others ...
@@ -2586,7 +2586,7 @@ Configuration sub-directories
CONFIG_MCUBOOT_BOOTLOADER=y
CONFIG_SAMV7_FORMAT_MCUBOOT=y
- CONFIG_USER_ENTRYPOINT="mcuboot_loader_main"
+ CONFIG_INIT_ENTRYPOINT="mcuboot_loader_main"
Flash bootloader using embedded debugger:
openocd -f interface/cmsis-dap.cfg \
@@ -2651,4 +2651,4 @@ Configuration sub-directories
CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_SAMV7_FORMAT_MCUBOOT=y
- CONFIG_USER_ENTRYPOINT="nsh_main"
+ CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/knsh/defconfig b/boards/arm/samv7/samv71-xult/configs/knsh/defconfig
index 3853923..f457d2b 100644
--- a/boards/arm/samv7/samv71-xult/configs/knsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/knsh/defconfig
@@ -42,6 +42,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y
@@ -83,4 +84,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_SYS_RESERVED=9
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig b/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig
index a668ad8..e19398b 100644
--- a/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig
@@ -31,6 +31,7 @@ CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="mcuboot_loader_main"
CONFIG_MCUBOOT_BOOTLOADER=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -59,4 +60,3 @@ CONFIG_START_YEAR=2014
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="mcuboot_loader_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig b/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig
index eff9b0d..21b75b8 100644
--- a/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig
@@ -31,6 +31,7 @@ CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -60,4 +61,3 @@ CONFIG_START_YEAR=2014
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/module/defconfig b/boards/arm/samv7/samv71-xult/configs/module/defconfig
index 062164c..e246013 100644
--- a/boards/arm/samv7/samv71-xult/configs/module/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/module/defconfig
@@ -38,6 +38,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MODULE=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -65,4 +66,3 @@ CONFIG_START_YEAR=2014
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
index fe5eaf3..15e7567 100644
--- a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
@@ -48,6 +48,7 @@ CONFIG_IEEE802154_MAC=y
CONFIG_IEEE802154_MACDEV=y
CONFIG_IEEE802154_MRF24J40=y
CONFIG_IEEE802154_NETDEV=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_BUFSIZE=128
CONFIG_IOB_NBUFFERS=32
@@ -129,6 +130,5 @@ CONFIG_START_MONTH=7
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING6=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WIRELESS=y
CONFIG_WIRELESS_IEEE802154=y
diff --git a/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig b/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig
index ef651b4..cd22ac4 100644
--- a/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig
@@ -45,6 +45,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_MXT=y
CONFIG_LCD=y
@@ -88,4 +89,3 @@ CONFIG_START_YEAR=2014
CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig b/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig
index 9436164..9436501 100644
--- a/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig
@@ -42,6 +42,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LIBC_HOSTNAME="SAMV71-XULT"
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y
@@ -105,4 +106,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/nsh/defconfig b/boards/arm/samv7/samv71-xult/configs/nsh/defconfig
index b9fd9fd..67f4f5c 100644
--- a/boards/arm/samv7/samv71-xult/configs/nsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/nsh/defconfig
@@ -42,6 +42,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2CTOOL_MAXBUS=0
CONFIG_I2C_RESET=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y
CONFIG_MTD=y
@@ -80,4 +81,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_RAMTEST=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig b/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig
index a471e49..943746f 100644
--- a/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig
@@ -45,6 +45,8 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
+CONFIG_INIT_STACKSIZE=1526
CONFIG_INPUT=y
CONFIG_INPUT_MXT=y
CONFIG_LCD=y
@@ -124,5 +126,3 @@ CONFIG_START_MONTH=3
CONFIG_START_YEAR=2014
CONFIG_SYSTEM_I2CTOOL=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1526
-CONFIG_USER_ENTRYPOINT="nxwm_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/vnc/defconfig b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig
index 51b4128..ccd4d52 100644
--- a/boards/arm/samv7/samv71-xult/configs/vnc/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig
@@ -46,6 +46,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2C_DRIVER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_IOB_NBUFFERS=72
CONFIG_IOB_THROTTLE=32
CONFIG_LIBC_HOSTNAME="SAMV71-XULT"
@@ -113,6 +114,5 @@ CONFIG_START_YEAR=2014
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VNCSERVER=y
CONFIG_VNCSERVER_COLORFMT_RGB8=y
diff --git a/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
index b5daa79..0966303 100644
--- a/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
@@ -46,6 +46,8 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2C_DRIVER=y
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
+CONFIG_INIT_STACKSIZE=1526
CONFIG_IOB_NBUFFERS=72
CONFIG_IOB_THROTTLE=32
CONFIG_LIBC_FLOATINGPOINT=y
@@ -144,7 +146,5 @@ CONFIG_START_MONTH=3
CONFIG_START_YEAR=2014
CONFIG_SYSTEM_PING=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1526
-CONFIG_USER_ENTRYPOINT="nxwm_main"
CONFIG_VNCSERVER=y
CONFIG_VNCSERVER_COLORFMT_RGB8=y
diff --git a/boards/arm/samv7/samv71-xult/kernel/Makefile b/boards/arm/samv7/samv71-xult/kernel/Makefile
index 721e861..78798d5 100644
--- a/boards/arm/samv7/samv71-xult/kernel/Makefile
+++ b/boards/arm/samv7/samv71-xult/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
index f0b8fc2..191e0d1 100644
--- a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
+++ b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/stm32/axoloti/configs/nsh/defconfig b/boards/arm/stm32/axoloti/configs/nsh/defconfig
index 212f0fc..56c0633 100644
--- a/boards/arm/stm32/axoloti/configs/nsh/defconfig
+++ b/boards/arm/stm32/axoloti/configs/nsh/defconfig
@@ -19,6 +19,7 @@ CONFIG_ARCH_CHIP_STM32F427I=y
CONFIG_ARCH_IRQBUTTONS=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_CLOCK_MONOTONIC=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -38,4 +39,3 @@ CONFIG_USART6_RXBUFSIZE=128
CONFIG_USART6_TXBUFSIZE=32
CONFIG_USERLED=y
CONFIG_USERLED_LOWER=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/b-g431b-esc1/configs/foc_b16/defconfig b/boards/arm/stm32/b-g431b-esc1/configs/foc_b16/defconfig
index ad976a7..028ee08 100644
--- a/boards/arm/stm32/b-g431b-esc1/configs/foc_b16/defconfig
+++ b/boards/arm/stm32/b-g431b-esc1/configs/foc_b16/defconfig
@@ -44,6 +44,7 @@ CONFIG_EXAMPLES_FOC_VBUS_ADC=y
CONFIG_EXAMPLES_FOC_VBUS_SCALE=10400
CONFIG_INDUSTRY_FOC=y
CONFIG_INDUSTRY_FOC_FIXED16=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -85,4 +86,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXDMA=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/b-g431b-esc1/configs/foc_f32/defconfig b/boards/arm/stm32/b-g431b-esc1/configs/foc_f32/defconfig
index 12a679f..ffeb336 100644
--- a/boards/arm/stm32/b-g431b-esc1/configs/foc_f32/defconfig
+++ b/boards/arm/stm32/b-g431b-esc1/configs/foc_f32/defconfig
@@ -44,6 +44,7 @@ CONFIG_EXAMPLES_FOC_VBUS_ADC=y
CONFIG_EXAMPLES_FOC_VBUS_SCALE=10400
CONFIG_INDUSTRY_FOC=y
CONFIG_INDUSTRY_FOC_FLOAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -86,4 +87,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXDMA=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/b-g431b-esc1/configs/nsh/defconfig b/boards/arm/stm32/b-g431b-esc1/configs/nsh/defconfig
index 2bcb8c9..b22d95b 100644
--- a/boards/arm/stm32/b-g431b-esc1/configs/nsh/defconfig
+++ b/boards/arm/stm32/b-g431b-esc1/configs/nsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_BOARD_LOOPSPERMSEC=8499
CONFIG_BUILTIN=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -46,4 +47,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_STACKSIZE=1024
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/b-g474e-dpow1/configs/nsh/defconfig b/boards/arm/stm32/b-g474e-dpow1/configs/nsh/defconfig
index 45ddf99..1879640 100644
--- a/boards/arm/stm32/b-g474e-dpow1/configs/nsh/defconfig
+++ b/boards/arm/stm32/b-g474e-dpow1/configs/nsh/defconfig
@@ -22,6 +22,7 @@ CONFIG_ARMV7M_LIBM=y
CONFIG_ARMV7M_MEMCPY=y
CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_SYMBOLS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBM=y
CONFIG_NSH_ARCHINIT=y
@@ -40,4 +41,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USERLED=y
CONFIG_USERLED_LOWER=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig
index c972552..9a6c3d8 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig
@@ -22,6 +22,7 @@ CONFIG_BUILD_PROTECTED=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_DISABLE_DD=y
CONFIG_NSH_DISABLE_GET=y
@@ -54,4 +55,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYS_RESERVED=9
CONFIG_TASK_NAME_SIZE=32
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
index c5e07ef..d43a609 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
@@ -55,6 +55,7 @@ CONFIG_IEEE802154_MAC=y
CONFIG_IEEE802154_MACDEV=y
CONFIG_IEEE802154_MRF24J40=y
CONFIG_IEEE802154_NETDEV=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_BUFSIZE=128
CONFIG_IOB_NBUFFERS=32
@@ -111,6 +112,5 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_TELNET_CLIENT=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WIRELESS=y
CONFIG_WIRELESS_IEEE802154=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig
index 74ab61b..5f0028f 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig
@@ -27,6 +27,7 @@ CONFIG_IEEE802154_I8SAK=y
CONFIG_IEEE802154_MAC=y
CONFIG_IEEE802154_MACDEV=y
CONFIG_IEEE802154_MRF24J40=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -58,6 +59,5 @@ CONFIG_STM32_USART3=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WIRELESS=y
CONFIG_WIRELESS_IEEE802154=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig
index 491b03f..fdd407d 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig
@@ -38,6 +38,7 @@ CONFIG_IEEE802154_MAC=y
CONFIG_IEEE802154_MACDEV=y
CONFIG_IEEE802154_MRF24J40=y
CONFIG_IEEE802154_NETDEV=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_BUFSIZE=128
CONFIG_IOB_NBUFFERS=32
@@ -96,6 +97,5 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_TELNET_CLIENT=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WIRELESS=y
CONFIG_WIRELESS_IEEE802154=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
index f0ed7be..226a6f9 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
@@ -55,6 +55,7 @@ CONFIG_IEEE802154_MAC=y
CONFIG_IEEE802154_MACDEV=y
CONFIG_IEEE802154_MRF24J40=y
CONFIG_IEEE802154_NETDEV=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_BUFSIZE=128
CONFIG_IOB_NBUFFERS=32
@@ -112,6 +113,5 @@ CONFIG_STM32_PWR=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WIRELESS=y
CONFIG_WIRELESS_IEEE802154=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig
index 98afb73..a66845a 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BUILTIN=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_DISABLE_GET=y
@@ -48,4 +49,3 @@ CONFIG_STM32_USART3=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig
index 3664b54..08d03c0 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig
@@ -29,6 +29,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -63,4 +64,3 @@ CONFIG_SYSLOG_INTBUFSIZE=396
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig
index ebd4eac..5c21a85 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig
@@ -53,6 +53,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IEEE802154_I8SAK=y
CONFIG_IEEE802154_XBEE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_BUFSIZE=128
CONFIG_IOB_NBUFFERS=32
@@ -107,6 +108,5 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_TELNET_CLIENT=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WIRELESS=y
CONFIG_WIRELESS_IEEE802154=y
diff --git a/boards/arm/stm32/clicker2-stm32/kernel/Makefile b/boards/arm/stm32/clicker2-stm32/kernel/Makefile
index ef7dcf7..ce076e8 100644
--- a/boards/arm/stm32/clicker2-stm32/kernel/Makefile
+++ b/boards/arm/stm32/clicker2-stm32/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c b/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c
index 59a268d..6e57179 100644
--- a/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c
@@ -73,13 +73,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/stm32/cloudctrl/configs/nsh/defconfig b/boards/arm/stm32/cloudctrl/configs/nsh/defconfig
index a1c4267..f885bde 100644
--- a/boards/arm/stm32/cloudctrl/configs/nsh/defconfig
+++ b/boards/arm/stm32/cloudctrl/configs/nsh/defconfig
@@ -23,6 +23,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_HAVE_CXX=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_SPICLOCK=12500000
@@ -79,4 +80,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/emw3162/configs/nsh/defconfig b/boards/arm/stm32/emw3162/configs/nsh/defconfig
index 7adefa0..f5d2457 100644
--- a/boards/arm/stm32/emw3162/configs/nsh/defconfig
+++ b/boards/arm/stm32/emw3162/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BUILTIN=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -41,4 +42,3 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
CONFIG_STM32_USART1=y
CONFIG_SYSTEM_NSH=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/emw3162/configs/wlan/defconfig b/boards/arm/stm32/emw3162/configs/wlan/defconfig
index f636177..b075e0e 100644
--- a/boards/arm/stm32/emw3162/configs/wlan/defconfig
+++ b/boards/arm/stm32/emw3162/configs/wlan/defconfig
@@ -29,6 +29,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IEEE80211_BROADCOM_BCM43362=y
CONFIG_IEEE80211_BROADCOM_DMABUF_ALIGNMENT=16
CONFIG_IEEE80211_BROADCOM_FULLMAC_SDIO=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBM=y
CONFIG_MMCSD=y
@@ -82,6 +83,5 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WIRELESS_WAPI=y
CONFIG_WIRELESS_WAPI_CMDTOOL=y
diff --git a/boards/arm/stm32/et-stm32-stamp/configs/nsh/defconfig b/boards/arm/stm32/et-stm32-stamp/configs/nsh/defconfig
index 4976777..fa49339 100644
--- a/boards/arm/stm32/et-stm32-stamp/configs/nsh/defconfig
+++ b/boards/arm/stm32/et-stm32-stamp/configs/nsh/defconfig
@@ -15,6 +15,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LIBC_RAND_ORDER=2
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -33,4 +34,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig b/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig
index a3e2a2a..1f03150 100644
--- a/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig
+++ b/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig
@@ -29,6 +29,7 @@ CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MAXBUS=2
CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
@@ -88,4 +89,3 @@ CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig b/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig
index 04fbb89..b5c4511 100644
--- a/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig
+++ b/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig
@@ -20,6 +20,7 @@ CONFIG_BINFMT_DISABLE=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_FAT_LCNAMES=y
CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
CONFIG_NSH_ARCHINIT=y
@@ -46,4 +47,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig b/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig
index 13ce4e7..c0f5f80 100644
--- a/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig
+++ b/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig
@@ -35,6 +35,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_FATTIME=y
CONFIG_FS_ROMFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_ADS7843E=y
CONFIG_LCD=y
@@ -88,4 +89,3 @@ CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig
index 1915bf5..ebf80d9 100644
--- a/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig
+++ b/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig
@@ -16,6 +16,7 @@ CONFIG_ARCH_CHIP_STM32F103VC=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARDCTL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
+CONFIG_INIT_ENTRYPOINT="msconn_main"
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
CONFIG_PREALLOC_TIMERS=4
@@ -49,4 +50,3 @@ CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USER_ENTRYPOINT="msconn_main"
diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig
index 5877a97..9ead96c 100644
--- a/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig
@@ -23,6 +23,7 @@ CONFIG_CDCACM=y
CONFIG_CDCACM_CONSOLE=y
CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_READLINE=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=49152
@@ -46,4 +47,3 @@ CONFIG_SYSLOG_CHAR=y
CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig
index df5c24d..2ecac3f 100644
--- a/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig
+++ b/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig
@@ -16,6 +16,7 @@ CONFIG_BOARDCTL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXAMPLES_USBSERIAL=y
+CONFIG_INIT_ENTRYPOINT="usbserial_main"
CONFIG_PL2303=y
CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
CONFIG_PL2303_RXBUFSIZE=512
@@ -34,4 +35,3 @@ CONFIG_STM32_USART2=y
CONFIG_STM32_USB=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="usbserial_main"
diff --git a/boards/arm/stm32/maple/configs/nsh/defconfig b/boards/arm/stm32/maple/configs/nsh/defconfig
index 28170d2..ac25802 100644
--- a/boards/arm/stm32/maple/configs/nsh/defconfig
+++ b/boards/arm/stm32/maple/configs/nsh/defconfig
@@ -31,6 +31,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LIBC_RAND_ORDER=2
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -53,4 +54,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USBDEV_TRACE=y
CONFIG_USBDEV_TRACE_NRECORDS=32
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/maple/configs/nx/defconfig b/boards/arm/stm32/maple/configs/nx/defconfig
index 43f9654..802b9bc 100644
--- a/boards/arm/stm32/maple/configs/nx/defconfig
+++ b/boards/arm/stm32/maple/configs/nx/defconfig
@@ -42,6 +42,7 @@ CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_EXAMPLES_NX_BPP=1
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LCD=y
CONFIG_LCD_SHARP_MEMLCD=y
CONFIG_LIBC_RAND_ORDER=2
@@ -77,4 +78,3 @@ CONFIG_TASK_NAME_SIZE=15
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USBDEV_TRACE=y
CONFIG_USBDEV_TRACE_NRECORDS=32
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/maple/configs/usbnsh/defconfig b/boards/arm/stm32/maple/configs/usbnsh/defconfig
index 9bc1f64..236360c 100644
--- a/boards/arm/stm32/maple/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/maple/configs/usbnsh/defconfig
@@ -37,6 +37,7 @@ CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DEFAULT_SMALL=y
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LIBC_RAND_ORDER=2
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -60,4 +61,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USBDEV_TRACE=y
CONFIG_USBDEV_TRACE_NRECORDS=32
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
index 9375774..acc70de 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
@@ -46,6 +46,7 @@ CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
CONFIG_INPUT=y
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
@@ -140,4 +141,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NXPLAYER=y
CONFIG_TASK_NAME_SIZE=11
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nxwm_main"
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig
index ef14ece..b7e67d4 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig
@@ -33,6 +33,7 @@ CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="ostest_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
@@ -85,4 +86,3 @@ CONFIG_SYS_RESERVED=9
CONFIG_TASK_NAME_SIZE=11
CONFIG_TESTING_OSTEST=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="ostest_main"
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig
index 3b58971..e3e6752 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig
@@ -28,6 +28,7 @@ CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
@@ -69,4 +70,3 @@ CONFIG_SYSTEM_FLASH_ERASEALL=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig
index 880ef9c..03604a5 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig
@@ -29,6 +29,7 @@ CONFIG_EXAMPLES_NX_BPP=16
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nx_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_MIO283QT2=y
@@ -65,4 +66,3 @@ CONFIG_STM32_PWR=y
CONFIG_SYSLOG_CHAR=y
CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nx_main"
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig
index df19c1d..aa2a4fd 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig
@@ -35,6 +35,7 @@ CONFIG_EXAMPLES_NXLINES_LINECOLOR=0x861F
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nxlines_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_MIO283QT2=y
@@ -69,4 +70,3 @@ CONFIG_STM32_PWR=y
CONFIG_SYSLOG_CHAR=y
CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nxlines_main"
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig
index 5d2725e..368a714 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig
@@ -30,6 +30,7 @@ CONFIG_EXAMPLES_NXTEXT_BPP=16
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nxtext_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_MIO283QT2=y
@@ -63,4 +64,3 @@ CONFIG_STM32_PWR=y
CONFIG_SYSLOG_CHAR=y
CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nxtext_main"
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig
index f7c687d..350737e 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig
@@ -32,6 +32,7 @@ CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
@@ -74,4 +75,3 @@ CONFIG_SYSTEM_FLASH_ERASEALL=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/mikroe-stm32f4/kernel/Makefile b/boards/arm/stm32/mikroe-stm32f4/kernel/Makefile
index 56e6186..19e2d0c 100644
--- a/boards/arm/stm32/mikroe-stm32f4/kernel/Makefile
+++ b/boards/arm/stm32/mikroe-stm32f4/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
index 10388bc..19aa606 100644
--- a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig
index bc2ba8a..1563968 100644
--- a/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig
@@ -22,6 +22,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_GROUPSIZE=3
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -53,4 +54,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f103rb/configs/ihm07m1_b16/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/ihm07m1_b16/defconfig
index aedde80..d85c5ff 100644
--- a/boards/arm/stm32/nucleo-f103rb/configs/ihm07m1_b16/defconfig
+++ b/boards/arm/stm32/nucleo-f103rb/configs/ihm07m1_b16/defconfig
@@ -45,6 +45,7 @@ CONFIG_EXAMPLES_FOC_VBUS_ADC=y
CONFIG_EXAMPLES_FOC_VBUS_SCALE=19152
CONFIG_INDUSTRY_FOC=y
CONFIG_INDUSTRY_FOC_FIXED16=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -83,4 +84,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXDMA=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig
index 58e6787..6bbbdc6 100644
--- a/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig
@@ -17,6 +17,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -41,4 +42,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig
index 745e4a2..1ccf5ad 100644
--- a/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig
+++ b/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig
@@ -18,6 +18,7 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_PWM=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -47,4 +48,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f103rb/configs/qenco/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/qenco/defconfig
index b848959..a652eee 100644
--- a/boards/arm/stm32/nucleo-f103rb/configs/qenco/defconfig
+++ b/boards/arm/stm32/nucleo-f103rb/configs/qenco/defconfig
@@ -20,6 +20,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_QENCODER=y
CONFIG_EXAMPLES_QENCODER_HAVE_MAXPOS=y
CONFIG_EXAMPLES_QENCODER_MAXPOS=8192
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -52,4 +53,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig
index eaa303d..746e8e3 100644
--- a/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig
@@ -22,6 +22,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_GROUPSIZE=3
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -46,4 +47,3 @@ CONFIG_STM32_USART3=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig
index 2ddb9e0..5163fe8 100644
--- a/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig
@@ -18,6 +18,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_BUILTIN_APPS=y
@@ -35,4 +36,3 @@ CONFIG_STM32_USART3=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig
index 4d9b647..4ae0db4 100644
--- a/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig
+++ b/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig
@@ -18,6 +18,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_EXAMPLES_PWM=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -40,4 +41,3 @@ CONFIG_STM32_USART3=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig
index 50a05fe..f7f4ece 100644
--- a/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig
+++ b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig
@@ -24,6 +24,8 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_FDCLONE_STDIO=y
+CONFIG_INIT_ENTRYPOINT="highpri_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBM=y
@@ -60,5 +62,3 @@ CONFIG_SYSTEM_READLINE=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="highpri_main"
diff --git a/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_b16/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_b16/defconfig
index 9a78664..07fe5b7 100644
--- a/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_b16/defconfig
+++ b/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_b16/defconfig
@@ -46,6 +46,7 @@ CONFIG_EXAMPLES_FOC_VBUS_ADC=y
CONFIG_EXAMPLES_FOC_VBUS_SCALE=19152
CONFIG_INDUSTRY_FOC=y
CONFIG_INDUSTRY_FOC_FIXED16=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -84,4 +85,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXDMA=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_f32/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_f32/defconfig
index dcd381b..bf6ac1f 100644
--- a/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_f32/defconfig
+++ b/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_f32/defconfig
@@ -46,6 +46,7 @@ CONFIG_EXAMPLES_FOC_VBUS_ADC=y
CONFIG_EXAMPLES_FOC_VBUS_SCALE=19152
CONFIG_INDUSTRY_FOC=y
CONFIG_INDUSTRY_FOC_FLOAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -84,4 +85,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXDMA=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig
index d020855..a3bd488 100644
--- a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig
@@ -26,6 +26,8 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FDCLONE_STDIO=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INTELHEX_BINARY=y
CONFIG_NAME_MAX=16
CONFIG_NSH_BUILTIN_APPS=y
@@ -86,5 +88,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig
index 5d68501..09df1f9 100644
--- a/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig
+++ b/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig
@@ -22,6 +22,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_EXAMPLES_QENCODER=y
CONFIG_EXAMPLES_QENCODER_HAVE_MAXPOS=y
CONFIG_EXAMPLES_QENCODER_MAXPOS=8192
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MQ_MAXMSGSIZE=5
CONFIG_NSH_ARCHINIT=y
@@ -48,4 +49,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig b/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig
index 352cd78..35faaa4 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig
@@ -22,6 +22,7 @@ CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_GROUPSIZE=3
CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -46,4 +47,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f303re/configs/can/defconfig b/boards/arm/stm32/nucleo-f303re/configs/can/defconfig
index fcccc9b..e878b64 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/can/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/can/defconfig
@@ -20,6 +20,7 @@ CONFIG_BOARDCTL=y
CONFIG_BOARD_LOOPSPERMSEC=6522
CONFIG_EXAMPLES_CAN=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="can_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_PREALLOC_TIMERS=4
@@ -34,4 +35,3 @@ CONFIG_START_YEAR=2013
CONFIG_STM32_CAN1=y
CONFIG_STM32_JTAG_SW_ENABLE=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="can_main"
diff --git a/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig b/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig
index ff141fe..aaa43cf 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig
@@ -18,6 +18,7 @@ CONFIG_BOARD_LOOPSPERMSEC=6522
CONFIG_DEBUG_SYMBOLS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="hello_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_PREALLOC_TIMERS=4
@@ -33,4 +34,3 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
CONFIG_STM32_USART2=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="hello_main"
diff --git a/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig
index 9b3b6f2..04155ac 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig
@@ -17,6 +17,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=6522
CONFIG_DEBUG_SYMBOLS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_PREALLOC_TIMERS=4
@@ -33,4 +34,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig b/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig
index 053635d..2c946e6 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig
@@ -22,6 +22,7 @@ CONFIG_BOARD_LOOPSPERMSEC=6522
CONFIG_CAN=y
CONFIG_EXAMPLES_NXLINES=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nxlines_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_SSD1351=y
@@ -45,4 +46,3 @@ CONFIG_START_YEAR=2013
CONFIG_STM32_JTAG_SW_ENABLE=y
CONFIG_STM32_SPI1=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nxlines_main"
diff --git a/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig
index c952d8a..4a8fa34 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig
@@ -18,6 +18,7 @@ CONFIG_BOARD_LOOPSPERMSEC=6522
CONFIG_BUILTIN=y
CONFIG_EXAMPLES_PWM=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -46,4 +47,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig b/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig
index b742456..3497778 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig
@@ -22,6 +22,7 @@ CONFIG_BOARD_LOOPSPERMSEC=6522
CONFIG_EXAMPLES_SERIALRX=y
CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="serialrx_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_PREALLOC_TIMERS=4
@@ -37,4 +38,3 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
CONFIG_STM32_UART4=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART4_BAUD=9600
-CONFIG_USER_ENTRYPOINT="serialrx_main"
diff --git a/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig
index e955449..664aa9f 100644
--- a/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig
@@ -24,6 +24,7 @@ CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_GROUPSIZE=3
CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -51,4 +52,3 @@ CONFIG_STM32_USART3=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig
index 13a2a14..6b88147 100644
--- a/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig
@@ -19,6 +19,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_BUILTIN_APPS=y
@@ -36,4 +37,3 @@ CONFIG_STM32_USART3=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig
index 51131d9..23d5744 100644
--- a/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig
+++ b/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig
@@ -24,6 +24,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=1
CONFIG_EXAMPLES_NXLINES_LINECOLOR=0xff
CONFIG_EXAMPLES_NXLINES_LINEWIDTH=1
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_MAXCONTRAST=255
@@ -50,4 +51,3 @@ CONFIG_STM32_USART3=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig
index f8c6d93..c64cee7 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig
@@ -28,6 +28,8 @@ CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_GROUPSIZE=3
CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_FDCLONE_STDIO=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INTELHEX_BINARY=y
CONFIG_NAME_MAX=16
CONFIG_NSH_ARCHINIT=y
@@ -96,5 +98,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig
index 99ecead..d2e64fe 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig
@@ -24,6 +24,8 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_FDCLONE_STDIO=y
+CONFIG_INIT_ENTRYPOINT="highpri_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBM=y
@@ -64,5 +66,3 @@ CONFIG_SYSTEM_READLINE=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="highpri_main"
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig
index 97b80da..ab54f07 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig
@@ -26,6 +26,8 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FDCLONE_STDIO=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INTELHEX_BINARY=y
CONFIG_NAME_MAX=16
CONFIG_NSH_BUILTIN_APPS=y
@@ -87,5 +89,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig
index 092b3ff..22a4894 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig
@@ -24,6 +24,8 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_FDCLONE_STDIO=y
+CONFIG_INIT_ENTRYPOINT="spwm_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBM=y
@@ -75,5 +77,3 @@ CONFIG_SYSTEM_READLINE=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="spwm_main"
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig
index 49f7e6f..78ce771 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig
@@ -26,6 +26,8 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_FDCLONE_STDIO=y
+CONFIG_INIT_ENTRYPOINT="spwm_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBM=y
@@ -66,5 +68,3 @@ CONFIG_SYSTEM_READLINE=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="spwm_main"
diff --git a/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig
index f375e66..3a8a72f 100644
--- a/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig
@@ -27,6 +27,7 @@ CONFIG_BUILTIN=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_HAVE_CXX=y
CONFIG_HEAP_COLORATION=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -57,4 +58,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USERLED=y
CONFIG_USERLED_LOWER=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig
index a3ad59c..cfb3510 100644
--- a/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig
@@ -32,6 +32,7 @@ CONFIG_CLOCK_MONOTONIC=y
CONFIG_DEBUG_HARDFAULT_ALERT=y
CONFIG_HAVE_CXX=y
CONFIG_I2C=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -60,4 +61,3 @@ CONFIG_TASK_NAME_SIZE=32
CONFIG_TIMER=y
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USEC_PER_TICK=1000
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig b/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig
index 2bbee30..eb65ca8 100644
--- a/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig
+++ b/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_TMPFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -77,4 +78,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig
index 9c17dff..fcc4d74 100644
--- a/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig
@@ -23,6 +23,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HEAP2_BASE=0xD0000000
CONFIG_HEAP2_SIZE=8388608
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=3
CONFIG_NSH_BUILTIN_APPS=y
@@ -49,4 +50,3 @@ CONFIG_STM32_PWR=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f446re/configs/adc/defconfig b/boards/arm/stm32/nucleo-f446re/configs/adc/defconfig
index 527504a..bc7d5d2 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/adc/defconfig
@@ -31,6 +31,7 @@ CONFIG_EXAMPLES_ADC_GROUPSIZE=2
CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -57,4 +58,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f446re/configs/can/defconfig b/boards/arm/stm32/nucleo-f446re/configs/can/defconfig
index e96098e..a1cac42 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/can/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/can/defconfig
@@ -29,6 +29,7 @@ CONFIG_EXAMPLES_CAN_NMSGS=100
CONFIG_EXAMPLES_CAN_WRITE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -56,4 +57,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TESTING_OSTEST=y
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f446re/configs/dac/defconfig b/boards/arm/stm32/nucleo-f446re/configs/dac/defconfig
index 2967087..e528054 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/dac/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/dac/defconfig
@@ -29,6 +29,7 @@ CONFIG_DAC=y
CONFIG_EXAMPLES_DAC=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -56,4 +57,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TESTING_OSTEST=y
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f446re/configs/gpio/defconfig b/boards/arm/stm32/nucleo-f446re/configs/gpio/defconfig
index 59aba72..60f63dd 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/gpio/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/gpio/defconfig
@@ -28,6 +28,7 @@ CONFIG_DEV_GPIO=y
CONFIG_EXAMPLES_GPIO=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -52,4 +53,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TESTING_OSTEST=y
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_b16/defconfig b/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_b16/defconfig
index 6b365b2..60b6aa6 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_b16/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_b16/defconfig
@@ -44,6 +44,7 @@ CONFIG_EXAMPLES_FOC_VBUS_ADC=y
CONFIG_EXAMPLES_FOC_VBUS_SCALE=19152
CONFIG_INDUSTRY_FOC=y
CONFIG_INDUSTRY_FOC_FIXED16=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -88,4 +89,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXDMA=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_f32/defconfig b/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_f32/defconfig
index d8c569a..1aca3ca 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_f32/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_f32/defconfig
@@ -44,6 +44,7 @@ CONFIG_EXAMPLES_FOC_VBUS_ADC=y
CONFIG_EXAMPLES_FOC_VBUS_SCALE=19152
CONFIG_INDUSTRY_FOC=y
CONFIG_INDUSTRY_FOC_FLOAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -88,4 +89,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXDMA=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f446re/configs/lcd/defconfig b/boards/arm/stm32/nucleo-f446re/configs/lcd/defconfig
index c3bdd6a..b6cf009 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/lcd/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/lcd/defconfig
@@ -28,6 +28,7 @@ CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_FB=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_FRAMEBUFFER=y
@@ -58,5 +59,4 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TESTING_OSTEST=y
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig
index 5907c0d..94942e8 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig
@@ -25,6 +25,7 @@ CONFIG_BOARD_LOOPSPERMSEC=8499
CONFIG_BUILTIN=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -50,4 +51,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TESTING_OSTEST=y
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f446re/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f446re/configs/pwm/defconfig
index 983d665..c236cbb 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/pwm/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/pwm/defconfig
@@ -28,6 +28,7 @@ CONFIG_EXAMPLES_PWM=y
CONFIG_EXAMPLES_PWM_DEVPATH="/dev/pwm2"
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -56,4 +57,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TESTING_OSTEST=y
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f446re/configs/qenco/defconfig b/boards/arm/stm32/nucleo-f446re/configs/qenco/defconfig
index a20d83c..8b3c34f 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/qenco/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/qenco/defconfig
@@ -21,6 +21,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_EXAMPLES_QENCODER=y
CONFIG_EXAMPLES_QENCODER_HAVE_MAXPOS=y
CONFIG_EXAMPLES_QENCODER_MAXPOS=8192
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MQ_MAXMSGSIZE=5
CONFIG_NSH_ARCHINIT=y
@@ -49,4 +50,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig
index 870eef7..0e11df9 100644
--- a/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_BOARD_LOOPSPERMSEC=8499
CONFIG_BUILTIN=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -47,4 +48,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig
index 1e673bf..f506d37 100644
--- a/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig
+++ b/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig
@@ -31,6 +31,7 @@ CONFIG_EXAMPLES_CAN=y
CONFIG_EXAMPLES_CAN_NMSGS=1
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MCP2515_PHASESEG1=3
CONFIG_MCP2515_PROPSEG=1
@@ -58,4 +59,3 @@ CONFIG_STM32_USART1=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig
index d7b38b2..9af4e8d 100644
--- a/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_BOARD_LOOPSPERMSEC=8499
CONFIG_BUILTIN=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -48,4 +49,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-g431kb/configs/comp/defconfig b/boards/arm/stm32/nucleo-g431kb/configs/comp/defconfig
index 7822e90..48fabf2 100644
--- a/boards/arm/stm32/nucleo-g431kb/configs/comp/defconfig
+++ b/boards/arm/stm32/nucleo-g431kb/configs/comp/defconfig
@@ -20,6 +20,7 @@ CONFIG_DAC=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_DAC=y
CONFIG_EXAMPLES_DAC_DEVPATH="/dev/dac5"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -46,4 +47,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-g431kb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-g431kb/configs/nsh/defconfig
index c82df4c..089cf16 100644
--- a/boards/arm/stm32/nucleo-g431kb/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-g431kb/configs/nsh/defconfig
@@ -23,6 +23,7 @@ CONFIG_BOARD_LOOPSPERMSEC=8499
CONFIG_BUILTIN=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -45,4 +46,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_STACKSIZE=1024
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-g431kb/configs/pwm/defconfig b/boards/arm/stm32/nucleo-g431kb/configs/pwm/defconfig
index c5f542c..592970b 100644
--- a/boards/arm/stm32/nucleo-g431kb/configs/pwm/defconfig
+++ b/boards/arm/stm32/nucleo-g431kb/configs/pwm/defconfig
@@ -16,6 +16,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_PWM=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -38,4 +39,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-g431rb/configs/adc/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/adc/defconfig
index aa3acc5..66da25a 100644
--- a/boards/arm/stm32/nucleo-g431rb/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-g431rb/configs/adc/defconfig
@@ -28,6 +28,8 @@ CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_GROUPSIZE=3
CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_FDCLONE_STDIO=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INTELHEX_BINARY=y
CONFIG_NAME_MAX=16
CONFIG_NSH_ARCHINIT=y
@@ -96,5 +98,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-g431rb/configs/cordic/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/cordic/defconfig
index 096e281..ea8b374 100644
--- a/boards/arm/stm32/nucleo-g431rb/configs/cordic/defconfig
+++ b/boards/arm/stm32/nucleo-g431rb/configs/cordic/defconfig
@@ -27,6 +27,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_EXAMPLES_CORDIC=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_MATH_CORDIC=y
@@ -51,4 +52,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_b16/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_b16/defconfig
index 77d88da..d97ea79 100644
--- a/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_b16/defconfig
+++ b/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_b16/defconfig
@@ -46,6 +46,7 @@ CONFIG_EXAMPLES_FOC_VBUS_ADC=y
CONFIG_EXAMPLES_FOC_VBUS_SCALE=16000
CONFIG_INDUSTRY_FOC=y
CONFIG_INDUSTRY_FOC_FIXED16=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -85,4 +86,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXDMA=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_f32/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_f32/defconfig
index f63b6fc..5f04f1a 100644
--- a/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_f32/defconfig
+++ b/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_f32/defconfig
@@ -46,6 +46,7 @@ CONFIG_EXAMPLES_FOC_VBUS_ADC=y
CONFIG_EXAMPLES_FOC_VBUS_SCALE=16000
CONFIG_INDUSTRY_FOC=y
CONFIG_INDUSTRY_FOC_FLOAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -85,4 +86,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXDMA=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig
index f8de54b..a7bbc24 100644
--- a/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_BOARD_LOOPSPERMSEC=8499
CONFIG_BUILTIN=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -46,4 +47,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_STACKSIZE=1024
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-g431rb/configs/pwm/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/pwm/defconfig
index b623eed..7861894 100644
--- a/boards/arm/stm32/nucleo-g431rb/configs/pwm/defconfig
+++ b/boards/arm/stm32/nucleo-g431rb/configs/pwm/defconfig
@@ -18,6 +18,7 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_PWM=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -60,4 +61,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-g431rb/configs/qenco/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/qenco/defconfig
index 7007208..308ae2b 100644
--- a/boards/arm/stm32/nucleo-g431rb/configs/qenco/defconfig
+++ b/boards/arm/stm32/nucleo-g431rb/configs/qenco/defconfig
@@ -27,6 +27,7 @@ CONFIG_EXAMPLES_QENCODER_HAVE_MAXPOS=y
CONFIG_EXAMPLES_QENCODER_MAXPOS=8192
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -57,4 +58,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TESTING_OSTEST=y
CONFIG_TESTING_OSTEST_STACKSIZE=1024
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig b/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig
index e74d718..fad3797 100644
--- a/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig
+++ b/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig
@@ -29,6 +29,8 @@ CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_EXTERNINIT=y
@@ -70,5 +72,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_TLS_NELEM=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig
index 02ed002..cf67e7b 100644
--- a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig
@@ -24,6 +24,8 @@ CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
CONFIG_EXAMPLES_HELLO=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_INTELHEX_BINARY=y
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
CONFIG_NSH_BUILTIN_APPS=y
@@ -53,5 +55,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_TLS_NELEM=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig
index bb61609..bc9ca95 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig
@@ -28,6 +28,7 @@ CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_BUILTIN_APPS=y
@@ -55,4 +56,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig
index 3745998..e76f935 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig
@@ -31,6 +31,7 @@ CONFIG_EXAMPLES_HELLOXX=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_BUILTIN_APPS=y
@@ -57,4 +58,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig
index d39cbb2..ae60a22 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig
@@ -26,6 +26,7 @@ CONFIG_EXAMPLES_DISCOVER_DRIPADDR=0xc0a80101
CONFIG_EXAMPLES_DISCOVER_NOMAC=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="discover_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -70,4 +71,3 @@ CONFIG_SYSTEM_PING=y
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="discover_main"
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig
index 1972c5a..c9ea277 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig
@@ -29,6 +29,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -56,4 +57,3 @@ CONFIG_SYSLOG_CHAR=y
CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
CONFIG_SYSTEM_NSH=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig
index 49ed4a1..d2c0204 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig
@@ -47,6 +47,7 @@ CONFIG_IEEE802154_MAC=y
CONFIG_IEEE802154_MACDEV=y
CONFIG_IEEE802154_MRF24J40=y
CONFIG_IEEE802154_NETDEV=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_BUFSIZE=128
CONFIG_IOB_NBUFFERS=32
@@ -106,6 +107,5 @@ CONFIG_SYSTEM_SYSTEM=y
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WIRELESS=y
CONFIG_WIRELESS_IEEE802154=y
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig
index bbe5e74..72ca553 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig
@@ -37,6 +37,7 @@ CONFIG_IEEE802154_I8SAK=y
CONFIG_IEEE802154_MAC=y
CONFIG_IEEE802154_MACDEV=y
CONFIG_IEEE802154_MRF24J40=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_BUILTIN_APPS=y
@@ -63,6 +64,5 @@ CONFIG_SYSTEM_NSH=y
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WIRELESS=y
CONFIG_WIRELESS_IEEE802154=y
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig
index 223ccd7..9eb9102 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig
@@ -22,6 +22,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_ETH0_PHY_LAN8720=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -75,4 +76,3 @@ CONFIG_SYSTEM_PING=y
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig
index 2e18a93..195c2c0 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_EXAMPLES_HELLOXX=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_BUILTIN_APPS=y
@@ -47,4 +48,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig
index 8b257ac..9b803d7 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig
@@ -28,6 +28,7 @@ CONFIG_EXAMPLES_TELNETD_IPADDR=0xc0a80185
CONFIG_EXAMPLES_TELNETD_NOMAC=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="telnetd_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -76,4 +77,3 @@ CONFIG_SYSTEM_PING=y
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="telnetd_main"
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig
index 9fa791e..00af810 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig
@@ -27,6 +27,7 @@ CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_BUILTIN_APPS=y
@@ -53,4 +54,3 @@ CONFIG_TIMER=y
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_TXBUFSIZE=128
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig
index 43169da..4d3346e 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig
@@ -28,6 +28,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -53,4 +54,3 @@ CONFIG_SYSLOG_CHAR=y
CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
CONFIG_SYSTEM_NSH=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig
index 49c5897..a68f13c 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig
@@ -24,6 +24,7 @@ CONFIG_EXAMPLES_WEBSERVER=y
CONFIG_EXAMPLES_WEBSERVER_DRIPADDR=0xc0a80101
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="webserver_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -72,4 +73,3 @@ CONFIG_SYSTEM_PING=y
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="webserver_main"
diff --git a/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig
index 40456fe..2531dff 100644
--- a/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig
@@ -34,6 +34,7 @@ CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_CAN=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_BUILTIN_APPS=y
@@ -66,4 +67,3 @@ CONFIG_STM32_USART3=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig
index 319cf8d..994cb34 100644
--- a/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig
@@ -25,6 +25,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_BUILTIN_APPS=y
@@ -48,4 +49,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig b/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig
index 7797176..a189fd6 100644
--- a/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig
+++ b/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig
@@ -23,6 +23,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_BUILTIN_APPS=y
@@ -47,4 +48,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART6_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig
index f38bd8c..7a94570 100644
--- a/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig
@@ -22,6 +22,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_CAN=y
CONFIG_ETH0_PHY_KS8721=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MTD=y
@@ -66,4 +67,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig
index 09002e7..666e52c 100644
--- a/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig
@@ -28,6 +28,7 @@ CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_GROUPSIZE=1
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -81,4 +82,3 @@ CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USBHOST=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig
index 7fa3daa..aaa6be9 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig
@@ -29,6 +29,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_DISABLE_GET=y
@@ -67,4 +68,3 @@ CONFIG_SYSTEM_NXPLAYER=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig
index 4474938..27215d7 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig
@@ -27,6 +27,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -60,4 +61,3 @@ CONFIG_STM32_USART3=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig
index e82f3bc..854d637 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig
@@ -24,6 +24,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -55,4 +56,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USBHOST_HIDKBD=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig
index e245650..ea0b413 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig
@@ -31,6 +31,8 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_HAVE_CXX=y
+CONFIG_INIT_ENTRYPOINT="elf_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_ENVPATH=y
CONFIG_MM_KERNEL_HEAPSIZE=16384
@@ -59,5 +61,3 @@ CONFIG_SYS_RESERVED=9
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USBHOST_ISOC_DISABLE=y
CONFIG_USBHOST_MSC=y
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="elf_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig
index 772bd55..0484d7d 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig
@@ -29,6 +29,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="module_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_KERNEL_HEAPSIZE=16384
CONFIG_MM_REGIONS=2
@@ -55,4 +56,3 @@ CONFIG_SYS_RESERVED=9
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USBHOST_ISOC_DISABLE=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="module_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig
index 45cffc4..6d27bcc 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig
@@ -22,6 +22,7 @@ CONFIG_BUILD_PROTECTED=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_KERNEL_HEAPSIZE=16384
CONFIG_NSH_DISABLE_DD=y
@@ -54,4 +55,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYS_RESERVED=9
CONFIG_TASK_NAME_SIZE=32
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig
index 7839719..bd7ee25 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig
@@ -26,6 +26,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MODULE=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -48,4 +49,3 @@ CONFIG_STM32_PWR=y
CONFIG_STM32_USART3=y
CONFIG_SYSTEM_NSH=y
CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/mqttc/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/mqttc/defconfig
index 982d831..f32cbfe 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/mqttc/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/mqttc/defconfig
@@ -27,6 +27,7 @@ CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HTS221_DEBUG=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBM=y
CONFIG_NET=y
@@ -85,4 +86,3 @@ CONFIG_SYSTEM_PING=y
CONFIG_SYSTEM_TELNET_CLIENT=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USART6_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig
index 418d3f3..f81348f 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig
@@ -23,6 +23,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_DISABLE_GET=y
@@ -53,4 +54,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=32
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig
index 200a652..0b06481 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig
@@ -27,6 +27,7 @@ CONFIG_I2C=y
CONFIG_I2C_POLLED=y
CONFIG_I2C_RESET=y
CONFIG_I2S=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -71,4 +72,3 @@ CONFIG_USART3_RXBUFSIZE=512
CONFIG_USART6_SERIAL_CONSOLE=y
CONFIG_USBHOST_ISOC_DISABLE=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimex-stm32-p407/kernel/Makefile b/boards/arm/stm32/olimex-stm32-p407/kernel/Makefile
index 71cdc0a..8921834 100644
--- a/boards/arm/stm32/olimex-stm32-p407/kernel/Makefile
+++ b/boards/arm/stm32/olimex-stm32-p407/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c b/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c
index b76a68f..621784b 100644
--- a/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c
@@ -73,13 +73,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig
index 484a008..660b3c5 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig
@@ -51,6 +51,8 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_I2C=y
CONFIG_I2C_RESET=y
CONFIG_IDLETHREAD_STACKSIZE=300
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=880
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_SMALL=y
CONFIG_NAME_MAX=8
@@ -103,5 +105,3 @@ CONFIG_TLS_NELEM=0
CONFIG_USART1_RXBUFSIZE=32
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART1_TXBUFSIZE=32
-CONFIG_USERMAIN_STACKSIZE=880
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
index 2b6c620..a66c61f 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
@@ -69,6 +69,8 @@ CONFIG_FS_NAMED_SEMAPHORES=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=300
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=880
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MM_SMALL=y
@@ -137,6 +139,4 @@ CONFIG_USBMSC_NRDREQS=2
CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_SCSI_STACKSIZE=340
-CONFIG_USERMAIN_STACKSIZE=880
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WATCHDOG=y
diff --git a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig
index c339b0c..7c3c3da 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig
@@ -57,6 +57,8 @@ CONFIG_FS_NAMED_SEMAPHORES=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=300
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=880
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MM_SMALL=y
@@ -116,6 +118,4 @@ CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART1_TXBUFSIZE=32
CONFIG_USART2_RXBUFSIZE=32
CONFIG_USART2_TXBUFSIZE=32
-CONFIG_USERMAIN_STACKSIZE=880
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WATCHDOG=y
diff --git a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig
index afce25e..7226186 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig
@@ -34,6 +34,8 @@ CONFIG_FDCLONE_STDIO=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=300
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=880
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_SMALL=y
CONFIG_NAME_MAX=8
@@ -78,5 +80,3 @@ CONFIG_TLS_NELEM=0
CONFIG_USART1_RXBUFSIZE=32
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART1_TXBUFSIZE=32
-CONFIG_USERMAIN_STACKSIZE=880
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig
index bd95d70..736d325 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig
@@ -35,6 +35,8 @@ CONFIG_FDCLONE_STDIO=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=300
+CONFIG_INIT_ENTRYPOINT="can_main"
+CONFIG_INIT_STACKSIZE=880
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_SMALL=y
CONFIG_NAME_MAX=8
@@ -76,5 +78,3 @@ CONFIG_TLS_NELEM=0
CONFIG_USART1_RXBUFSIZE=32
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART1_TXBUFSIZE=32
-CONFIG_USERMAIN_STACKSIZE=880
-CONFIG_USER_ENTRYPOINT="can_main"
diff --git a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig
index 4c2892c..c56fcb0 100644
--- a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig
+++ b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig
@@ -47,6 +47,7 @@ CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_NCHAINS=8
@@ -126,6 +127,5 @@ CONFIG_USBDEV_DUALSPEED=y
CONFIG_USBDEV_MAXPOWER=500
CONFIG_USERLED=y
CONFIG_USERLED_LOWER=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_MAX7456=y
CONFIG_WQUEUE_NOTIFIER=y
diff --git a/boards/arm/stm32/omnibusf4/kernel/Makefile b/boards/arm/stm32/omnibusf4/kernel/Makefile
index b9d22c0..cec00ce 100644
--- a/boards/arm/stm32/omnibusf4/kernel/Makefile
+++ b/boards/arm/stm32/omnibusf4/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c b/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c
index 4174cf9..2577f6e 100644
--- a/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c
@@ -73,13 +73,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/stm32/photon/configs/adb/defconfig b/boards/arm/stm32/photon/configs/adb/defconfig
index b0d1074..dc59930 100644
--- a/boards/arm/stm32/photon/configs/adb/defconfig
+++ b/boards/arm/stm32/photon/configs/adb/defconfig
@@ -38,6 +38,8 @@ CONFIG_DEV_URANDOM=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="adbd_main"
+CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBUV=y
CONFIG_LIBUV_PIPE=y
@@ -75,5 +77,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USBADB=y
CONFIG_USBDEV=y
CONFIG_USBDEV_BUSPOWERED=y
-CONFIG_USERMAIN_STACKSIZE=3072
-CONFIG_USER_ENTRYPOINT="adbd_main"
diff --git a/boards/arm/stm32/photon/configs/nsh/defconfig b/boards/arm/stm32/photon/configs/nsh/defconfig
index 71562c4..1d3f741 100644
--- a/boards/arm/stm32/photon/configs/nsh/defconfig
+++ b/boards/arm/stm32/photon/configs/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_BUILTIN=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -46,4 +47,3 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
CONFIG_STM32_USART1=y
CONFIG_SYSTEM_NSH=y
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/photon/configs/rgbled/defconfig b/boards/arm/stm32/photon/configs/rgbled/defconfig
index 138c5a1..484d7ae 100644
--- a/boards/arm/stm32/photon/configs/rgbled/defconfig
+++ b/boards/arm/stm32/photon/configs/rgbled/defconfig
@@ -26,6 +26,7 @@ CONFIG_EXAMPLES_RGBLED=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -69,4 +70,3 @@ CONFIG_STM32_TIM2_PWM=y
CONFIG_STM32_USART1=y
CONFIG_SYSTEM_NSH=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/photon/configs/usbnsh/defconfig b/boards/arm/stm32/photon/configs/usbnsh/defconfig
index 674243f..ceba7b3 100644
--- a/boards/arm/stm32/photon/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/photon/configs/usbnsh/defconfig
@@ -24,6 +24,7 @@ CONFIG_CDCACM_CONSOLE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y
@@ -52,4 +53,3 @@ CONFIG_SYSLOG_CHAR=y
CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
CONFIG_SYSTEM_NSH=y
CONFIG_USBDEV=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/photon/configs/wlan/defconfig b/boards/arm/stm32/photon/configs/wlan/defconfig
index e061438..52fa83d 100644
--- a/boards/arm/stm32/photon/configs/wlan/defconfig
+++ b/boards/arm/stm32/photon/configs/wlan/defconfig
@@ -34,6 +34,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IEEE80211_BROADCOM_BCM43362=y
CONFIG_IEEE80211_BROADCOM_DMABUF_ALIGNMENT=16
CONFIG_IEEE80211_BROADCOM_FULLMAC_SDIO=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBM=y
CONFIG_MMCSD=y
@@ -87,6 +88,5 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_USERLED=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WIRELESS_WAPI=y
CONFIG_WIRELESS_WAPI_CMDTOOL=y
diff --git a/boards/arm/stm32/shenzhou/configs/nsh/defconfig b/boards/arm/stm32/shenzhou/configs/nsh/defconfig
index 8aabfe0..71ec586 100644
--- a/boards/arm/stm32/shenzhou/configs/nsh/defconfig
+++ b/boards/arm/stm32/shenzhou/configs/nsh/defconfig
@@ -22,6 +22,7 @@ CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_HAVE_CXX=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_SPICLOCK=12500000
@@ -77,4 +78,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/shenzhou/configs/nxwm/defconfig b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig
index daeea06..0fdd7df 100644
--- a/boards/arm/stm32/shenzhou/configs/nxwm/defconfig
+++ b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig
@@ -28,6 +28,8 @@ CONFIG_ETH0_PHY_DM9161=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INPUT=y
CONFIG_INPUT_ADS7843E=y
CONFIG_INTELHEX_BINARY=y
@@ -125,5 +127,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXBUFSIZE=128
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="nxwm_main"
diff --git a/boards/arm/stm32/shenzhou/configs/thttpd/defconfig b/boards/arm/stm32/shenzhou/configs/thttpd/defconfig
index cf26dce..15786b4 100644
--- a/boards/arm/stm32/shenzhou/configs/thttpd/defconfig
+++ b/boards/arm/stm32/shenzhou/configs/thttpd/defconfig
@@ -24,6 +24,7 @@ CONFIG_EXAMPLES_THTTPD_NOMAC=y
CONFIG_FS_NXFFS=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
+CONFIG_INIT_ENTRYPOINT="thttp_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MTD=y
CONFIG_MTD_W25=y
@@ -89,4 +90,3 @@ CONFIG_THTTPD_IPADDR=0xc0a80032
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART2_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="thttp_main"
diff --git a/boards/arm/stm32/stm3210e-eval/README.txt b/boards/arm/stm32/stm3210e-eval/README.txt
index 9fc66af..a0fbef3 100644
--- a/boards/arm/stm32/stm3210e-eval/README.txt
+++ b/boards/arm/stm32/stm3210e-eval/README.txt
@@ -638,7 +638,7 @@ Where <subdir> is one of the following:
Provide the new start-up entry point:
- CONFIG_USER_ENTRYPOINT="nxlines_main"
+ CONFIG_INIT_ENTRYPOINT="nxlines_main"
Disable apps/examples/nx:
@@ -670,7 +670,7 @@ Where <subdir> is one of the following:
Provide the new start-up entry point:
- CONFIG_USER_ENTRYPOINT="nxtext_main"
+ CONFIG_INIT_ENTRYPOINT="nxtext_main"
Disable apps/examples/nx:
diff --git a/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig b/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig
index e450d9b..d6373ca 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig
@@ -27,6 +27,7 @@ CONFIG_COMPOSITE_PRODUCTSTR="Composite Device"
CONFIG_COMPOSITE_SERIALSTR="12345"
CONFIG_COMPOSITE_VENDORID=0x03eb
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="conn_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
@@ -63,4 +64,3 @@ CONFIG_USBMSC_NRDREQS=2
CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USER_ENTRYPOINT="conn_main"
diff --git a/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig
index f35b884..cc9dac0 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_FAT_LCNAMES=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
@@ -51,4 +52,3 @@ CONFIG_STM32_USB=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig
index e861d41..230035f 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig
@@ -49,6 +49,7 @@ CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MAXBUS=2
CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD_MAXCONTRAST=1
CONFIG_LCD_NOGETRUN=y
@@ -107,4 +108,3 @@ CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig
index a9b2ad1..093ce70 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig
@@ -33,6 +33,7 @@ CONFIG_EXAMPLES_NX_FONTCOLOR=0x0000
CONFIG_EXAMPLES_NX_FONTID=0
CONFIG_EXAMPLES_NX_TBCOLOR=0xd69a
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nx_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD_MAXCONTRAST=1
CONFIG_LCD_NOGETRUN=y
@@ -70,4 +71,3 @@ CONFIG_STM32_USB=y
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nx_main"
diff --git a/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig
index 98e93a4..ec58eeb 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig
@@ -23,6 +23,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_EXAMPLES_NXTERM=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nxterm_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD_MAXCONTRAST=1
CONFIG_LCD_NOGETRUN=y
@@ -66,4 +67,3 @@ CONFIG_STM32_USART1=y
CONFIG_STM32_USART2=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nxterm_main"
diff --git a/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig b/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig
index 1b9ebac..6f3b211 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig
@@ -43,6 +43,7 @@ CONFIG_EXAMPLES_NX_FONTCOLOR=0x0000
CONFIG_EXAMPLES_NX_FONTID=0
CONFIG_EXAMPLES_NX_TBCOLOR=0xd69a
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD_MAXCONTRAST=100
CONFIG_LCD_MAXPOWER=100
@@ -93,4 +94,3 @@ CONFIG_STM32_USART2=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig b/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig
index 95f8c26..afdeb0a 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig
@@ -17,6 +17,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARDCTL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
+CONFIG_INIT_ENTRYPOINT="msconn_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
@@ -51,4 +52,3 @@ CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USER_ENTRYPOINT="msconn_main"
diff --git a/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig b/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig
index 3441b64..ffa4cd5 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig
@@ -18,6 +18,7 @@ CONFIG_BOARDCTL=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXAMPLES_USBSERIAL=y
+CONFIG_INIT_ENTRYPOINT="usbserial_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_PL2303=y
CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
@@ -39,4 +40,3 @@ CONFIG_STM32_USART2=y
CONFIG_STM32_USB=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="usbserial_main"
diff --git a/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig b/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig
index beca480..4cec942 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig
@@ -24,6 +24,7 @@ CONFIG_EXAMPLES_DHCPD_NOMAC=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="dhcpd_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -59,4 +60,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="dhcpd_main"
diff --git a/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig
index a4e3377..c14ba5f 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig
@@ -25,6 +25,7 @@ CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nettest_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NET=y
CONFIG_NETUTILS_NETLIB=y
@@ -58,4 +59,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nettest_main"
diff --git a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig
index 52322f1..7c125db 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig
@@ -26,6 +26,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_I2C=y
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -74,4 +75,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig
index 4e01147..34a1bdd 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig
@@ -31,6 +31,7 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -89,4 +90,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig
index 0dadc7c..f959eb3 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig
@@ -30,6 +30,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
CONFIG_INPUT=y
CONFIG_INPUT_STMPE811=y
CONFIG_INTELHEX_BINARY=y
@@ -125,4 +126,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nxwm_main"
diff --git a/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig
index 2226a5a..fed8fe7 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig
@@ -26,6 +26,7 @@ CONFIG_EXAMPLES_TELNETD_NOMAC=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="telnetd_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -60,4 +61,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="telnetd_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig b/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig
index 8f52487..98c4203 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig
@@ -25,6 +25,7 @@ CONFIG_EXAMPLES_DHCPD_NOMAC=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="dhcpd_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -60,4 +61,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="dhcpd_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig b/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig
index ce3483a..f8bd05b 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig
@@ -27,6 +27,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_I2C=y
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="discover_main"
CONFIG_MM_REGIONS=2
CONFIG_NET=y
CONFIG_NETDB_DNSCLIENT_ENTRIES=4
@@ -69,4 +70,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="discover_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig b/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig
index b98c997..d8c16ba 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig
@@ -28,6 +28,7 @@ CONFIG_HEAP2_SIZE=2097152
CONFIG_HOST_WINDOWS=y
CONFIG_I2C=y
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_FRAMEBUFFER=y
@@ -70,5 +71,4 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_VIDEO_FB=y
diff --git a/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig
index fb3ec1e..49cfd41 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig
@@ -31,6 +31,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
CONFIG_INPUT=y
CONFIG_INPUT_STMPE811=y
CONFIG_INTELHEX_BINARY=y
@@ -97,4 +98,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nxwm_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig
index becb46a..35050df 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig
@@ -26,6 +26,7 @@ CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="nettest_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -60,4 +61,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nettest_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig
index ba7a3bd..8a49221 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig
@@ -28,6 +28,7 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -81,4 +82,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig
index d152d25..e476abc 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig
@@ -32,6 +32,7 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
@@ -91,4 +92,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig
index e70f003..4c34ac6 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig
@@ -33,6 +33,7 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nxterm_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
CONFIG_LCD_MAXCONTRAST=1
@@ -103,4 +104,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nxterm_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig
index 62d728c..e1e54d4 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig
@@ -29,6 +29,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="nxwm_main"
CONFIG_INPUT=y
CONFIG_INPUT_STMPE811=y
CONFIG_INTELHEX_BINARY=y
@@ -122,4 +123,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="nxwm_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig
index d40c0c4..f041d0e 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig
@@ -27,6 +27,7 @@ CONFIG_EXAMPLES_TELNETD_NOMAC=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
+CONFIG_INIT_ENTRYPOINT="telnetd_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=2
CONFIG_NET=y
@@ -61,4 +62,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="telnetd_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig
index e1f6550..7d7aeb1 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig
@@ -28,6 +28,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_I2C=y
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="webserver_main"
CONFIG_MM_REGIONS=2
CONFIG_MTD=y
CONFIG_NET=y
@@ -76,4 +77,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USER_ENTRYPOINT="webserver_main"
diff --git a/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig b/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig
index baa7f4b..0926bb3 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig
@@ -26,6 +26,8 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_I2C=y
CONFIG_I2C_POLLED=y
+CONFIG_INIT_ENTRYPOINT="xmlrpc_main"
+CONFIG_INIT_STACKSIZE=4096
CONFIG_MM_REGIONS=2
CONFIG_NET=y
CONFIG_NETDB_DNSCLIENT_ENTRIES=4
@@ -68,5 +70,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART3_RXBUFSIZE=128
CONFIG_USART3_SERIAL_CONSOLE=y
CONFIG_USART3_TXBUFSIZE=128
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="xmlrpc_main"
diff --git a/boards/arm/stm32/stm3240g-eval/kernel/Makefile b/boards/arm/stm32/stm3240g-eval/kernel/Makefile
index 7d92f1b..2815c18 100644
--- a/boards/arm/stm32/stm3240g-eval/kernel/Makefile
+++ b/boards/arm/stm32/stm3240g-eval/kernel/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/Make.defs
# The entry point name (if none is provided in the .config file)
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
diff --git a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
index 0b2e5a9..016f7ce 100644
--- a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
@@ -72,13 +72,13 @@ extern uint32_t _ebss; /* End+1 of .bss */
/* This is the user space entry point */
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
const struct userspace_s userspace locate_data(".userspace") =
{
/* General memory map */
- .us_entrypoint = (main_t)CONFIG_USER_ENTRYPOINT,
+ .us_entrypoint = (main_t)CONFIG_INIT_ENTRYPOINT,
.us_textstart = (uintptr_t)&_stext,
.us_textend = (uintptr_t)&_etext,
.us_datasource = (uintptr_t)&_eronly,
diff --git a/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig b/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig
index 23adc7d..d989346 100644
--- a/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig
@@ -30,6 +30,7 @@ CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_EXAMPLES_NRF24L01TERM=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -54,5 +55,4 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WL_NRF24L01=y
diff --git a/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig b/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig
index d09adb3..82a3d13 100644
--- a/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig
@@ -34,6 +34,7 @@ CONFIG_CDCACM_CONSOLE=y
CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DEFAULT_SMALL=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
CONFIG_NSH_LINELEN=80
@@ -55,4 +56,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USBDEV_TRACE=y
CONFIG_USBDEV_TRACE_NRECORDS=32
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig
index 5210475..b1b1134 100644
--- a/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig
@@ -35,6 +35,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_STRERROR=y
CONFIG_LIBC_STRERROR_SHORT=y
@@ -72,4 +73,3 @@ CONFIG_SYSTEM_VI=y
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig
index 98ab44c..cfad31a 100644
--- a/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig
+++ b/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig
@@ -35,6 +35,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_HOSTNAME="butterfly2"
CONFIG_LIBC_STRERROR=y
@@ -92,4 +93,3 @@ CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USBDEV=y
CONFIG_USBDEV_BUSPOWERED=y
CONFIG_USBDEV_MAXPOWER=500
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig
index 5a2dc95..3b07e70 100644
--- a/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig
+++ b/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig
@@ -33,6 +33,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_STRERROR=y
CONFIG_LIBC_STRERROR_SHORT=y
@@ -71,4 +72,3 @@ CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USBDEV=y
CONFIG_USBDEV_BUSPOWERED=y
CONFIG_USBDEV_MAXPOWER=500
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig
index 5210475..b1b1134 100644
--- a/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig
+++ b/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig
@@ -35,6 +35,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_STRERROR=y
CONFIG_LIBC_STRERROR_SHORT=y
@@ -72,4 +73,3 @@ CONFIG_SYSTEM_VI=y
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USBHOST_HIDKBD=y
CONFIG_USBHOST_MSC=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/adb/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/adb/defconfig
index 224fa5d..a9c7917 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/adb/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/adb/defconfig
@@ -38,6 +38,8 @@ CONFIG_DEV_PIPE_SIZE=64
CONFIG_EXAMPLES_HELLO=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_EXCLUDE_MOUNTS=y
+CONFIG_INIT_ENTRYPOINT="adbd_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_LIBUV=y
CONFIG_LIBUV_PIPE=y
CONFIG_LIBUV_STREAM=y
@@ -69,5 +71,3 @@ CONFIG_TASK_NAME_SIZE=8
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USBADB=y
CONFIG_USBDEV_BUSPOWERED=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="adbd_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig
index 9c7f08c..3aeb4e6 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig
@@ -30,6 +30,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_APDS9960=y
CONFIG_I2C_DRIVER=y
CONFIG_IDLETHREAD_STACKSIZE=512
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -58,4 +59,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig
index 3a9d6bd..5f8bf71 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig
@@ -30,6 +30,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DRIVERS_AUDIO=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -60,4 +61,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig
index 82cac48..58d9600 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig
@@ -32,6 +32,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_BUTTONS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
@@ -58,4 +59,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig
index bd6e978..74cd41f 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig
@@ -28,6 +28,8 @@ CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FDCLONE_STDIO=y
+CONFIG_INIT_ENTRYPOINT="hello_main"
+CONFIG_INIT_STACKSIZE=1536
CONFIG_MM_SMALL=y
CONFIG_NSH_FILEIOSIZE=64
CONFIG_NSH_LINELEN=80
@@ -52,5 +54,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1536
-CONFIG_USER_ENTRYPOINT="hello_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig
index 03f4c70..085497a 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig
@@ -32,6 +32,7 @@ CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_EXAMPLES_NXHELLO_LISTENER_STACKSIZE=1536
CONFIG_EXAMPLES_NXHELLO_STACKSIZE=1536
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LCD=y
CONFIG_LCD_ST7567=y
CONFIG_MQ_MAXMSGSIZE=64
@@ -65,4 +66,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig
index 48d029f..6e165e6 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig
@@ -32,6 +32,7 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_DEFFREQ=100000
CONFIG_I2CTOOL_MAXBUS=1
CONFIG_I2CTOOL_MINBUS=1
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LCD_BACKPACK=y
CONFIG_LCD_LCD1602=y
CONFIG_NSH_ARCHINIT=y
@@ -60,4 +61,3 @@ CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig
index 6264a81..1ab3f00 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig
@@ -33,6 +33,7 @@ CONFIG_CAN_TXREADY=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_CAN=y
CONFIG_EXAMPLES_CAN_READ=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_MCP2515_PHASESEG1=3
CONFIG_MCP2515_PROPSEG=1
CONFIG_NSH_ARCHINIT=y
@@ -58,4 +59,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig
index 1c84464..1255e16 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig
@@ -29,6 +29,7 @@ CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_EXAMPLES_NRF24L01TERM=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -53,5 +54,4 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
CONFIG_WL_NRF24L01=y
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig
index aba45f1..a77cf5a 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig
@@ -26,6 +26,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -49,4 +50,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig
index 3e3d099..6f969ce 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig
@@ -28,6 +28,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_PWM=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -56,4 +57,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig
index b8d2121..3432eaf 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig
@@ -30,6 +30,7 @@ CONFIG_CL_MFRC522=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DRIVERS_CONTACTLESS=y
CONFIG_EXAMPLES_RFID_READUID=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -54,4 +55,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig
index 8fc27ab..90954af 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig
@@ -28,6 +28,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_RGBLED=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -68,4 +69,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/sensors/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/sensors/defconfig
index e4303dc..d3be8c2 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/sensors/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/sensors/defconfig
@@ -33,6 +33,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_I2C=y
CONFIG_I2C_DRIVER=y
CONFIG_I2C_RESET=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
@@ -65,4 +66,3 @@ CONFIG_STM32_USB=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TESTING_SENSORTEST=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig
index 8d537dd..2612a86 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig
@@ -34,6 +34,7 @@ CONFIG_CDCACM_CONSOLE=y
CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DEFAULT_SMALL=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
CONFIG_NSH_LINELEN=80
@@ -54,4 +55,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USBDEV_TRACE=y
CONFIG_USBDEV_TRACE_NRECORDS=32
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig
index 569e65f..8ced449 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig
@@ -30,6 +30,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_LEDS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -55,4 +56,3 @@ CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USERLED=y
CONFIG_USERLED_LOWER=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig
index da3c0c7..ab36c0a 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig
@@ -28,6 +28,7 @@ CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024
@@ -54,4 +55,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
index 969c009..6a3c85e 100644
--- a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
+++ b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
@@ -36,6 +36,8 @@ CONFIG_EXAMPLES_SMPS_OUT_VOLTAGE_DEFAULT=5000
CONFIG_EXAMPLES_SMPS_OUT_VOLTAGE_LIMIT=10000
CONFIG_EXAMPLES_SMPS_TIME_DEFAULT=10
CONFIG_FDCLONE_STDIO=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBDSP=y
@@ -131,5 +133,3 @@ CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512
CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig
index 8aaac1e..90a7a6f 100644
--- a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig
@@ -28,6 +28,8 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_FDCLONE_STDIO=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=1024
CONFIG_INTELHEX_BINARY=y
CONFIG_NAME_MAX=16
CONFIG_NSH_BUILTIN_APPS=y
... 7469 lines suppressed ...