diff --git a/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig index 3c84b6fe1b2..55a9c8a195e 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 34066c11359..74a7a971391 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 a212138d67c..b7ef3148abf 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 a23e5b621d3..7d97ff393fe 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 7ecb7f35c64..1919780547e 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 73f83f3fdd1..a3d70ae749c 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 53d64c4121a..747690f0220 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 9398284f618..7cc3be1c768 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 b38de68c9d8..0f9e011fc44 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 0f3e4b8baa2..b7af06237dc 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 c4c2b44f0b9..a53d5efacba 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 ceb2cf7c421..c69d038efbb 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 b69558f438c..55a4647ae42 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 bb5b5112c04..2aa4ac1609b 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 869fb998523..52d2b1bda7a 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 a2c13552f35..a1150892c77 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 f6bd4663d18..62154ca8f01 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 e5fc64c37ac..fd11507d17a 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 f08776eec60..6ab865b4b53 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 ad39da80bd1..07a260db054 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 a85e63ffd55..6bd38287a6a 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 66f67f9e57f..6261ba61efa 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 f65c77dbe70..1bfa9298624 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 3ea1bcc8dd8..b4e1b30aeac 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 e31f82995f2..b1a6d24e4fb 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 1af640f3663..c4284201092 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 03fb60e0534..470dd0caf72 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 a91531445dd..34450f3a5ea 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 76a7691ff0b..1656acf2ff3 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 aee56779a32..f3bd37bfbfb 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 7ebc5699aa0..9d5de9d8b03 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 f7a1fd00a08..30c1f12f37e 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 58a3e7e7501..dee5c6f3158 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 c1ff8491909..dd9c04546ab 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 64599e4c1a9..040961e0a5b 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 82e169e8fb7..c25835c0e53 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 1300349ff1c..7beac77f0ce 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 734d64e81cf..070d6a07d91 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 679336a4e09..5fdc392ad6c 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 20dac9640b6..5cbccd0c3ee 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 7020a31015a..b097013436b 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 440b38fe212..7ebc97369c7 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 7b26255ee5d..6d02ee160e6 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 ca47ea3e7e0..bd7ebbff09c 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 1eab4e9171f..49d457213d6 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 dcaa91cd3ab..67f4565c3cb 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 a7a2c10cdff..47d8e04a2d8 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 7fecacbf5f6..6d08850a31e 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 c316f3d17ae..6e24b899132 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 8c41c6e49b7..aae89b0a4ed 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 084da3c4a0a..cbd0928946f 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 a49d054ff79..12859b54331 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 0a4081eee94..50a3ad60bd0 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 b83b40f9b47..3b8a7ea718f 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 c98032b28cb..717f7e01a53 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 ace1258dc47..b8f0dc8f6ec 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 3a75ecc886f..081cd3078cd 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 a9f61192338..5930459e74b 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 c216a36d929..a089807a88b 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 f1f49268a48..fbfdd689c01 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 88c30e27793..73a3843e662 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 cb569686879..deb3c87bcfd 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 30cb640a477..c70b1900619 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 c82f3456391..48269bf4ee1 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 5d4bf2dd87d..30dcbd6630e 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 b0d2cfb599c..4b5d1cd18d4 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 a757489b071..411846bdcf9 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 898d977d6ce..142ebed0af5 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 6a417670ff6..930bdf62215 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 301e7d5fadf..0158b33b02b 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 87ae5e0ebfc..7c5cd67444c 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 de28f0bc4ce..f220608f0b9 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 451a8d31f54..b5ade9153de 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 7a620c9c1a3..3806ed62c94 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 001f98acfa2..d977e10a4bc 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 7b57dc5053b..bd8a1efcdb6 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 a9a9d535b1e..a7ce47816cb 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 b5a15a7b6c5..65342f223bf 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 9f76a8ace86..e0742bac984 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 0d36e163b4e..be10f8f74bd 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 9747245bbb8..98ab8784f3f 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 02abff2eb3d..64cb615c592 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 01ff5169203..f954067c943 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 011328652c4..6dda56510eb 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 8bc1036f593..a24c3dc318a 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 4e0ceba025a..13699fa19f1 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 c2b7be6e460..61412d4a1e7 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 fe3c64ce118..041fec9364c 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 6fece401b5d..9a587a65860 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 73c0f279947..e6301f7ad0f 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 d67dc722d17..88bb20af039 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 2a945a9009f..c210cb776c0 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 15692673e9f..7bc867ce2f6 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 5b531778226..e310332c1ab 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 8248bb58db2..df77c5dae1b 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 4e96a2132a8..6c4004b84ba 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 047ef89d51f..ca9cd07380c 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 0427de7d4af..52e4b9953cc 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 3a215069ca0..fecbd2a9c75 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 c0cd24bcd43..a42c7625b8e 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 defb7179714..8240b2c6c94 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 7ee4863434e..c8684584812 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 7a14d717e84..4946295bc55 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 4d23ea07782..a2cde26537e 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 6a7d5957f61..6a498ba8378 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 f9c45b3027d..9f8a081c529 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 922cd1b7a78..7ad92b5d09d 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 0dc47145680..15771d0886e 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 c082cae5d1b..14740a33977 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 a27e62dfaa5..703edbf3f9a 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 384fde4c8d6..b18cfabcb96 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 981a65f4a34..ed7aea7506a 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 1c2a9bb49a2..9b5e949469a 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 1794862f255..522d587fd75 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 7906130dd86..291ddcdfa7f 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 f27ff57bfd4..174059a618f 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 28826f10e97..7adccc8b6bf 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 a302099439c..477f62fcf45 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 e18acc2891d..2eb84449b23 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 b510a57c276..ff8e7781adb 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 60e07726716..02d69da8ae6 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 4f5babefe3f..6885a5c00ee 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 28c0e36113f..42acdef9bdd 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 eb204b158ca..0353b3910e0 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 6786061f92f..f1c46a37a68 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 d370aded3b7..c073fde0351 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 5ebf896c810..22b441e171a 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 d17c3d74c43..bb9bf114012 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 424588f6869..38fcb0ee9b9 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 34e4100bd99..80661f7668a 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 7518947a2e3..2e6263b7bf6 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 65657abb7f7..6e2710198bf 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 8b4b8a75364..f6dbe55b905 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 b899c92f8cd..44f9a4f01ff 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 4f76a60d76b..4a5e40ec6c3 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 36cc7bc95cd..cf5899f8f22 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 d2a546fba0a..ae7846248c6 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 a60fae3dc16..402d024ef51 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 d5cc527469e..5f501b8e902 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 378f9bd9582..15cfd13b170 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 f7cb77c958f..f3c5290a002 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 4b3e822ebd2..13a610b90b5 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 5dbbf29b032..6deb38e3bc0 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 855117cfe09..90533f04af1 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 6dd104845a3..a95121ecde6 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 540c9d82652..d7eb83c0526 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 74e05010060..e22a9972223 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 7938c37150a..6a59f7e3bf5 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 5ce255b41b9..5dfe3146e5d 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 f2710c4fddb..8b003c1b637 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 fc2210758f7..90596432396 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 420f629c680..4425b0b0ead 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 542c60bac48..a16f6f7f349 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 979bd2a2e5e..c81aa2b2d2a 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 c94ae8d43b3..0385cbf02b5 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 3283696f5a3..ddb2fcb5fa1 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 1542c3af0fe..8d8de346dc2 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 727ba43abc7..d789a960ea1 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 c8ea4d3f9d0..54a5a3bf0b7 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 e7a37f228e4..39aee105f3b 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 2905037bd13..0d0e8b01359 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 141c68ae1df..bc55a78c754 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 9fb12c394e0..4384a5dc02e 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 3a37cce3111..9cb6c9558c1 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 a27ab8a86ba..7a7afa1ec1f 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 165b0509494..f8865f86695 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 d52227e6348..d514d2eeee9 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 2b7f08e6e9a..d79f6d9f22c 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 aaa6833298c..7325ed86db1 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 4091a7d2cc0..479c8b6bfcc 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 18f35ff3b91..2064bda5a79 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 f5ad78ddd40..950928edbfb 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 dee49858eb0..f93b4753a38 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 06aa7f0e021..5ec8da6db71 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 87a63fa3328..dc98207e02b 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 c1719409d86..cb0cef645af 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 665868e5788..f43a405c8da 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 79011f3db29..079e2dd4ce4 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 4e2ded64c78..4728a638408 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 05119ba6c90..93cf7158252 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 fb5fa54b5d8..0983b00c3b8 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 2dc1dd90bb9..20d14093f28 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 c151e6bf144..ce220fbb517 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 c724e690cd0..60c894217f9 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 795d98f8bab..19db9021c80 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 d5442e45164..870d11f3636 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 dcf198442a3..06da5020f6f 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 ab6bdf7db7f..931cd8cb52c 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 3943b37617c..8a19b50ff1d 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 27863c6b774..e22b3eb15e4 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 acd40ff53d0..87b97ff5f55 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 65c068deaa4..3ce06ccb4f1 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 6b8c499c2b6..73491f8f394 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 3bae17b0a70..444ea08062f 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 b948525f24d..c99b6f50694 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 2e1817bbc69..1c332cfd784 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 28ab62c537c..2eff3736107 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 746fc1bf379..b8b126987dc 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 780f4d10d70..cfc10b9313a 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 dc201db4124..c50926e871c 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 0e8f7d4a481..5506c61ec6e 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 f7735ca8da3..345c6b9aa87 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 583166a7eb2..ce6d79728f1 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 2781b06f6f9..91583f39e26 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 c018ab18799..d834be6e0d0 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 7af6600787a..094ced15dd5 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 7725055111c..31623edb88a 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 fde98911466..25469417606 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 bb299173d0e..0e9a82a0607 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 019944647e1..f9349bcda03 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 7d48d60e3b3..1d4ca4fb586 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 4d10f82aa7f..8fe3b111a48 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 879d8e87969..bea3673cfc6 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 5508600922d..432e5fa7436 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 81c9a1a6def..93f6e4403b8 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 34f77a1fe56..a715659b0b5 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 d912686adcb..82e084547d4 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 5fc7ff6f47d..b7d433f1b35 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 7840fa93715..e2276dcf7ea 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 3679dbb142f..59dfa705846 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 a56416d01ba..622d7e22f4a 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 56eca824d2d..b098cf46792 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 ffd7e50240e..f48e75e2b9a 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 ae7e62741ce..edc33b17d19 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 630f8535795..27e3d9becd4 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 c02aed345a4..ea515a6226a 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 eb34efb1545..904676b0625 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 be93ae0df36..96e3cd612cc 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 1f3a36fc3cf..8cb210df446 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 946c9c8808e..3a60c3299c0 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 fd7156c8a23..be5f15492b9 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 a11980d9d72..ce022dc364d 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 948b83488cd..483a0e060f1 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 6fe3c514c9f..9ff9bda31e5 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 86dea793f17..94be788a52b 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 5fc15f721d8..b3e5cb1e6ce 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 0560d867de4..87a12fcb883 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 88efae5125d..9e09c1fe2eb 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 94e65a4f53d..90fdece8f29 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 7d5057ff3c2..723f13c2144 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 c244ed9aa5f..b41e173a45d 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 b7119799e0a..a4ee49fbca1 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 83193382967..f9d2264be5b 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 b6725d54bc0..aca8008879f 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 141a884133d..f7a7a49a303 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 0c2ede6f925..327d7b6fbc6 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 38ae5b6915a..b5c07519465 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 44f53da6b3a..4b37feef3cc 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 0946740563c..dd77ebcb8b5 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 97b65ad22bb..e2057bb35ba 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 921d78c3cc4..85422e2dc2d 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 5f02bd0771f..226ab697bc7 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 3588d16ac31..fed19c777ae 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 405c6f126d2..1aa297cfd2b 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 ec2d77330e7..ac95af1d266 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 ab28fac1c5f..c01a4176b52 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 ca17fe19ce0..193b917aeb0 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 b2a0b5fa3f6..6a946ff2d4a 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 d2f4cecb11a..cf964d10df4 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 d6eb1177ae1..8c34958d5c4 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 2f47a0cac0f..ec6f9190966 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 9b61d26d312..8a5d9ed1b3c 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 c341a3e4556..ecbb78a1a03 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 0eecf76e60a..e1aab72a94a 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 10f1344fa47..752f5240624 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 49903ffce89..466c7fb410e 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 ffc7205f85d..ed0e4d19480 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 995e5fc9737..1f6755d8882 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 63c87c37f9f..6e38e23976e 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 6493bfaaac9..6d8a327aa80 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 5d0e8212f4d..36e0edd09dc 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 ea4989893a5..d7a81d5f30e 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 4cf0470d36b..cc22fb20b03 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 4bd42df53e9..4e7559395dc 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 4bb7bdffdc4..776cea489ea 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 a6f3f773563..785da932483 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 4d5f1bfb205..010ed03e4de 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 071956f6ed9..59ce94825a5 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 c4330688878..d9405c277ca 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 e274ef79c38..943e50c93ff 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 172d3db763e..4ca74761683 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 da6dcfd792a..bb5f1ab9504 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 e319112648b..4fecd198232 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 691b05aa335..405ad697fd2 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 ed9c8616708..c38fcb96f00 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 a39a556f6d2..483a65254ca 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 5fd83b5cbcc..46af36d7bef 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 9a76833b5f6..ac0e0e8f234 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 b9c1fe7f428..2870ea2c0cd 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 2ca5ab6adbc..46c75209c3c 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 559072374f8..f66d0d851e1 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 76b33cd4e3f..a2787656f3b 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 0b848a63d3a..c84e640d2d6 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 ec31b0839b9..71f4f1f5ee9 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 bdc32fd6d84..1ef1f31e259 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 1cf8976fdcf..6581fb679cb 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 a02ae6bf0ae..41405d826a8 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 cfda0dc2caf..cc4df62379c 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 2a923d2bb5d..0090301be8b 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 4fbf4c287e3..5089a976ff6 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 4ddd8191ab8..fba86842924 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 4c78cbd3b6c..c1a0bb3802a 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 6a32f320118..ab4fc06119c 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 d4398b21746..a2596f9197d 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 1a232b25b8a..095e98f32f6 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 e0b66328651..f53dc648615 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 1a58a1f4d35..b669eb57638 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 891c46e63ac..7fd9ce833e6 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 38539235203..f457d2bb63c 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 a668ad873f1..e19398b2f01 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 eff9b0d1ff4..21b75b84fca 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 062164c581c..e246013300d 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 fe5eaf3cc16..15e7567e9fa 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 ef651b47f89..cd22ac4799c 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 9436164627f..9436501a430 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 b9fd9fd7695..67f4f5cdd3f 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 a471e49cbca..943746fe0bb 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 51b4128ab53..ccd4d52b302 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 b5daa793a72..0966303ad38 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 721e86186a1..78798d58ed0 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 f0b8fc2224d..191e0d10f16 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 212f0fc3b53..56c06331d8f 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 ad976a7d4d1..028ee0833b5 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 12a679f90d0..ffeb3366da1 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 2bcb8c93542..b22d95bef8d 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 45ddf99abec..18796409e61 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 c9725528b42..9a6c3d8341e 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 c5e07ef29a3..d43a6095f56 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 74ab61bd9c5..5f0028f2197 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 491b03ffbdd..fdd407d91f5 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 f0ed7be6f3a..226a6f9ac51 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 98afb731254..a66845a7eee 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 3664b547e47..08d03c016ce 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 ebd4eac94cd..5c21a853fe4 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 ef7dcf7e1cc..ce076e8f24c 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 59a268dc020..6e571790999 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 a1c42670d65..f885bde4eea 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 7adefa0e14a..f5d2457fcf4 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 f636177e0bb..b075e0e66ed 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 49767771744..fa4933935fc 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 a3e2a2a802b..1f0315043ae 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 04fbb89337a..b5c4511be3a 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 13ce4e702de..c0f5f80ed1d 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 1915bf50e16..ebf80d94032 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 5877a9788d9..9ead96cbded 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 df5c24d134d..2ecac3f4c71 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 28170d2ab5b..ac25802627e 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 43f9654adb6..802b9bcbd97 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 9bc1f64aa49..236360c36a8 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 93757747e80..acc70de68ed 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 ef14ecee1e9..b7e67d4e334 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 3b58971bede..e3e675289d6 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 880ef9c2485..03604a57535 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 df19c1d3768..aa2a4fdd4d9 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 5d2725eae85..368a714ba6c 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 f7c687d5ab4..350737ec6a4 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 56e6186f62a..19e2d0cc3b3 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 10388bc8355..19aa606da24 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 bc2ba8ace06..15639686b3a 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 aedde803d8c..d85c5ffcbcc 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 58e6787db55..6bbbdc6457d 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 745e4a2abac..1ccf5ad12f4 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 b84895931a1..a652eeeb564 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 eaa303daee2..746e8e37f02 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 2ddb9e0dddf..5163fe89823 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 4d9b6476327..4ae0db4a546 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 50a05fe31b3..f7f4eceaad8 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 9a78664e643..07fe5b7c10e 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 dcd381b2d50..bf6ac1f39f0 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 d0208555491..a3bd4884ae3 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 5d68501028b..09df1f9aa41 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 352cd7868fe..35faaa4c0a8 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 fcccc9b7b9d..e878b64e0ce 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 ff141fe99a8..aaa43cf16c4 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 9b3b6f29a06..04155acbff5 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 053635dd2f2..2c946e650db 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 c952d8a70d0..4a8fa34c768 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 b742456dbdd..34977782ec4 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 e955449b987..664aa9f3c5e 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 13a2a14d60d..6b881473876 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 51131d96ca1..23d57449c3f 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 f8c6d93cc0c..c64cee7fc94 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 99ecead7df5..d2e64fe7023 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 97b80da23de..ab54f07524b 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 092b3ffd76d..22a4894efbb 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 49f7e6faa89..78ce771503f 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 f375e6652b3..3a8a72f4870 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 a3ad59c3b71..cfb35109b9c 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 2bbee3003e9..eb65ca87867 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 9c17dff0242..fcc4d7424a6 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 527504af09a..bc7d5d20abd 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 e96098ef48b..a1cac42bd31 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 2967087204e..e528054e006 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 59aba725824..60f63dd741a 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 6b365b2491e..60b6aa654f0 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 d8c569a9bce..1aca3cac905 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 c3bdd6a040d..b6cf009e4a7 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 5907c0d71ec..94942e8f460 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 983d665a3c4..c236cbb0f5b 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 a20d83c8e30..8b3c34f89e0 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 870eef778aa..0e11df9abff 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 1e673bf9aa0..f506d37027c 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 d7b38b269ab..9af4e8d2bb3 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 7822e906130..48fabf22270 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 c82df4cd5d4..089cf163556 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 c5f542c25f9..592970b663f 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 aa3acc5a849..66da25afe11 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 096e2813e92..ea8b3747834 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 77d88dae531..d97ea797d2d 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 f63b6fc8f97..5f04f1ac53b 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 f8de54bfb6f..a7bbc241fe4 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 b623eed5f58..786189459bb 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 70072082788..308ae2b8aad 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 e74d7183879..fad3797bcb7 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 02ed002cc9f..cf67e7b73aa 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 bb61609c8b1..bc9ca9562a7 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 37459989271..e76f93565a9 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 d39cbb2ef59..ae60a2239d4 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 1972c5ab2fd..c9ea277c76e 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 49ed4a1f689..d2c0204d6ee 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 bbe5e744ef2..72ca55383ed 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 223ccd7d624..9eb91027903 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 2e18a93db3e..195c2c0a4b5 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 8b257ac9969..9b803d78727 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 9fa791eb763..00af8109ae7 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 43169da6076..4d3346e8a84 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 49c58975bae..a68f13c861a 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 40456fe3c95..2531dffbe3c 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 319cf8de6cf..994cb3458f7 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 7797176bb96..a189fd6d2ec 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 f38bd8c663b..7a945707cb7 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 09002e71667..666e52c7e84 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 7fa3daacd01..aaa6be93a32 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 4474938eda3..27215d710c5 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 e82f3bc8742..854d637c20d 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 e2456502f9a..ea0b4135b31 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 772bd5533f1..0484d7d4760 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 45cffc4c07b..6d27bcc96f7 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 783971988ad..bd7ee25d7e2 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 982d83186be..f32cbfe200e 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 418d3f33ab7..f81348f3d55 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 200a65270e6..0b064811128 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 71cdc0af22f..8921834755f 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 b76a68f7746..621784be66e 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 484a0087a2e..660b3c5e625 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 2b6c6205c03..a66c61f6c8a 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 c339b0c150d..7c3c3da77e5 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 afce25e802f..7226186bdbd 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 bd95d709707..736d325b82b 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 4c2892ceb16..c56fcb0f095 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 b9d22c0c5e6..cec00ce947a 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 4174cf9bd92..2577f6e8899 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 b0d1074f2b6..dc599305e5c 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 71562c45902..1d3f7411e04 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 138c5a1f6e0..484d7ae189b 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 674243f4427..ceba7b3531c 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 e061438efb9..52fa83d8cc6 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 8aabfe0a976..71ec5864441 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 daeea066f75..0fdd7df406e 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 cf26dced9ea..15786b48629 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 9fc66af48f7..a0fbef318a6 100644 --- a/boards/arm/stm32/stm3210e-eval/README.txt +++ b/boards/arm/stm32/stm3210e-eval/README.txt @@ -638,7 +638,7 @@ Where 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 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 e450d9be241..d6373ca8491 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 f35b88497eb..cc9dac06f0c 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 e861d410e8b..230035f6322 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 a9b2ad1431d..093ce706073 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 98e93a49ba5..ec58eeb22ba 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 1b9ebac3204..6f3b2114430 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 95f8c262adb..afdeb0ac8a1 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 3441b64c5fb..ffa4cd59610 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 beca4805ee9..4cec9421bd8 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 a4e33772c87..c14ba5feb6c 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 52322f10a2a..7c125db2b9c 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 4e0114709f9..34a1bddde5c 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 0dadc7cc911..f959eb357b4 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 2226a5ab7c3..fed8fe75aa9 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 8f524878795..98c4203ebcb 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 ce3483a133c..f8bd05be8a6 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 b98c9975bb0..d8c16bad1ec 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 fb3ec1e4ae9..49cfd41d1cc 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 becb46abf35..35050dfc794 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 ba7a3bdc7dc..8a492215906 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 d152d25d5a0..e476abccfad 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 e70f0035fcc..4c34ac601e8 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 62d728c2864..e1e54d47907 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 d40c0c47c98..f041d0efc14 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 e1f6550f1cc..7d7aeb15948 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 baa7f4b7fc0..0926bb35e69 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 7d92f1b5f2c..2815c180d64 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 0b2e5a98ba2..016f7cef07d 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 23adc7de851..d989346a52d 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 d09adb3e021..82a3d1385f1 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 52104755f8b..b1b11345af7 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 98ab44c4bb5..cfad31ab076 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 5a2dc95c497..3b07e705087 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 52104755f8b..b1b11345af7 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 224fa5d45e5..a9c7917fef0 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 9c7f08c240b..3aeb4e61575 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 3a9d6bd07e2..5f8bf71a134 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 82cac48a24f..58d96009381 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 bd6e978c19a..74cd41f5204 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 03f4c703a85..085497a72ba 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 48d029f820c..6e165e62adc 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 6264a816862..1ab3f008dbe 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 1c844644fe6..1255e16791b 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 aba45f13d77..a77cf5add3f 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 3e3d0990823..6f969ceb079 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 b8d2121b1a9..3432eaf92e6 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 8fc27abb09b..90954af54be 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 e4303dc4a27..d3be8c286ca 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 8d537ddb056..2612a8637dd 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 569e65fecef..8ced4499367 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 da3c0c7a49c..ab36c0a5d7c 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 969c0095ef7..6a3c85e6d88 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 8aaac1e2045..90a7a6f30c2 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 @@ -89,5 +91,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/powerled/defconfig b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig index aba75a80773..5d2d443130e 100644 --- a/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig @@ -32,6 +32,8 @@ CONFIG_EXAMPLES_POWERLED=y CONFIG_EXAMPLES_POWERLED_CURRENT_LIMIT=100 CONFIG_EXAMPLES_POWERLED_DEVPATH="/dev/powerled0" CONFIG_FDCLONE_STDIO=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y @@ -116,5 +118,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/stm32f3discovery/configs/nsh/defconfig b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig index 43c71583b3a..a387fa4f6e0 100644 --- a/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig @@ -24,6 +24,7 @@ CONFIG_CDCACM_TXBUFSIZE=256 CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=2 CONFIG_NSH_BUILTIN_APPS=y @@ -50,4 +51,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/stm32f3discovery/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig index 61982ba6f0e..203d12ec914 100644 --- a/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig @@ -28,6 +28,7 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=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_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig b/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig index 44f19e53bf7..18c58635eb2 100644 --- a/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig @@ -24,6 +24,7 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=8499 CONFIG_BUILTIN=y CONFIG_HAVE_CXX=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 @@ -45,4 +46,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/stm32f411e-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig index 019959f2d43..38ccf76a766 100644 --- a/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig @@ -25,6 +25,7 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=8499 CONFIG_BUILTIN=y CONFIG_HAVE_CXX=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 @@ -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/stm32f429i-disco/configs/adc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig index aaa6a1e8be6..b9414ccc2f3 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig @@ -28,6 +28,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_ARCHINIT=y @@ -61,4 +62,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/stm32f429i-disco/configs/extflash/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig index cb7207be4d5..8b02ba6555f 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig @@ -24,6 +24,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_MTD_CONFIG=y @@ -64,4 +65,3 @@ CONFIG_SYSTEM_FLASH_ERASEALL=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/stm32f429i-disco/configs/fb/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig index 8b8ebe9bfc9..ed17929ad40 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig @@ -29,6 +29,7 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HEAP2_BASE=0xD0000000 CONFIG_HEAP2_SIZE=7774208 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INPUT=y CONFIG_INPUT_STMPE811=y CONFIG_INTELHEX_BINARY=y @@ -77,5 +78,4 @@ CONFIG_STMPE811_THRESHY=51 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig index 1801a67939d..12b08418a41 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig @@ -22,6 +22,7 @@ CONFIG_DEBUG_NOOPT=y CONFIG_HAVE_CXX=y CONFIG_HEAP2_BASE=0xD0000000 CONFIG_HEAP2_SIZE=8388608 +CONFIG_INIT_ENTRYPOINT="highpri_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y @@ -58,4 +59,3 @@ CONFIG_STM32_USART1=y CONFIG_SYSTEM_READLINE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="highpri_main" diff --git a/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig index d1719628b14..a5c24bb90f6 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig @@ -29,6 +29,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_LCD=y CONFIG_LCD_ILI9341=y @@ -64,4 +65,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/stm32f429i-disco/configs/lvgl/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig index b7026e39b00..fcf691ca112 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig @@ -31,6 +31,7 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HEAP2_BASE=0xD0000000 CONFIG_HEAP2_SIZE=8081408 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INPUT=y CONFIG_INPUT_STMPE811=y CONFIG_INTELHEX_BINARY=y @@ -75,5 +76,4 @@ CONFIG_STMPE811_THRESHY=51 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig index 01f01386e85..83867d2c3dc 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/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_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/stm32f429i-disco/configs/nxhello/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig index c06a87e42e0..aeb153d7b8e 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig @@ -31,6 +31,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_MQ_MAXMSGSIZE=64 @@ -74,5 +75,4 @@ CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig index 55330492b24..78306a9c7d5 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig @@ -34,6 +34,7 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HEAP2_BASE=0xd0000000 CONFIG_HEAP2_SIZE=8081408 +CONFIG_INIT_ENTRYPOINT="nxwm_main" CONFIG_INPUT=y CONFIG_INPUT_STMPE811=y CONFIG_INTELHEX_BINARY=y @@ -109,5 +110,4 @@ CONFIG_STMPE811_THRESHX=39 CONFIG_STMPE811_THRESHY=51 CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nxwm_main" CONFIG_VIDEO_FB=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig index 8c51bf8d501..04f10f040b9 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig @@ -24,6 +24,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_ARCHINIT=y @@ -56,4 +57,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBHOST_MSC=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig index 0ebfee5221c..c74936990d0 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig @@ -30,6 +30,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_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -61,4 +62,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USBDEV=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/adb/defconfig b/boards/arm/stm32/stm32f4discovery/configs/adb/defconfig index 3b0f497a746..de233b78a86 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/adb/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/adb/defconfig @@ -39,6 +39,8 @@ CONFIG_FS_FATTIME=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y @@ -82,5 +84,3 @@ CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USBADB=y CONFIG_USBDEV=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig index bf2d119c501..72f13b62ab4 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig @@ -35,6 +35,7 @@ CONFIG_I2C=y CONFIG_I2C_DRIVER=y CONFIG_I2C_POLLED=y CONFIG_I2C_RESET=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=2 CONFIG_NSH_BUILTIN_APPS=y @@ -75,4 +76,3 @@ CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USBHOST_ISOC_DISABLE=y CONFIG_USBHOST_MSC=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig index c337587af4b..f423001dc22 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig @@ -26,6 +26,7 @@ CONFIG_EXAMPLES_LIBCANARD=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_SYSTEM_TIME64=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/stm32f4discovery/configs/cxxtest/defconfig b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig index 456d9e64db9..0d6efd95f63 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig @@ -19,6 +19,7 @@ CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_HAVE_CXX=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="cxxtest_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBM=y CONFIG_MM_REGIONS=2 @@ -41,4 +42,3 @@ CONFIG_UCLIBCXX=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 -CONFIG_USER_ENTRYPOINT="cxxtest_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig index 4d2d6dea007..f4aaf86c9f0 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig @@ -25,6 +25,8 @@ CONFIG_ELF_STACKSIZE=4096 CONFIG_EXAMPLES_ELF=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y +CONFIG_INIT_ENTRYPOINT="elf_main" +CONFIG_INIT_STACKSIZE=4096 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_MM_REGIONS=2 @@ -43,5 +45,3 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=4096 -CONFIG_USER_ENTRYPOINT="elf_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig index 064648067dd..85d2ba89c4b 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/ipv6/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_LIBC_HOSTNAME="STM32F4-Discovery" CONFIG_MMCSD=y @@ -89,4 +90,3 @@ CONFIG_SYSTEM_PING6=y CONFIG_USART6_RXBUFSIZE=64 CONFIG_USART6_SERIAL_CONSOLE=y CONFIG_USART6_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig b/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig index 1c5c3063c32..71c4f81c6c3 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/kostest/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_INTELHEX_BINARY=y CONFIG_MM_REGIONS=2 CONFIG_NUTTX_USERSPACE=0x08020000 @@ -45,4 +46,3 @@ CONFIG_TESTING_OSTEST_STACKSIZE=2048 CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig b/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig index 5cb7e61d863..aaa6a56a536 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig @@ -26,6 +26,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_I2C=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LCD_BACKPACK=y CONFIG_LCD_LCD1602=y @@ -54,4 +55,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/stm32f4discovery/configs/lwl/defconfig b/boards/arm/stm32/stm32f4discovery/configs/lwl/defconfig index ae9cb5a6817..30a41a94d54 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/lwl/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/lwl/defconfig @@ -24,6 +24,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_LWL_CONSOLE=y CONFIG_MM_REGIONS=2 @@ -46,4 +47,3 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig index 7b7915ce090..4ef00e2767f 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig @@ -25,6 +25,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_MM_REGIONS=2 CONFIG_NSH_BUILTIN_APPS=y @@ -52,4 +53,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/stm32f4discovery/configs/max7219/defconfig b/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig index 938121f01ae..083868daa0c 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig @@ -46,6 +46,7 @@ CONFIG_EXAMPLES_NXHELLO_BPP=1 CONFIG_EXAMPLES_NXHELLO_LISTENER_STACKSIZE=1536 CONFIG_EXAMPLES_NXHELLO_STACKSIZE=1536 CONFIG_FS_PROCFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LCD=y CONFIG_LCD_FRAMEBUFFER=y CONFIG_LCD_MAX7219=y @@ -81,4 +82,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/stm32f4discovery/configs/mmcsdspi/defconfig b/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig index 11a1529f65c..081a3ed327c 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig @@ -35,6 +35,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HEAP_COLORATION=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MMCSD=y CONFIG_MM_REGIONS=2 @@ -70,4 +71,3 @@ CONFIG_TESTING_OSTEST=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/stm32f4discovery/configs/modbus_slave/defconfig b/boards/arm/stm32/stm32f4discovery/configs/modbus_slave/defconfig index 1243b922ad6..9cde021664d 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/modbus_slave/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/modbus_slave/defconfig @@ -30,6 +30,7 @@ CONFIG_EXAMPLES_MODBUS_PORT=1 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_MODBUS=y @@ -61,4 +62,3 @@ CONFIG_USART1_RS485=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/stm32f4discovery/configs/module/defconfig b/boards/arm/stm32/stm32f4discovery/configs/module/defconfig index c78151462fd..85c401d3bbc 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/module/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/module/defconfig @@ -25,6 +25,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=2 CONFIG_MODULE=y @@ -51,4 +52,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/stm32f4discovery/configs/netnsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig index e5bfdbf3582..ae416958715 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/netnsh/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_LIBC_HOSTNAME="STM32F4-Discovery" CONFIG_MMCSD=y @@ -94,4 +95,3 @@ CONFIG_SYSTEM_PING=y CONFIG_USART6_RXBUFSIZE=64 CONFIG_USART6_SERIAL_CONSOLE=y CONFIG_USART6_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig index b26ebd8797b..64d19a73d56 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig @@ -25,6 +25,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_MM_REGIONS=2 CONFIG_NSH_BUILTIN_APPS=y @@ -49,4 +50,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/stm32f4discovery/configs/nxlines/defconfig b/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig index 68768c012d0..19cbe6944fe 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig @@ -31,6 +31,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nxlines_main" CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=1 @@ -70,4 +71,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 -CONFIG_USER_ENTRYPOINT="nxlines_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig b/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig index 49ca6404820..b2fcf589329 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig @@ -24,6 +24,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_MM_REGIONS=2 CONFIG_NSH_BUILTIN_APPS=y @@ -53,4 +54,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/stm32f4discovery/configs/posix_spawn/defconfig b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig index 0376d0a13f1..a6b0341ecc2 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig @@ -26,6 +26,7 @@ CONFIG_EXECFUNCS_NSYMBOLS_VAR="g_spawn_nexports" CONFIG_EXECFUNCS_SYMTAB_ARRAY="g_spawn_exports" CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y +CONFIG_INIT_ENTRYPOINT="posix_spawn_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y @@ -47,4 +48,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 -CONFIG_USER_ENTRYPOINT="posix_spawn_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig b/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig index 1ae9cf895a0..238d497d788 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig @@ -24,6 +24,7 @@ CONFIG_EXAMPLES_PTYTEST_POLL=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 @@ -51,4 +52,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/stm32f4discovery/configs/rgbled/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig index 02ccff030d5..bfcf075c363 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig @@ -24,6 +24,7 @@ CONFIG_EXAMPLES_RGBLED=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="rgbled_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=2 CONFIG_NSH_BUILTIN_APPS=y @@ -61,4 +62,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 -CONFIG_USER_ENTRYPOINT="rgbled_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig index 3b0f9e26c14..f0ae4fd324d 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig @@ -34,6 +34,8 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y @@ -96,5 +98,3 @@ CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_PING=y CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USBDEV=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/sporadic/defconfig b/boards/arm/stm32/stm32f4discovery/configs/sporadic/defconfig index 3a85f7fe0d9..b0685a5e456 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/sporadic/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/sporadic/defconfig @@ -22,6 +22,7 @@ CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=2 CONFIG_NSH_BUILTIN_APPS=y @@ -49,4 +50,3 @@ CONFIG_USART6_RXBUFSIZE=128 CONFIG_USART6_SERIAL_CONSOLE=y CONFIG_USART6_TXBUFSIZE=128 CONFIG_USEC_PER_TICK=1000 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/st7789/defconfig b/boards/arm/stm32/stm32f4discovery/configs/st7789/defconfig index 2c12b29e4e9..66ba0856927 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/st7789/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/st7789/defconfig @@ -26,6 +26,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_LCD=y CONFIG_LCD_FRAMEBUFFER=y @@ -63,5 +64,4 @@ CONFIG_SYSTEM_NSH=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig index efdf82e4128..0e74021fcc8 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig @@ -21,6 +21,7 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_EXAMPLES_HELLOXX=y CONFIG_HAVE_CXX=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBCXX=y CONFIG_LIBCXXABI=y @@ -49,4 +50,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/stm32f4discovery/configs/usbmsc/defconfig b/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig index 8f881b6f821..25d80182bbc 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/usbmsc/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_MM_REGIONS=2 CONFIG_NSH_ARCHINIT=y @@ -57,4 +58,3 @@ CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USBDEV=y CONFIG_USBMSC=y CONFIG_USBMSC_REMOVABLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig index 8556157b483..81fa28e8902 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/usbnsh/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_STM32_SPI1=y CONFIG_STM32_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_USBDEV=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig index 733c0d100e7..b21fb41a6d9 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig @@ -39,6 +39,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HEAP_COLORATION=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y @@ -104,7 +105,6 @@ CONFIG_TESTING_OSTEST_FPUSIZE=132 CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS_GS2200M=y CONFIG_WL_GS2200M=y CONFIG_WL_GS2200M_DISABLE_DHCPC=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs deleted file mode 100644 index 98ed0929674..00000000000 --- a/boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################ -# boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. The -# ASF licenses this file to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance with the -# License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -############################################################################ - -include $(TOPDIR)\.config -include $(TOPDIR)\tools\Config.mk -include $(TOPDIR)\arch\arm\src\armv7-m\Toolchain.defs - -LDSCRIPT = ld.script - -ARCHSCRIPT = -T$(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT) - -ifeq ($(CONFIG_DEBUG_SYMBOLS),y) - ARCHOPTIMIZATION = -g -endif - -ifneq ($(CONFIG_DEBUG_NOOPT),y) - ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer -endif - -ARCHCFLAGS = -fno-builtin -ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fcheck-new -fno-rtti -ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -ARCHWARNINGSXX = -Wall -Wshadow -Wundef -ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10 - -CFLAGS := $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe -CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS) -CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe -CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS) -CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -AFLAGS := $(CFLAGS) -D__ASSEMBLY__ - -NXFLATLDFLAGS1 = -r -d -warn-common -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)\binfmt\libnxflat\gnu-nxflat-pcrel.ld -no-check-sections -LDNXFLATFLAGS = -e main -s 2048 - -ifeq ($(CONFIG_DEBUG_SYMBOLS),y) - LDFLAGS += -g -endif diff --git a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig index e841c83e847..13e3b2cc8cf 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig @@ -23,6 +23,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_BUILTIN_APPS=y @@ -54,4 +55,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/stm32f4discovery/kernel/Makefile b/boards/arm/stm32/stm32f4discovery/kernel/Makefile index 2a43089e594..7f7b9b152bb 100644 --- a/boards/arm/stm32/stm32f4discovery/kernel/Makefile +++ b/boards/arm/stm32/stm32f4discovery/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/stm32f4discovery/kernel/stm32_userspace.c b/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c index 4d4b3e9d65a..f28aca6415a 100644 --- a/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c +++ b/boards/arm/stm32/stm32f4discovery/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/stm32ldiscovery/configs/chrono/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig index 8a3fcd697ae..7f0a99cdcfa 100644 --- a/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig +++ b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig @@ -27,6 +27,8 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_EXAMPLES_CHRONO=y CONFIG_EXAMPLES_SLCD=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_INPUT=y CONFIG_INPUT_BUTTONS=y CONFIG_INPUT_BUTTONS_LOWER=y @@ -62,5 +64,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/stm32/stm32ldiscovery/configs/nsh/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig index 060b4b7cb3b..0803f1f83fa 100644 --- a/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig @@ -23,6 +23,8 @@ CONFIG_BOARD_LOOPSPERMSEC=2796 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 @@ -51,5 +53,3 @@ CONFIG_USART1_BAUD=57600 CONFIG_USART1_RXBUFSIZE=64 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=64 -CONFIG_USERMAIN_STACKSIZE=1536 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig b/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig index e31640eb350..239540d98a5 100644 --- a/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig @@ -33,6 +33,8 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_SMALL=y CONFIG_IDLETHREAD_STACKSIZE=128 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=768 CONFIG_INTELHEX_BINARY=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4 CONFIG_NSH_BUILTIN_APPS=y @@ -57,5 +59,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_RXBUFSIZE=128 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=128 -CONFIG_USERMAIN_STACKSIZE=768 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig index 0a3469b1913..532ccc69e1e 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig @@ -19,6 +19,7 @@ CONFIG_BUILTIN=y CONFIG_EXAMPLES_FT80X=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_FT80X=y @@ -42,4 +43,3 @@ CONFIG_STM32_SPI1=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/viewtool-stm32f107/configs/highpri/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig index 9a1adcc4866..3911fbfd94f 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_RAMVECTORS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="highpri_main" CONFIG_INTELHEX_BINARY=y CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=65536 @@ -35,5 +36,4 @@ CONFIG_STM32_TIM6=y CONFIG_STM32_USART1=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="highpri_main" CONFIG_VIEWTOOL_HIGHPRI=y diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig index 087729fb0eb..73a56ca8162 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig @@ -20,6 +20,7 @@ CONFIG_BUILTIN=y CONFIG_ETH0_PHY_DP83848C=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=24 CONFIG_LIBC_HOSTNAME="Viewtool-STM32F107" @@ -73,4 +74,3 @@ CONFIG_SYSTEM_PING6=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig index 0baad6d7200..fbfa5fd0365 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig @@ -18,6 +18,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y @@ -38,4 +39,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/viewtool-stm32f107/configs/tcpblaster/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig index 859d97a3931..723dd31b5b6 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig @@ -20,6 +20,7 @@ CONFIG_BUILTIN=y CONFIG_ETH0_PHY_DP83848C=y CONFIG_EXAMPLES_TCPBLASTER=y CONFIG_FS_PROCFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=50 CONFIG_IOB_NCHAINS=12 @@ -64,4 +65,3 @@ CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig index 47f9e0488b4..26406c270d0 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig @@ -27,6 +27,8 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y CONFIG_EXAMPLES_ADC=y CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXPERIMENTAL=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_INTELHEX_BINARY=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y @@ -58,5 +60,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/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig index 6c423e4481b..3e92f0a971d 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig @@ -24,6 +24,8 @@ CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXPERIMENTAL=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 @@ -51,5 +53,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/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig index c5e67a30aaf..5830dcf42a6 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig @@ -25,6 +25,8 @@ CONFIG_EXAMPLES_NXLINES_BPP=1 CONFIG_EXAMPLES_NXLINES_LINECOLOR=0xff CONFIG_EXAMPLES_NXLINES_LINEWIDTH=1 CONFIG_EXPERIMENTAL=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=255 @@ -63,5 +65,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/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig index 566f5fbee08..1dee1af9f44 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig @@ -26,6 +26,8 @@ CONFIG_DRIVERS_LPWAN=y CONFIG_DRIVERS_WIRELESS=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_SX127X=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_INTELHEX_BINARY=y CONFIG_LPWAN_SX127X=y CONFIG_LPWAN_SX127X_FSKOOK=y @@ -62,5 +64,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/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig index 50bff179c69..c465661c00f 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig @@ -23,6 +23,8 @@ CONFIG_BOARD_LOOPSPERMSEC=2796 CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y CONFIG_FS_PROCFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y @@ -50,5 +52,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_RXBUFSIZE=32 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=32 -CONFIG_USERMAIN_STACKSIZE=1536 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig index 18e06188200..892c44fa62f 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig @@ -25,6 +25,8 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_SMALL=y CONFIG_FS_PROCFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y @@ -50,5 +52,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/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig index 992d2e9f1c5..5468e50d712 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig @@ -26,6 +26,8 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y CONFIG_DRIVERS_LPWAN=y CONFIG_DRIVERS_WIRELESS=y CONFIG_EXAMPLES_HELLO=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_INTELHEX_BINARY=y CONFIG_LPWAN_SX127X=y CONFIG_LPWAN_SX127X_FSKOOK=y @@ -62,5 +64,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/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig index ea3e44292de..17a2952cd98 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig @@ -35,6 +35,8 @@ CONFIG_EXAMPLES_TIMER=y CONFIG_I2C=y CONFIG_I2CTOOL_MAXADDR=0xff CONFIG_I2CTOOL_MINADDR=0x00 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_INPUT=y CONFIG_INPUT_BUTTONS=y CONFIG_INPUT_BUTTONS_LOWER=y @@ -106,5 +108,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_TIMER=y CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=1536 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig index 618dcaebaeb..80eca9c919f 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig @@ -22,6 +22,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 @@ -49,5 +51,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/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig index 2476cb3f11f..15a422dbe8f 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig @@ -24,6 +24,8 @@ CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXPERIMENTAL=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 @@ -51,5 +53,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/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig index e8dbee6a931..3354ba809a3 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig @@ -27,6 +27,8 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y CONFIG_DRIVERS_LPWAN=y CONFIG_DRIVERS_WIRELESS=y CONFIG_EXAMPLES_HELLO=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_INTELHEX_BINARY=y CONFIG_LPWAN_SX127X=y CONFIG_LPWAN_SX127X_FSKOOK=y @@ -62,5 +64,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/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig index 2a6cc7e68ce..2ebc79c88c9 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig @@ -22,6 +22,8 @@ CONFIG_BINFMT_DISABLE=y CONFIG_BOARD_LOOPSPERMSEC=2796 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_FILEIOSIZE=64 @@ -47,5 +49,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 -CONFIG_USERMAIN_STACKSIZE=1536 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig index b7338838fd7..9a5261e9c11 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig @@ -22,6 +22,8 @@ CONFIG_BINFMT_DISABLE=y CONFIG_BOARD_LOOPSPERMSEC=2796 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_FILEIOSIZE=64 @@ -47,5 +49,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 -CONFIG_USERMAIN_STACKSIZE=1536 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig index e94e0832c26..422f026aca0 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig @@ -25,6 +25,7 @@ CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_REGIONS=2 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 @@ -48,4 +49,3 @@ CONFIG_STM32F7_USART_BREAKS=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART6_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig index 027ee02f598..f214088ff88 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig @@ -29,6 +29,7 @@ CONFIG_EXAMPLES_HELLOXX=y CONFIG_EXAMPLES_LEDS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_REGIONS=2 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -61,4 +62,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig index 1fd432886ba..189c83706b8 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig @@ -25,6 +25,7 @@ CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_REGIONS=2 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 @@ -49,4 +50,3 @@ CONFIG_STM32F7_USART_BREAKS=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/stm32f7/nucleo-144/configs/f746-pysim/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f746-pysim/defconfig index b48d1cfa010..1ad5309e3a7 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f746-pysim/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f746-pysim/defconfig @@ -37,6 +37,7 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_FS_TMPFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOEXPANDER=y CONFIG_IOEXPANDER_MULTIPIN=y CONFIG_LIBC_FLOATINGPOINT=y @@ -135,4 +136,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig index 5e08098720d..03e68397868 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig @@ -29,6 +29,7 @@ CONFIG_EXAMPLES_HELLOXX=y CONFIG_EXAMPLES_LEDS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_REGIONS=3 CONFIG_MPU60X0_I2C=y CONFIG_NSH_ARCHINIT=y @@ -66,4 +67,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig index cbed403806c..6102f3eff77 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig @@ -26,6 +26,7 @@ CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_TMPFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_HOSTNAME="stntest" CONFIG_MM_REGIONS=3 CONFIG_NET=y @@ -79,4 +80,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/stm32f7/nucleo-144/configs/f767-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig index 9cee444890f..1f3f2dbd3bb 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig @@ -25,6 +25,7 @@ CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_REGIONS=3 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 @@ -46,4 +47,3 @@ CONFIG_START_YEAR=2015 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig index 5934031db3c..37a93732fd0 100644 --- a/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig +++ b/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig @@ -47,6 +47,8 @@ CONFIG_I2CTOOL_MAXBUS=1 CONFIG_I2CTOOL_MINBUS=1 CONFIG_I2C_RESET=y CONFIG_IDLETHREAD_STACKSIZE=2500 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2500 CONFIG_LIBC_STRERROR=y CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y @@ -95,6 +97,4 @@ CONFIG_TASK_NAME_SIZE=24 CONFIG_USART6_SERIAL_CONSOLE=y CONFIG_USBDEV=y CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2500 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/audio/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/audio/defconfig index 36f2ed2cc3a..1a28bf63825 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/audio/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/audio/defconfig @@ -43,6 +43,7 @@ CONFIG_FS_PROCFS_REGISTER=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_I2C=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MMCSD=y CONFIG_MM_REGIONS=3 @@ -76,5 +77,4 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_VI=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WM8994_REGDUMP=y diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig index ddb403ab559..c0b4eb5d1c4 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig @@ -33,6 +33,7 @@ CONFIG_EXAMPLES_FB=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_BUILTIN_APPS=y @@ -58,5 +59,4 @@ CONFIG_STM32F7_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig index e4d1c9ea9c2..39124a7f456 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig @@ -36,6 +36,7 @@ CONFIG_FT5X06_SWAPXY=y CONFIG_GRAPHICS_LVGL=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INPUT=y CONFIG_INPUT_FT5X06=y CONFIG_INTELHEX_BINARY=y @@ -63,5 +64,4 @@ CONFIG_STM32F7_LTDC_FB_SIZE=261120 CONFIG_STM32F7_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig index 302f71b1feb..5c7f9fd913d 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig @@ -27,6 +27,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_HOSTNAME="stntest" CONFIG_MM_REGIONS=3 @@ -77,4 +78,3 @@ CONFIG_STM32F7_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/stm32f7/stm32f746g-disco/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig index 8fb4e9dfe20..63f9f7a2d2b 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig @@ -27,6 +27,7 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_BUILTIN_APPS=y @@ -48,4 +49,3 @@ CONFIG_STM32F7_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/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig index dba5fa2670d..5beaf779c0f 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig @@ -41,6 +41,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=16 CONFIG_EXAMPLES_NX_BPP=16 CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_MQ_MAXMSGSIZE=256 @@ -65,5 +66,4 @@ CONFIG_STM32F7_LTDC_FB_SIZE=261120 CONFIG_STM32F7_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig index 30fd1238d17..4c5fcded4a5 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig @@ -33,6 +33,7 @@ CONFIG_DRIVERS_VIDEO=y CONFIG_EXAMPLES_NXTERM=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_MQ_MAXMSGSIZE=256 @@ -58,5 +59,4 @@ CONFIG_STM32F7_LTDC_FB_SIZE=261120 CONFIG_STM32F7_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y diff --git a/boards/arm/stm32f7/stm32f746g-disco/kernel/Makefile b/boards/arm/stm32f7/stm32f746g-disco/kernel/Makefile index 5eb94e7a6c8..b5c29a69936 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/kernel/Makefile +++ b/boards/arm/stm32f7/stm32f746g-disco/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/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c b/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c index ea60ccc8231..399d8bc7d37 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c +++ b/boards/arm/stm32f7/stm32f746g-disco/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/stm32f7/stm32f769i-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig index 4a71193fad6..d9af437e0d5 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig +++ b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig @@ -27,6 +27,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_HOSTNAME="stntest" CONFIG_MMCSD=y @@ -85,4 +86,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig index 5b728fb21db..c2c9497fcd6 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig @@ -24,6 +24,7 @@ CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -44,4 +45,3 @@ CONFIG_STM32F7_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/stm32f7/stm32f769i-disco/kernel/Makefile b/boards/arm/stm32f7/stm32f769i-disco/kernel/Makefile index e9cf736612c..2bcf4b8efe9 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/kernel/Makefile +++ b/boards/arm/stm32f7/stm32f769i-disco/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/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c b/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c index cb34f48671e..2cbc57dcc4a 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c +++ b/boards/arm/stm32f7/stm32f769i-disco/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/stm32h7/nucleo-h743zi/configs/elf/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig index 3bd0b062df9..2be2f79de67 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig @@ -33,6 +33,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=4 CONFIG_NSH_ARCHINIT=y @@ -59,4 +60,3 @@ CONFIG_STM32_ROMFS_IMAGEFILE="../../apps/examples/elf/tests/romfs.img" CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/netnsh/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/netnsh/defconfig index 55ff795368e..9678f2759c7 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/configs/netnsh/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/netnsh/defconfig @@ -27,6 +27,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBM=y CONFIG_MM_REGIONS=4 @@ -85,4 +86,3 @@ CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USBHOST=y CONFIG_USBHOST_MSC=y CONFIG_USBHOST_MSC_NOTIFIER=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig index d13df8a4e4f..33456561f0b 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig @@ -25,6 +25,7 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_EXPERIMENTAL=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=4 CONFIG_NSH_BUILTIN_APPS=y @@ -46,4 +47,3 @@ CONFIG_STM32H7_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/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig index ab89b178aa9..c4b03bcda08 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig @@ -33,6 +33,7 @@ CONFIG_EXAMPLES_NXLINES_LINEWIDTH=1 CONFIG_EXPERIMENTAL=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=255 @@ -64,4 +65,3 @@ CONFIG_STM32H7_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/stm32h7/nucleo-h743zi/configs/otg_fs_host/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/otg_fs_host/defconfig index e7fa2bd6103..539d7848ec9 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/configs/otg_fs_host/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/otg_fs_host/defconfig @@ -26,6 +26,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBM=y CONFIG_MM_REGIONS=4 @@ -57,4 +58,3 @@ CONFIG_USBHOST=y CONFIG_USBHOST_INT_DISABLE=y CONFIG_USBHOST_MSC=y CONFIG_USBHOST_MSC_NOTIFIER=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig index ac686c2246b..2ac26981167 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig @@ -25,6 +25,7 @@ CONFIG_EXAMPLES_PWM=y CONFIG_EXPERIMENTAL=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=4 CONFIG_NSH_ARCHINIT=y @@ -64,4 +65,3 @@ CONFIG_STM32H7_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/stm32h7/nucleo-h743zi/kernel/Makefile b/boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile index b85631e8e63..29213625e75 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile +++ b/boards/arm/stm32h7/nucleo-h743zi/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/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c b/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c index e0934a03695..6b6ead94d76 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c +++ b/boards/arm/stm32h7/nucleo-h743zi/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/stm32h7/nucleo-h743zi2/configs/jumbo/defconfig b/boards/arm/stm32h7/nucleo-h743zi2/configs/jumbo/defconfig index 521043d6b68..bdddce7c0c1 100644 --- a/boards/arm/stm32h7/nucleo-h743zi2/configs/jumbo/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi2/configs/jumbo/defconfig @@ -45,6 +45,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBM=y CONFIG_MM_REGIONS=4 @@ -142,4 +143,3 @@ CONFIG_USBHOST_MSC_NOTIFIER=y CONFIG_USBHOST_TRACE=y CONFIG_USBHOST_TRACE_VERBOSE=y CONFIG_USBMONITOR=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32h7/nucleo-h743zi2/configs/netnsh/defconfig b/boards/arm/stm32h7/nucleo-h743zi2/configs/netnsh/defconfig index 652e6945e33..a713d888229 100644 --- a/boards/arm/stm32h7/nucleo-h743zi2/configs/netnsh/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi2/configs/netnsh/defconfig @@ -27,6 +27,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBM=y CONFIG_MM_REGIONS=4 @@ -85,4 +86,3 @@ CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USBHOST=y CONFIG_USBHOST_MSC=y CONFIG_USBHOST_MSC_NOTIFIER=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32h7/nucleo-h743zi2/configs/nsh/defconfig b/boards/arm/stm32h7/nucleo-h743zi2/configs/nsh/defconfig index 6bb5a1c9225..d97f8ac7bc7 100644 --- a/boards/arm/stm32h7/nucleo-h743zi2/configs/nsh/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi2/configs/nsh/defconfig @@ -22,6 +22,7 @@ CONFIG_ARMV7M_ICACHE=y CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=4 CONFIG_NSH_BUILTIN_APPS=y @@ -42,4 +43,3 @@ CONFIG_STM32H7_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/stm32h7/stm32h747i-disco/configs/nsh/defconfig b/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig index db0bc24d97b..dfd28b89f5e 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig +++ b/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig @@ -25,6 +25,7 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_EXPERIMENTAL=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=4 CONFIG_NSH_BUILTIN_APPS=y @@ -46,4 +47,3 @@ CONFIG_STM32H7_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/stm32h7/stm32h747i-disco/kernel/Makefile b/boards/arm/stm32h7/stm32h747i-disco/kernel/Makefile index 8cb2c383c40..2cac9c001dd 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/kernel/Makefile +++ b/boards/arm/stm32h7/stm32h747i-disco/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/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c b/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c index fed57e0694f..9eeb64142f5 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c +++ b/boards/arm/stm32h7/stm32h747i-disco/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/stm32l4/b-l475e-iot01a/configs/nsh/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig index dc33986e6be..a70b3b74615 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig @@ -23,6 +23,7 @@ CONFIG_B_L475E_IOT01A_MTD_PART_LIST="16,64,128,128" CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MTD_SMART_SECTOR_SIZE=512 CONFIG_MX25RXX_SECTOR512=y @@ -46,5 +47,4 @@ CONFIG_STM32L4_QSPI_FLASH_SIZE=8388608 CONFIG_STM32L4_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig index 69bdb01a33d..c0eebc757e9 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig @@ -40,6 +40,7 @@ CONFIG_EXAMPLES_UDP_TARGET2=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=94 CONFIG_IOB_NBUFFERS=32 @@ -93,6 +94,5 @@ CONFIG_STM32L4_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TELNET_CLIENT=y CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_PKTRADIO=y diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig index 2d0dcf304d6..5200afbf3fb 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig @@ -29,6 +29,7 @@ CONFIG_EXAMPLES_UDP_SERVER_PORTNO=61616 CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=94 CONFIG_IOB_NBUFFERS=32 @@ -84,6 +85,5 @@ CONFIG_STM32L4_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TELNET_CLIENT=y CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_PKTRADIO=y diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig index 653976196a2..9751c88f336 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig @@ -41,6 +41,7 @@ CONFIG_EXAMPLES_UDP_TARGET2=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=94 CONFIG_IOB_NBUFFERS=32 @@ -95,6 +96,5 @@ CONFIG_STM32L4_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TELNET_CLIENT=y CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_PKTRADIO=y diff --git a/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig index b12c62e8c31..3f267764cf4 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig @@ -26,6 +26,7 @@ CONFIG_EXAMPLES_ALARM=y CONFIG_EXAMPLES_RANDOM=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 @@ -59,4 +60,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/stm32l4/nucleo-l432kc/configs/spwm/defconfig b/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig index 83a4d06242e..c72b4969ea2 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig +++ b/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig @@ -23,6 +23,7 @@ CONFIG_BUILTIN=y CONFIG_DEBUG_NOOPT=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="spwm_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBM=y CONFIG_MM_REGIONS=2 @@ -50,4 +51,3 @@ CONFIG_STM32L4_USART2=y CONFIG_SYSTEM_READLINE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="spwm_main" diff --git a/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig index 962ca2f5a35..b25261c866d 100644 --- a/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig @@ -35,6 +35,7 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_I2C=y CONFIG_I2C_RESET=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_REGIONS=2 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -81,4 +82,3 @@ CONFIG_TESTING_OSTEST=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig index 5734ae6789a..ab456c9b379 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig @@ -26,6 +26,7 @@ CONFIG_EXAMPLES_ALARM=y CONFIG_EXAMPLES_RANDOM=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 @@ -59,4 +60,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/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig b/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig index 9241a5f24df..bfe17406b3e 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig +++ b/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig @@ -27,6 +27,7 @@ CONFIG_EXAMPLES_NXHELLO=y CONFIG_EXAMPLES_NXHELLO_BPP=1 CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_FRAMEBUFFER=y @@ -68,4 +69,3 @@ CONFIG_STM32L4_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/stm32l4/nucleo-l496zg/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig index 26a52ca4045..3bfb9e618f9 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig @@ -36,6 +36,7 @@ CONFIG_I2C=y CONFIG_I2CTOOL_MAXBUS=4 CONFIG_I2CTOOL_MINBUS=1 CONFIG_I2C_RESET=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_REGIONS=2 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -94,4 +95,3 @@ CONFIG_SYSTEM_TEE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig index bdd91bec6a7..d4d3b5c7235 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig +++ b/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig @@ -30,6 +30,7 @@ CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y CONFIG_HAVE_CXX=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBM=y CONFIG_NSH_ARCHINIT=y @@ -64,4 +65,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig index ea933aacddf..014e0003dc8 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig +++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig @@ -32,6 +32,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_MTD=y CONFIG_MTD_N25QXXX=y @@ -71,4 +72,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYS_RESERVED=9 CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig index 015f0860eb0..d0fb29cfbbb 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig +++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig @@ -34,6 +34,7 @@ CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MTD=y CONFIG_MTD_N25QXXX=y @@ -71,4 +72,3 @@ CONFIG_STM32L4_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/stm32l4/stm32l476vg-disco/kernel/Makefile b/boards/arm/stm32l4/stm32l476vg-disco/kernel/Makefile index 2623a08194a..ce3d6fc5a92 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/kernel/Makefile +++ b/boards/arm/stm32l4/stm32l476vg-disco/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/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c index 75f0ee657af..d453529493a 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_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/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig index b2a72d658de..e98549dba5a 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig @@ -35,6 +35,8 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_I2C=y CONFIG_I2C_DRIVER=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_MTD=y @@ -77,5 +79,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART4_BAUD=2000000 CONFIG_UART4_RXBUFSIZE=512 CONFIG_UART4_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig index 957305c25f9..383be947a7d 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig @@ -36,6 +36,7 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_I2C=y CONFIG_I2C_DRIVER=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_MTD=y @@ -77,4 +78,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART4_BAUD=2000000 CONFIG_UART4_RXBUFSIZE=512 CONFIG_UART4_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile index 78bf862f4e6..37af9889bd5 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/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/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c index bc535725644..69a8d026a65 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_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/stm32l5/nucleo-l552ze/configs/nsh/defconfig b/boards/arm/stm32l5/nucleo-l552ze/configs/nsh/defconfig index 933ecbdefea..4788e8c33d6 100644 --- a/boards/arm/stm32l5/nucleo-l552ze/configs/nsh/defconfig +++ b/boards/arm/stm32l5/nucleo-l552ze/configs/nsh/defconfig @@ -34,6 +34,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INPUT=y CONFIG_INPUT_BUTTONS=y CONFIG_INPUT_BUTTONS_LOWER=y @@ -61,4 +62,3 @@ CONFIG_SYSTEM_STACKMONITOR=y CONFIG_SYSTEM_TEE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig b/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig index 2b12b7cf6f4..002033c18bb 100644 --- a/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig +++ b/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/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="nsh_main" CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_IFUPDOWN=y @@ -54,4 +55,3 @@ CONFIG_SYSTEM_STACKMONITOR=y CONFIG_SYSTEM_TEE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig index e4a699d9f5a..df2a537ae7e 100644 --- a/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig +++ b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig @@ -22,6 +22,7 @@ CONFIG_ENC28J60=y CONFIG_EXAMPLES_NETTEST=y CONFIG_EXAMPLES_NETTEST_NOMAC=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nettest_main" CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETUTILS_NETLIB=y @@ -48,4 +49,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_BAUD=38400 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=38400 -CONFIG_USER_ENTRYPOINT="nettest_main" diff --git a/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig b/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig index 07829d1c5f7..8d5cff18313 100644 --- a/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig +++ b/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig @@ -19,6 +19,7 @@ CONFIG_ARM_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=1431 CONFIG_FS_FAT=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MMCSD=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_FILEIOSIZE=512 @@ -42,4 +43,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/tiva/dk-tm4c129x/README.txt b/boards/arm/tiva/dk-tm4c129x/README.txt index 5719e25e70b..b94d670d01d 100644 --- a/boards/arm/tiva/dk-tm4c129x/README.txt +++ b/boards/arm/tiva/dk-tm4c129x/README.txt @@ -681,7 +681,7 @@ Where is one of the following: CONFIG_SCHED_HPWORKSTACKSIZE=2048 CONFIG_IDLETHREAD_STACKSIZE=1024 - CONFIG_USERMAIN_STACKSIZE=2048 + CONFIG_INIT_STACKSIZE=2048 CONFIG_PTHREAD_STACK_DEFAULT=2048 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048 diff --git a/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig index d9b7cfcc5c2..55de9996549 100644 --- a/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig +++ b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig @@ -25,6 +25,7 @@ CONFIG_BUILTIN=y CONFIG_HOST_WINDOWS=y CONFIG_I2CTOOL_MAXBUS=6 CONFIG_I2CTOOL_MINBUS=6 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y CONFIG_NET=y @@ -71,4 +72,3 @@ CONFIG_TIVA_I2C6=y CONFIG_TIVA_PHY_INTERRUPTS=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig b/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig index 387b8b1ccbb..71e46ec90c9 100644 --- a/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig +++ b/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig @@ -24,6 +24,7 @@ CONFIG_BUILTIN=y CONFIG_HOST_WINDOWS=y CONFIG_I2CTOOL_MAXBUS=6 CONFIG_I2CTOOL_MINBUS=6 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y CONFIG_NET=y @@ -73,4 +74,3 @@ CONFIG_TIVA_I2C6=y CONFIG_TIVA_PHY_INTERRUPTS=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/eagle100/configs/httpd/defconfig b/boards/arm/tiva/eagle100/configs/httpd/defconfig index bfff3a38622..9b5091cc452 100644 --- a/boards/arm/tiva/eagle100/configs/httpd/defconfig +++ b/boards/arm/tiva/eagle100/configs/httpd/defconfig @@ -20,6 +20,7 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_EXAMPLES_WEBSERVER=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="webserver_main" CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NETUTILS_WEBSERVER=y @@ -55,4 +56,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="webserver_main" diff --git a/boards/arm/tiva/eagle100/configs/nettest/defconfig b/boards/arm/tiva/eagle100/configs/nettest/defconfig index 3b6dd9c6b12..156a38bd659 100644 --- a/boards/arm/tiva/eagle100/configs/nettest/defconfig +++ b/boards/arm/tiva/eagle100/configs/nettest/defconfig @@ -21,6 +21,7 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_NETTEST=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nettest_main" CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NET_ICMP=y @@ -51,4 +52,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nettest_main" diff --git a/boards/arm/tiva/eagle100/configs/nsh/defconfig b/boards/arm/tiva/eagle100/configs/nsh/defconfig index 0e20a2adae9..be5ba285bca 100644 --- a/boards/arm/tiva/eagle100/configs/nsh/defconfig +++ b/boards/arm/tiva/eagle100/configs/nsh/defconfig @@ -18,6 +18,7 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MMCSD=y CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_NET=y @@ -65,4 +66,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/eagle100/configs/nxflat/defconfig b/boards/arm/tiva/eagle100/configs/nxflat/defconfig index 0618569dbc7..2d71ae694fa 100644 --- a/boards/arm/tiva/eagle100/configs/nxflat/defconfig +++ b/boards/arm/tiva/eagle100/configs/nxflat/defconfig @@ -20,6 +20,8 @@ CONFIG_CONSOLE_SYSLOG=y CONFIG_DISABLE_ENVIRON=y CONFIG_EXAMPLES_NXFLAT=y CONFIG_FS_ROMFS=y +CONFIG_INIT_ENTRYPOINT="nxflat_main" +CONFIG_INIT_STACKSIZE=4096 CONFIG_LIBM=y CONFIG_NXFLAT=y CONFIG_PREALLOC_TIMERS=4 @@ -43,5 +45,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=4096 -CONFIG_USER_ENTRYPOINT="nxflat_main" diff --git a/boards/arm/tiva/eagle100/configs/thttpd/defconfig b/boards/arm/tiva/eagle100/configs/thttpd/defconfig index 0de428ba959..bf300539873 100644 --- a/boards/arm/tiva/eagle100/configs/thttpd/defconfig +++ b/boards/arm/tiva/eagle100/configs/thttpd/defconfig @@ -21,6 +21,8 @@ CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_THTTPD=y CONFIG_FS_ROMFS=y +CONFIG_INIT_ENTRYPOINT="thttp_main" +CONFIG_INIT_STACKSIZE=8192 CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NETUTILS_THTTPD=y @@ -59,5 +61,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=8192 -CONFIG_USER_ENTRYPOINT="thttp_main" diff --git a/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig b/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig index 224b6cb036f..dfdbd615759 100644 --- a/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig +++ b/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig @@ -20,6 +20,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_FS_FAT=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MMCSD=y CONFIG_MMCSD_NSLOTS=0 CONFIG_NET=y @@ -65,4 +66,3 @@ CONFIG_TIVA_GPIOF_IRQS=y CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig b/boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig index 64ee7e8ee06..8c97d4cac5f 100644 --- a/boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig +++ b/boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig @@ -22,6 +22,7 @@ CONFIG_BOARD_LOOPSPERMSEC=8192 CONFIG_BUILTIN=y CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -40,4 +41,3 @@ CONFIG_START_MONTH=12 CONFIG_SYSTEM_NSH=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig b/boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig index 5d687112c10..c69a289b5fe 100644 --- a/boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig +++ b/boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig @@ -23,6 +23,7 @@ CONFIG_BOARD_LOOPSPERMSEC=8192 CONFIG_BUILTIN=y CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -41,4 +42,3 @@ CONFIG_START_MONTH=12 CONFIG_SYSTEM_NSH=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig index 8a5f2046356..be2d67b3d00 100644 --- a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=4531 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSCLIENT_ENTRIES=4 @@ -55,4 +56,3 @@ CONFIG_TIVA_GPIOB_IRQS=y CONFIG_TIVA_UART0=y CONFIG_TIVA_UART1=y CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig index 636a7dd5b22..0cdffc058e6 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig @@ -21,6 +21,7 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_EXAMPLES_HELLO=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MMCSD=y CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_NET=y @@ -79,4 +80,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig index d59563010c7..737c731698a 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig @@ -19,6 +19,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_FS_FAT=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MMCSD=y CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_NET=y @@ -67,4 +68,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig index ac598e6362b..177ced3e232 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig @@ -29,6 +29,7 @@ CONFIG_EXAMPLES_NX_COLOR1=0x0a CONFIG_EXAMPLES_NX_COLOR2=0x0c CONFIG_EXAMPLES_NX_FONTCOLOR=0x00 CONFIG_EXAMPLES_NX_TBCOLOR=0x08 +CONFIG_INIT_ENTRYPOINT="nx_main" CONFIG_LCD=y CONFIG_LCD_P14201=y CONFIG_MQ_MAXMSGSIZE=64 @@ -64,4 +65,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nx_main" diff --git a/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig index ac37c0cf336..5a188b088fa 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig @@ -41,6 +41,7 @@ CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y CONFIG_HOST_MACOS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_DLFCN=y CONFIG_LIBC_ENVPATH=y CONFIG_MMCSD=y @@ -107,4 +108,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_TIVA_WITH_QEMU=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/lm3s6965-ek/configs/qemu-nxflat/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/qemu-nxflat/defconfig index 0968d1deb9e..4fc24229a53 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/qemu-nxflat/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/qemu-nxflat/defconfig @@ -20,6 +20,7 @@ CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_CLOCK_MONOTONIC=y CONFIG_EXAMPLES_NXFLAT=y CONFIG_FS_ROMFS=y +CONFIG_INIT_ENTRYPOINT="nxflat_main" CONFIG_LIBM=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y @@ -66,4 +67,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_TIVA_WITH_QEMU=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nxflat_main" diff --git a/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig index b04ee6e94d4..738e24383d9 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig @@ -43,6 +43,7 @@ CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y CONFIG_HOST_MACOS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_DLFCN=y CONFIG_LIBC_ENVPATH=y CONFIG_MMCSD=y @@ -113,4 +114,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_TIVA_WITH_QEMU=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig index 698ce69b535..c63aecafeb3 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig @@ -20,6 +20,7 @@ CONFIG_EXAMPLES_TCPECHO_DRIPADDR=0xc0a80201 CONFIG_EXAMPLES_TCPECHO_IPADDR=0xc0a80232 CONFIG_EXAMPLES_TCPECHO_NOMAC=y CONFIG_FS_FAT=y +CONFIG_INIT_ENTRYPOINT="tcpecho_main" CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSCLIENT_ENTRIES=4 @@ -63,4 +64,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="tcpecho_main" diff --git a/boards/arm/tiva/lm3s6965-ek/kernel/Makefile b/boards/arm/tiva/lm3s6965-ek/kernel/Makefile index bd4707beab3..50bc5904bb5 100644 --- a/boards/arm/tiva/lm3s6965-ek/kernel/Makefile +++ b/boards/arm/tiva/lm3s6965-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/tiva/lm3s6965-ek/kernel/lm_userspace.c b/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c index f51b6d2b7ab..cb3e2328dcc 100644 --- a/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c +++ b/boards/arm/tiva/lm3s6965-ek/kernel/lm_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/tiva/lm3s8962-ek/configs/nsh/defconfig b/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig index a35541cfc30..2000458af48 100644 --- a/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig @@ -19,6 +19,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MMCSD=y CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_NET=y @@ -66,4 +67,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig b/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig index 861f9cd5837..cdf2bde99e6 100644 --- a/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig +++ b/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig @@ -29,6 +29,7 @@ CONFIG_EXAMPLES_NX_COLOR2=12 CONFIG_EXAMPLES_NX_FONTCOLOR=0 CONFIG_EXAMPLES_NX_TBCOLOR=8 CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nx_main" CONFIG_LCD=y CONFIG_LCD_P14201=y CONFIG_MQ_MAXMSGSIZE=64 @@ -64,4 +65,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nx_main" diff --git a/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig b/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig index 0e5e9b1bd21..24c2192c4e9 100644 --- a/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig +++ b/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig @@ -20,6 +20,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_BUILTIN=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 @@ -45,4 +46,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig b/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig index 28dd06d50bf..5468afad8f5 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig +++ b/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig @@ -26,6 +26,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_EXAMPLES_CAN=y CONFIG_EXAMPLES_CAN_READ=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MCP2515_PHASESEG1=3 CONFIG_MCP2515_PROPSEG=1 CONFIG_MCP2515_SPI_SCK_FREQUENCY=4000000 @@ -56,4 +57,3 @@ CONFIG_TIVA_GPIOF_IRQS=y CONFIG_TIVA_SSI2=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig b/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig index 5c70046a6bf..d8fa9972254 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig +++ b/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig @@ -21,6 +21,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_BUILTIN=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 @@ -46,4 +47,3 @@ CONFIG_TIVA_GPIOF_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/tm4c1294-launchpad/README.txt b/boards/arm/tiva/tm4c1294-launchpad/README.txt index 2db4a997f9f..a3df5fc399a 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/README.txt +++ b/boards/arm/tiva/tm4c1294-launchpad/README.txt @@ -60,7 +60,7 @@ Where is one of the following: CONFIG_SCHED_HPWORKSTACKSIZE=2048 CONFIG_IDLETHREAD_STACKSIZE=1024 - CONFIG_USERMAIN_STACKSIZE=2048 + CONFIG_INIT_STACKSIZE=2048 CONFIG_PTHREAD_STACK_DEFAULT=2048 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048 diff --git a/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig b/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig index 70dafb67c6a..b3323e9eb6d 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig +++ b/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig @@ -24,6 +24,7 @@ CONFIG_BUILTIN=y CONFIG_I2C=y CONFIG_I2CTOOL_MAXBUS=6 CONFIG_I2CTOOL_MINBUS=6 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y CONFIG_NET=y @@ -66,4 +67,3 @@ CONFIG_TIVA_I2C6=y CONFIG_TIVA_PHY_INTERRUPTS=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig b/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig index 6ee1e6c9555..a869983e558 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig +++ b/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig @@ -22,6 +22,7 @@ CONFIG_BUILTIN=y CONFIG_I2C=y CONFIG_I2CTOOL_MAXBUS=6 CONFIG_I2CTOOL_MINBUS=6 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y CONFIG_NET=y @@ -65,4 +66,3 @@ CONFIG_TIVA_I2C0=y CONFIG_TIVA_PHY_INTERRUPTS=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig b/boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig index a68161f0d28..66ba72ad3d6 100644 --- a/boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig +++ b/boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig @@ -25,6 +25,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y CONFIG_I2C=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 @@ -49,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_TMS570_GIO_IRQ=y CONFIG_TMS570_SCI1=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig b/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig index ce9fc20de7f..3526727a511 100644 --- a/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig +++ b/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig @@ -24,6 +24,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_I2C=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -49,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_TMS570_GIO_IRQ=y CONFIG_TMS570_SCI1=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig b/boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig index 02a8ce3849c..1b015fe0f60 100644 --- a/boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig +++ b/boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig @@ -32,6 +32,7 @@ CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y CONFIG_I2CTOOL_MAXBUS=0 CONFIG_I2C_RESET=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MTD=y @@ -58,6 +59,5 @@ CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_XMC4_USIC0=y CONFIG_XMC4_USIC0_CHAN1_NONE=y diff --git a/boards/arm/xmc4/xmc4700-relax/configs/nsh/defconfig b/boards/arm/xmc4/xmc4700-relax/configs/nsh/defconfig index fc441a4eec7..35ce6b87d9c 100644 --- a/boards/arm/xmc4/xmc4700-relax/configs/nsh/defconfig +++ b/boards/arm/xmc4/xmc4700-relax/configs/nsh/defconfig @@ -20,6 +20,7 @@ CONFIG_ARMV7M_LAZYFPU=y CONFIG_BOARD_LOOPSPERMSEC=8000 CONFIG_BUILTIN=y CONFIG_DEBUG_NOOPT=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -40,6 +41,5 @@ CONFIG_START_YEAR=2014 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_XMC4_USIC0=y CONFIG_XMC4_USIC0_CHAN1_NONE=y diff --git a/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig b/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig index c3668f2a7c5..c95eb2f7a7e 100644 --- a/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig +++ b/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig @@ -25,6 +25,7 @@ CONFIG_BOARD_LOOPSPERMSEC=1140 CONFIG_ENDIAN_BIG=y CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 @@ -40,4 +41,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_BAUD=57600 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig b/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig index 62f78fde7aa..3515acf18bf 100644 --- a/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig +++ b/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig @@ -25,6 +25,7 @@ CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_ENDIAN_BIG=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="ostest_main" CONFIG_INTELHEX_BINARY=y CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=32768 @@ -39,4 +40,3 @@ CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=1024 CONFIG_USART1_BAUD=57600 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/avr/at90usb/micropendous3/configs/hello/defconfig b/boards/avr/at90usb/micropendous3/configs/hello/defconfig index e449be2294b..4cd01edb7c4 100644 --- a/boards/avr/at90usb/micropendous3/configs/hello/defconfig +++ b/boards/avr/at90usb/micropendous3/configs/hello/defconfig @@ -22,6 +22,8 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y CONFIG_IDLETHREAD_STACKSIZE=512 +CONFIG_INIT_ENTRYPOINT="hello_main" +CONFIG_INIT_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4 CONFIG_NUNGET_CHARS=0 @@ -37,5 +39,3 @@ CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_BAUD=38400 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=512 -CONFIG_USER_ENTRYPOINT="hello_main" diff --git a/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig b/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig index 2c2b86e3f5b..a3cf8762f08 100644 --- a/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig +++ b/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig @@ -22,6 +22,8 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y CONFIG_IDLETHREAD_STACKSIZE=512 +CONFIG_INIT_ENTRYPOINT="hello_main" +CONFIG_INIT_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4 CONFIG_NUNGET_CHARS=0 @@ -37,5 +39,3 @@ CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_BAUD=38400 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=512 -CONFIG_USER_ENTRYPOINT="hello_main" diff --git a/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig b/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig index 03e78141b11..a38e2398d70 100644 --- a/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig +++ b/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig @@ -24,6 +24,8 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y CONFIG_IDLETHREAD_STACKSIZE=512 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NUNGET_CHARS=0 @@ -41,5 +43,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_BAUD=38400 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=512 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig index 46e884d8a10..d48e0414428 100644 --- a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig +++ b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig @@ -23,6 +23,8 @@ CONFIG_BOARD_LOOPSPERMSEC=864 CONFIG_CONSOLE_SYSLOG=y CONFIG_DEFAULT_SMALL=y CONFIG_IDLETHREAD_STACKSIZE=512 +CONFIG_INIT_ENTRYPOINT="msconn_main" +CONFIG_INIT_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_MMCSD=y CONFIG_MMCSD_SPICLOCK=12500000 @@ -56,5 +58,3 @@ CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_SCSI_STACKSIZE=512 CONFIG_USBMSC_VERSIONNO=0x0399 -CONFIG_USERMAIN_STACKSIZE=512 -CONFIG_USER_ENTRYPOINT="msconn_main" diff --git a/boards/avr/atmega/amber/configs/hello/defconfig b/boards/avr/atmega/amber/configs/hello/defconfig index e39e2d955d0..97f66dab8af 100644 --- a/boards/avr/atmega/amber/configs/hello/defconfig +++ b/boards/avr/atmega/amber/configs/hello/defconfig @@ -22,6 +22,8 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y CONFIG_IDLETHREAD_STACKSIZE=512 +CONFIG_INIT_ENTRYPOINT="hello_main" +CONFIG_INIT_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4 CONFIG_NUNGET_CHARS=0 @@ -37,5 +39,3 @@ CONFIG_STDIO_BUFFER_SIZE=0 CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_BAUD=38400 CONFIG_USART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=512 -CONFIG_USER_ENTRYPOINT="hello_main" diff --git a/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig b/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig index 023e840a69b..39678e94fde 100644 --- a/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig +++ b/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig @@ -24,6 +24,8 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y CONFIG_IDLETHREAD_STACKSIZE=128 +CONFIG_INIT_ENTRYPOINT="hello_main" +CONFIG_INIT_STACKSIZE=128 CONFIG_INTELHEX_BINARY=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4 CONFIG_NUNGET_CHARS=0 @@ -40,5 +42,3 @@ CONFIG_STDIO_BUFFER_SIZE=0 CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_BAUD=38400 CONFIG_USART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=128 -CONFIG_USER_ENTRYPOINT="hello_main" diff --git a/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig b/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig index 5635e5c9681..2c08cbcefc6 100644 --- a/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig +++ b/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig @@ -22,6 +22,8 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y CONFIG_IDLETHREAD_STACKSIZE=128 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=768 CONFIG_INTELHEX_BINARY=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4 CONFIG_NUNGET_CHARS=0 @@ -41,5 +43,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768 CONFIG_USART0_BAUD=38400 CONFIG_USART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=768 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/avr/atmega/moteino-mega/configs/hello/defconfig b/boards/avr/atmega/moteino-mega/configs/hello/defconfig index f508d8f98dd..c3cbb387bde 100644 --- a/boards/avr/atmega/moteino-mega/configs/hello/defconfig +++ b/boards/avr/atmega/moteino-mega/configs/hello/defconfig @@ -22,6 +22,8 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y CONFIG_IDLETHREAD_STACKSIZE=512 +CONFIG_INIT_ENTRYPOINT="hello_main" +CONFIG_INIT_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4 CONFIG_NUNGET_CHARS=0 @@ -35,5 +37,3 @@ CONFIG_START_YEAR=2015 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=512 -CONFIG_USER_ENTRYPOINT="hello_main" diff --git a/boards/avr/atmega/moteino-mega/configs/nsh/defconfig b/boards/avr/atmega/moteino-mega/configs/nsh/defconfig index f5147f731d7..093093bedf8 100644 --- a/boards/avr/atmega/moteino-mega/configs/nsh/defconfig +++ b/boards/avr/atmega/moteino-mega/configs/nsh/defconfig @@ -24,6 +24,8 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y CONFIG_IDLETHREAD_STACKSIZE=512 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NUNGET_CHARS=0 @@ -39,5 +41,3 @@ CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=512 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig b/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig index 785e945dc2b..8edaf49f4c0 100644 --- a/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig +++ b/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig @@ -25,6 +25,8 @@ CONFIG_HCS12_NONBANKED=y CONFIG_HCS12_SCI0=y CONFIG_HCS12_SERIALMON=y CONFIG_IDLETHREAD_STACKSIZE=256 +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=512 CONFIG_MOTOROLA_SREC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3 CONFIG_NUNGET_CHARS=0 @@ -45,5 +47,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=512 -CONFIG_USERMAIN_STACKSIZE=512 -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/hc/m9s12/ne64badge/configs/ostest/defconfig b/boards/hc/m9s12/ne64badge/configs/ostest/defconfig index ae15d38949f..06041b1c4b8 100644 --- a/boards/hc/m9s12/ne64badge/configs/ostest/defconfig +++ b/boards/hc/m9s12/ne64badge/configs/ostest/defconfig @@ -24,6 +24,8 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_HCS12_NONBANKED=y CONFIG_HCS12_SCI0=y CONFIG_IDLETHREAD_STACKSIZE=256 +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=512 CONFIG_MOTOROLA_SREC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3 CONFIG_NUNGET_CHARS=0 @@ -45,5 +47,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=512 -CONFIG_USERMAIN_STACKSIZE=512 -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig b/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig index ef95ef109b2..d65f5a06ad8 100644 --- a/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig +++ b/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig @@ -25,6 +25,7 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_PIC32MX_DEBUGGER=1 CONFIG_PIC32MX_ICESEL=2 @@ -41,4 +42,3 @@ CONFIG_START_YEAR=2012 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig b/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig index 0e641472d84..83ac40436fe 100644 --- a/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig +++ b/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig @@ -26,6 +26,7 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_FS_NXFFS=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MIPS32_TOOLCHAIN_PINGUINOW=y CONFIG_MTD=y @@ -47,4 +48,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig index aaa2e69d561..2a52840aa0a 100644 --- a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig +++ b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig @@ -24,6 +24,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MMCSD=y CONFIG_MTD=y @@ -48,4 +49,3 @@ CONFIG_START_YEAR=2012 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig index 9deda0790fb..282c4ef6ef6 100644 --- a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig +++ b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig @@ -28,6 +28,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MMCSD=y CONFIG_MTD=y @@ -75,4 +76,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig b/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig index 0af7e9e8105..fe3d7984c2e 100644 --- a/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig +++ b/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig @@ -28,6 +28,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MIPS32_TOOLCHAIN_PINGUINOW=y CONFIG_MMCSD=y @@ -92,4 +93,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/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig b/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig index 9c37b031623..247f3c85a1e 100644 --- a/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig +++ b/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig @@ -21,6 +21,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5580 CONFIG_BUILTIN=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -42,4 +43,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART2_RXBUFSIZE=64 CONFIG_UART2_SERIAL_CONSOLE=y CONFIG_UART2_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig b/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig index ed2e76d0f62..f7fcf6925b9 100644 --- a/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig +++ b/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig @@ -27,6 +27,7 @@ CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -51,4 +52,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART2_RXBUFSIZE=64 CONFIG_UART2_TXBUFSIZE=64 CONFIG_USBDEV=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/mips/pic32mx/ubw32/configs/nsh/defconfig b/boards/mips/pic32mx/ubw32/configs/nsh/defconfig index 4791ba62270..6facdbd9cab 100644 --- a/boards/mips/pic32mx/ubw32/configs/nsh/defconfig +++ b/boards/mips/pic32mx/ubw32/configs/nsh/defconfig @@ -26,6 +26,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MMCSD=y CONFIG_NSH_ARCHINIT=y @@ -46,4 +47,3 @@ CONFIG_START_YEAR=2012 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/mips/pic32mz/chipkit-wifire/configs/nsh/defconfig b/boards/mips/pic32mz/chipkit-wifire/configs/nsh/defconfig index 133effc5b72..8acd7bb7137 100644 --- a/boards/mips/pic32mz/chipkit-wifire/configs/nsh/defconfig +++ b/boards/mips/pic32mz/chipkit-wifire/configs/nsh/defconfig @@ -23,6 +23,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MIPS_MICROMIPS=y CONFIG_MMCSD=y @@ -46,4 +47,3 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2012 CONFIG_SYSTEM_NSH=y CONFIG_UART4_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig index 4f042f3ace0..9dc4dffa991 100644 --- a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig +++ b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig @@ -23,6 +23,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MIPS32_TOOLCHAIN_PINGUINOW=y CONFIG_MIPS_MICROMIPS=y @@ -47,4 +48,3 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2012 CONFIG_SYSTEM_NSH=y CONFIG_UART3_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig index 9eab6e669c8..cdfb254679a 100644 --- a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig +++ b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig @@ -26,6 +26,7 @@ CONFIG_FLIPNCLICK_PIC32MZ_SSD1306=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_HILETGO=y @@ -58,4 +59,3 @@ CONFIG_START_DAY=10 CONFIG_START_MONTH=2 CONFIG_SYSTEM_NSH=y CONFIG_UART3_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig b/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig index 05d077f5aa0..0fec9389f0e 100644 --- a/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig +++ b/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig @@ -24,6 +24,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MIPS32_TOOLCHAIN_PINGUINOW=y CONFIG_MIPS_MICROMIPS=y @@ -48,4 +49,3 @@ CONFIG_START_YEAR=2012 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/misoc/lm32/misoc/configs/hello/defconfig b/boards/misoc/lm32/misoc/configs/hello/defconfig index 9d46b399c1f..cf48b3b3aaf 100644 --- a/boards/misoc/lm32/misoc/configs/hello/defconfig +++ b/boards/misoc/lm32/misoc/configs/hello/defconfig @@ -34,6 +34,7 @@ CONFIG_EXAMPLES_TELNETD_IPADDR=0xc0a80132 CONFIG_EXAMPLES_TELNETD_NOMAC=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_NBUFFERS=24 CONFIG_LIBC_HOSTNAME="nuttx" CONFIG_MISOC_ETHERNET=y @@ -80,4 +81,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/misoc/lm32/misoc/configs/nsh/defconfig b/boards/misoc/lm32/misoc/configs/nsh/defconfig index d910755f8da..35bd8a1a74b 100644 --- a/boards/misoc/lm32/misoc/configs/nsh/defconfig +++ b/boards/misoc/lm32/misoc/configs/nsh/defconfig @@ -52,6 +52,8 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXPERIMENTAL=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=4096 CONFIG_MISOC_UART1=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4 CONFIG_NSH_BUILTIN_APPS=y @@ -73,5 +75,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=4096 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/or1k/mor1kx/or1k/configs/nsh/defconfig b/boards/or1k/mor1kx/or1k/configs/nsh/defconfig index cf6d44f2800..aa7ef4c6912 100644 --- a/boards/or1k/mor1kx/or1k/configs/nsh/defconfig +++ b/boards/or1k/mor1kx/or1k/configs/nsh/defconfig @@ -67,6 +67,8 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 @@ -86,5 +88,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig index cd64b199fef..2da465820ec 100644 --- a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig +++ b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig @@ -20,6 +20,8 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_ENDIAN_BIG=y CONFIG_IDLETHREAD_STACKSIZE=256 +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=256 CONFIG_MOTOROLA_SREC=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 @@ -37,5 +39,3 @@ CONFIG_START_YEAR=2009 CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_TLS_NELEM=0 -CONFIG_USERMAIN_STACKSIZE=256 -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig b/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig index 5bc89e81211..f4e184a2c36 100644 --- a/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig +++ b/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig @@ -24,6 +24,8 @@ CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y CONFIG_EXAMPLES_SERIALRX_PRIORITY=75 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MOTOROLA_SREC=y CONFIG_NET=y CONFIG_NETDEV_PHY_IOCTL=y @@ -74,5 +76,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PRIORITY=50 CONFIG_SYSTEM_PING6=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig b/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig index 7eba4b11085..22ee3e686fe 100644 --- a/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig +++ b/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig @@ -22,6 +22,8 @@ CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y CONFIG_EXAMPLES_SERIALRX_PRIORITY=75 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MOTOROLA_SREC=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y @@ -78,5 +80,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PRIORITY=50 CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig index 66f483875c0..cad98516ca9 100644 --- a/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig +++ b/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig @@ -16,6 +16,8 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=15001 CONFIG_BUILTIN=y CONFIG_DEBUG_FEATURES=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MOTOROLA_SREC=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 @@ -33,5 +35,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig b/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig index f99b3f5f900..ee85c46e038 100644 --- a/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig +++ b/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig @@ -18,6 +18,8 @@ CONFIG_DEBUG_FEATURES=y CONFIG_ETH0_PHY_KSZ8081=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MOTOROLA_SREC=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y @@ -61,5 +63,3 @@ CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig index 5ffcbd91e6b..73cd5cf34d3 100644 --- a/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig +++ b/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig @@ -17,6 +17,8 @@ CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BUILTIN=y CONFIG_DEBUG_FEATURES=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MOTOROLA_SREC=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 @@ -34,5 +36,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig b/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig index 9cbfa63acc9..0cfdf4e770e 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig +++ b/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig @@ -24,6 +24,8 @@ CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y CONFIG_EXAMPLES_SERIALRX_PRIORITY=75 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MOTOROLA_SREC=y CONFIG_NET=y CONFIG_NETDEV_PHY_IOCTL=y @@ -73,5 +75,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PRIORITY=50 CONFIG_SYSTEM_PING6=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig b/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig index d02780a9cc1..4e53ff843ce 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig +++ b/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig @@ -22,6 +22,8 @@ CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y CONFIG_EXAMPLES_SERIALRX_PRIORITY=75 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MOTOROLA_SREC=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y @@ -76,5 +78,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PRIORITY=50 CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig index e6f524e1808..e9267e2e801 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig +++ b/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig @@ -18,6 +18,8 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=15001 CONFIG_BUILTIN=y CONFIG_DEBUG_FEATURES=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MOTOROLA_SREC=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -36,5 +38,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n/configs/nsh/defconfig index 03e93b6f31b..e37698d9280 100644 --- a/boards/renesas/rx65n/rx65n/configs/nsh/defconfig +++ b/boards/renesas/rx65n/rx65n/configs/nsh/defconfig @@ -16,6 +16,8 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_BUILTIN=y CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MOTOROLA_SREC=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 @@ -33,5 +35,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig b/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig index f4478656406..60ac1eb09f8 100644 --- a/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig +++ b/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig @@ -21,6 +21,8 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_ENDIAN_BIG=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MOTOROLA_SREC=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 @@ -41,5 +43,3 @@ CONFIG_START_YEAR=2008 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig index 7e8defbfd35..eb82b9cfc37 100644 --- a/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig +++ b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig @@ -21,6 +21,8 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_ENDIAN_BIG=y +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MOTOROLA_SREC=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 @@ -40,5 +42,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=4096 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/risc-v/bl602/bl602evb/configs/elf/defconfig b/boards/risc-v/bl602/bl602evb/configs/elf/defconfig index a39495a8683..66cfc25cc15 100644 --- a/boards/risc-v/bl602/bl602evb/configs/elf/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/elf/defconfig @@ -36,6 +36,8 @@ CONFIG_EXECFUNCS_SYSTEM_SYMTAB=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -71,5 +73,3 @@ CONFIG_UART0_BAUD=2000000 CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 -CONFIG_USERMAIN_STACKSIZE=8192 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/bl602/bl602evb/configs/fpu/defconfig b/boards/risc-v/bl602/bl602evb/configs/fpu/defconfig index db289708d8f..0a035e09e98 100644 --- a/boards/risc-v/bl602/bl602evb/configs/fpu/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/fpu/defconfig @@ -31,6 +31,8 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=8192 CONFIG_EXAMPLES_TIMER=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -64,5 +66,3 @@ CONFIG_UART0_BAUD=2000000 CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 -CONFIG_USERMAIN_STACKSIZE=8192 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/bl602/bl602evb/configs/gpio/defconfig b/boards/risc-v/bl602/bl602evb/configs/gpio/defconfig index 382ec9de3eb..7715b3f57c1 100644 --- a/boards/risc-v/bl602/bl602evb/configs/gpio/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/gpio/defconfig @@ -33,6 +33,8 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=8192 CONFIG_EXAMPLES_TIMER=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -64,5 +66,3 @@ CONFIG_UART0_BAUD=2000000 CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 -CONFIG_USERMAIN_STACKSIZE=8192 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/bl602/bl602evb/configs/i2c/defconfig b/boards/risc-v/bl602/bl602evb/configs/i2c/defconfig index fde1e895274..888fb23df9c 100644 --- a/boards/risc-v/bl602/bl602evb/configs/i2c/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/i2c/defconfig @@ -33,6 +33,8 @@ CONFIG_EXAMPLES_TIMER=y CONFIG_FS_PROCFS=y CONFIG_I2C=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -65,5 +67,3 @@ CONFIG_UART0_BAUD=2000000 CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 -CONFIG_USERMAIN_STACKSIZE=8192 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/bl602/bl602evb/configs/nsh/defconfig b/boards/risc-v/bl602/bl602evb/configs/nsh/defconfig index 56b46f839dd..1a87fcd986c 100644 --- a/boards/risc-v/bl602/bl602evb/configs/nsh/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/nsh/defconfig @@ -31,6 +31,8 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=8192 CONFIG_EXAMPLES_TIMER=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -62,5 +64,3 @@ CONFIG_UART0_BAUD=2000000 CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 -CONFIG_USERMAIN_STACKSIZE=8192 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/bl602/bl602evb/configs/spi/defconfig b/boards/risc-v/bl602/bl602evb/configs/spi/defconfig index c3b9428794d..c2fa1e82a76 100644 --- a/boards/risc-v/bl602/bl602evb/configs/spi/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/spi/defconfig @@ -32,6 +32,8 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=8192 CONFIG_EXAMPLES_TIMER=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -66,5 +68,3 @@ CONFIG_UART0_BAUD=2000000 CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 -CONFIG_USERMAIN_STACKSIZE=8192 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/bl602/bl602evb/configs/spiflash/defconfig b/boards/risc-v/bl602/bl602evb/configs/spiflash/defconfig index 1f15364e738..ad00230a9aa 100644 --- a/boards/risc-v/bl602/bl602evb/configs/spiflash/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/spiflash/defconfig @@ -33,6 +33,8 @@ CONFIG_EXAMPLES_TIMER=y CONFIG_FS_LITTLEFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -64,5 +66,3 @@ CONFIG_UART0_BAUD=2000000 CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 -CONFIG_USERMAIN_STACKSIZE=8192 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/bl602/bl602evb/configs/timer/defconfig b/boards/risc-v/bl602/bl602evb/configs/timer/defconfig index 9c5418ed5dc..4f6d123c825 100644 --- a/boards/risc-v/bl602/bl602evb/configs/timer/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/timer/defconfig @@ -34,6 +34,8 @@ CONFIG_EXAMPLES_TIMER=y CONFIG_EXAMPLES_WATCHDOG=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -71,6 +73,4 @@ CONFIG_UART0_BAUD=2000000 CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 -CONFIG_USERMAIN_STACKSIZE=8192 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig b/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig index 729cc454b4d..7e4351f3e5c 100644 --- a/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig @@ -51,6 +51,8 @@ CONFIG_EXAMPLES_TCPBLASTER_SERVERIP=0xc0a85802 CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=800 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1800 CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=146 CONFIG_IOB_NBUFFERS=64 @@ -131,7 +133,5 @@ CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=1800 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/risc-v/c906/smartl-c906/configs/elf/defconfig b/boards/risc-v/c906/smartl-c906/configs/elf/defconfig index eb63e400669..62d7a1cbd45 100644 --- a/boards/risc-v/c906/smartl-c906/configs/elf/defconfig +++ b/boards/risc-v/c906/smartl-c906/configs/elf/defconfig @@ -31,6 +31,8 @@ CONFIG_EXECFUNCS_SYSTEM_SYMTAB=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -63,5 +65,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUSIZE=264 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/c906/smartl-c906/configs/fpu/defconfig b/boards/risc-v/c906/smartl-c906/configs/fpu/defconfig index 5f0eb114382..d10e626689b 100644 --- a/boards/risc-v/c906/smartl-c906/configs/fpu/defconfig +++ b/boards/risc-v/c906/smartl-c906/configs/fpu/defconfig @@ -26,6 +26,8 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -57,5 +59,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUSIZE=264 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/c906/smartl-c906/configs/knsh/defconfig b/boards/risc-v/c906/smartl-c906/configs/knsh/defconfig index 0a3e1fa41f2..839186bbb32 100644 --- a/boards/risc-v/c906/smartl-c906/configs/knsh/defconfig +++ b/boards/risc-v/c906/smartl-c906/configs/knsh/defconfig @@ -27,6 +27,8 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -61,5 +63,3 @@ CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/c906/smartl-c906/configs/module/defconfig b/boards/risc-v/c906/smartl-c906/configs/module/defconfig index 7eec8f3f367..7f7238ef203 100644 --- a/boards/risc-v/c906/smartl-c906/configs/module/defconfig +++ b/boards/risc-v/c906/smartl-c906/configs/module/defconfig @@ -30,6 +30,8 @@ CONFIG_EXAMPLES_MODULE=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_PERROR_STDOUT=y @@ -65,5 +67,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUSIZE=264 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/c906/smartl-c906/configs/nsh/defconfig b/boards/risc-v/c906/smartl-c906/configs/nsh/defconfig index 5e5c0782c51..193335211f5 100644 --- a/boards/risc-v/c906/smartl-c906/configs/nsh/defconfig +++ b/boards/risc-v/c906/smartl-c906/configs/nsh/defconfig @@ -25,6 +25,8 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -55,5 +57,3 @@ CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig b/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig index 7eb2c465954..13270546828 100644 --- a/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig +++ b/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig @@ -30,6 +30,8 @@ CONFIG_EXAMPLES_SOTEST=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_DLFCN=y CONFIG_LIBC_EXECFUNCS=y @@ -63,5 +65,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUSIZE=264 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/c906/smartl-c906/kernel/Makefile b/boards/risc-v/c906/smartl-c906/kernel/Makefile index 0473abd739e..59c7db4e3e2 100644 --- a/boards/risc-v/c906/smartl-c906/kernel/Makefile +++ b/boards/risc-v/c906/smartl-c906/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)) # The memory layout diff --git a/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c b/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c index b6bed552d66..9dc0729a925 100644 --- a/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c +++ b/boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c @@ -75,13 +75,13 @@ extern uintptr_t *__ld_usram_end; /* End+1 of user ram section */ /* 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/risc-v/esp32c3/esp32c3-devkit/configs/adc/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/adc/defconfig index fccb5b07206..dc015ea042a 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/adc/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/adc/defconfig @@ -27,6 +27,7 @@ CONFIG_EXAMPLES_ADC_GROUPSIZE=1 CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -45,4 +46,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/autopm/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/autopm/defconfig index d39bdcfce67..0adab7cb2d7 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/autopm/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/autopm/defconfig @@ -28,6 +28,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_NAME_MAX=48 @@ -61,7 +62,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/ble/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/ble/defconfig index 6e41ceb6611..7d05c3ce52f 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/ble/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/ble/defconfig @@ -26,6 +26,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NAME_MAX=48 CONFIG_NET_BLUETOOTH=y @@ -45,6 +46,5 @@ CONFIG_SIG_DEFAULT=y CONFIG_SPINLOCK=y CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_BLUETOOTH=y diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig index 54bd3756cce..f630122a8d9 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig @@ -24,6 +24,7 @@ CONFIG_ESP32C3_I2C0=y CONFIG_EXAMPLES_BMP180=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -44,4 +45,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/efuse/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/efuse/defconfig index 5301b4d11e4..9c9a8f1739b 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/efuse/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/efuse/defconfig @@ -27,6 +27,7 @@ CONFIG_EFUSE=y CONFIG_ESP32C3_EFUSE=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -45,4 +46,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig index 78af327e199..d81d8518463 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig @@ -29,6 +29,8 @@ CONFIG_EXECFUNCS_SYSTEM_SYMTAB=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -52,5 +54,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=12 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=8192 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=8192 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig index 61adaf4cf21..4370b243247 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig @@ -25,6 +25,7 @@ CONFIG_ESP32C3_GPIO_IRQ=y CONFIG_EXAMPLES_GPIO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -45,4 +46,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=12 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/lvgl/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/lvgl/defconfig index aea56fc1bdf..2773caa0ea3 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/lvgl/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/lvgl/defconfig @@ -27,6 +27,7 @@ CONFIG_EXAMPLES_LVGLDEMO_WIDGETS_SLIDESHOW=y CONFIG_FS_PROCFS=y CONFIG_GRAPHICS_LVGL=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_DEV=y @@ -55,4 +56,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_confirm/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_confirm/defconfig index 63ab59e2a69..6123b69bf60 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_confirm/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_confirm/defconfig @@ -29,6 +29,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_FS_SMARTFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -54,4 +55,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TESTING_FSTEST=y CONFIG_TESTING_FSTEST_MOUNTPT="/mnt" CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/module/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/module/defconfig index 3aa26282964..3041a269fe9 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/module/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/module/defconfig @@ -26,6 +26,7 @@ CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MODULE=y CONFIG_NSH_ARCHINIT=y @@ -43,4 +44,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig index c89a3613823..c7ea32e4d19 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig @@ -22,6 +22,7 @@ CONFIG_BUILTIN=y CONFIG_DEV_ZERO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -40,4 +41,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/oneshot/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/oneshot/defconfig index afbb72f34c3..381366fa928 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/oneshot/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/oneshot/defconfig @@ -28,6 +28,7 @@ CONFIG_EXAMPLES_ONESHOT_DELAY=2000000 CONFIG_EXAMPLES_TIMER=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -48,4 +49,3 @@ CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_TIMER=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/ostest/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/ostest/defconfig index 6def6a02e77..6ba3638b5db 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/ostest/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/ostest/defconfig @@ -22,6 +22,7 @@ CONFIG_BUILTIN=y CONFIG_DEV_ZERO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -41,4 +42,3 @@ CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/pm/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/pm/defconfig index 4ad4a9828a2..4e3da1f9f31 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/pm/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/pm/defconfig @@ -22,6 +22,7 @@ CONFIG_BUILTIN=y CONFIG_DEV_ZERO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -43,4 +44,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/pwm/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/pwm/defconfig index d45bc387680..dd135006a7c 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/pwm/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/pwm/defconfig @@ -25,6 +25,7 @@ CONFIG_ESP32C3_LEDC_TIM0=y CONFIG_EXAMPLES_PWM=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -43,4 +44,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/random/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/random/defconfig index 339bc0b7c3d..0e21fd48f23 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/random/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/random/defconfig @@ -25,6 +25,7 @@ CONFIG_ESP32C3_RNG=y CONFIG_EXAMPLES_RANDOM=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -43,4 +44,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/romfs/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/romfs/defconfig index 25de5922c35..139a76638c9 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/romfs/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/romfs/defconfig @@ -24,6 +24,7 @@ CONFIG_EXAMPLES_ROMFS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -45,4 +46,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/rtc/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/rtc/defconfig index f5be78b297a..a5141d3f59f 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/rtc/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/rtc/defconfig @@ -24,6 +24,7 @@ CONFIG_ESP32C3_RT_TIMER=y CONFIG_EXAMPLES_ALARM=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -46,4 +47,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sotest/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/sotest/defconfig index baa25fb6414..3fd432f5b40 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sotest/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/sotest/defconfig @@ -27,6 +27,7 @@ CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_DLFCN=y CONFIG_NSH_ARCHINIT=y @@ -44,4 +45,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig index dfab850100f..4eefec475e1 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig @@ -26,6 +26,7 @@ CONFIG_ESP32C3_STORAGE_MTD_OFFSET=0x110000 CONFIG_ESP32C3_STORAGE_MTD_SIZE=0xf0000 CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -49,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TESTING_FSTEST=y CONFIG_TESTING_FSTEST_MOUNTPT="/mnt" CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig index e5500f72972..f33a07fd4cf 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig @@ -41,6 +41,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_MM_REGIONS=3 @@ -76,7 +77,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/tickless/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/tickless/defconfig index 9a2f44b6e91..f35cea13a31 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/tickless/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/tickless/defconfig @@ -23,6 +23,7 @@ CONFIG_DEV_ZERO=y CONFIG_ESP32C3_TICKLESS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -40,4 +41,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig index ac20f19cdd6..f4151eed5a5 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig @@ -25,6 +25,7 @@ CONFIG_ESP32C3_TIMER1=y CONFIG_EXAMPLES_TIMER=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -44,4 +45,3 @@ CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_TIMER=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/uid/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/uid/defconfig index caea36c8291..9c502160efa 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/uid/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/uid/defconfig @@ -23,6 +23,7 @@ CONFIG_BUILTIN=y CONFIG_DEV_ZERO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -41,4 +42,3 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/usbconsole/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/usbconsole/defconfig index 60bc2b7364e..42438315bdb 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/usbconsole/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/usbconsole/defconfig @@ -26,6 +26,7 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y CONFIG_HOST_MACOS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -43,4 +44,3 @@ CONFIG_START_DAY=29 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/wapi/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/wapi/defconfig index d3884c601f5..ea4b5d6ece0 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/wapi/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/wapi/defconfig @@ -26,6 +26,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_NAME_MAX=48 @@ -59,7 +60,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig index 69007d611f4..d0f90e0a821 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig @@ -25,6 +25,7 @@ CONFIG_ESP32C3_MWDT1=y CONFIG_EXAMPLES_WATCHDOG=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -43,5 +44,4 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig index 1fcb6bf9521..f7d73e1c699 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig @@ -27,6 +27,7 @@ CONFIG_EXAMPLES_WATCHER=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -47,5 +48,4 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig b/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig index a64be3aa8b4..0498b85f83a 100644 --- a/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig +++ b/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig @@ -35,6 +35,8 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_HELLO_STACKSIZE=1024 CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=1536 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1536 CONFIG_INPUT=y CONFIG_INPUT_BUTTONS=y CONFIG_INPUT_BUTTONS_LOWER=y @@ -67,5 +69,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_UART0_RXBUFSIZE=16 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 -CONFIG_USERMAIN_STACKSIZE=1536 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/k210/maix-bit/configs/elf/defconfig b/boards/risc-v/k210/maix-bit/configs/elf/defconfig index a4a3eaa652f..3d2baef3b7c 100644 --- a/boards/risc-v/k210/maix-bit/configs/elf/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/elf/defconfig @@ -29,6 +29,8 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="elf_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_PERROR_STDOUT=y @@ -49,5 +51,3 @@ CONFIG_START_YEAR=2020 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="elf_main" diff --git a/boards/risc-v/k210/maix-bit/configs/knsh/defconfig b/boards/risc-v/k210/maix-bit/configs/knsh/defconfig index c560913f1b3..56e8cae72e6 100644 --- a/boards/risc-v/k210/maix-bit/configs/knsh/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/knsh/defconfig @@ -24,6 +24,8 @@ CONFIG_DEV_ZERO=y CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -50,5 +52,3 @@ CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/k210/maix-bit/configs/knsh_smp/defconfig b/boards/risc-v/k210/maix-bit/configs/knsh_smp/defconfig index 11d4a845d4d..796fe7e349c 100644 --- a/boards/risc-v/k210/maix-bit/configs/knsh_smp/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/knsh_smp/defconfig @@ -24,6 +24,8 @@ CONFIG_DEV_ZERO=y CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -56,5 +58,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/k210/maix-bit/configs/kostest/defconfig b/boards/risc-v/k210/maix-bit/configs/kostest/defconfig index b2aa9099439..e440989e013 100644 --- a/boards/risc-v/k210/maix-bit/configs/kostest/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/kostest/defconfig @@ -25,6 +25,8 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_ZERO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -45,5 +47,3 @@ CONFIG_SYS_RESERVED=9 CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/risc-v/k210/maix-bit/configs/module/defconfig b/boards/risc-v/k210/maix-bit/configs/module/defconfig index 3c124d84de5..2841da97690 100644 --- a/boards/risc-v/k210/maix-bit/configs/module/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/module/defconfig @@ -29,6 +29,8 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="module_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y @@ -51,5 +53,3 @@ CONFIG_START_YEAR=2020 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="module_main" diff --git a/boards/risc-v/k210/maix-bit/configs/nsh/defconfig b/boards/risc-v/k210/maix-bit/configs/nsh/defconfig index 081a0d800c0..4d7f2280131 100644 --- a/boards/risc-v/k210/maix-bit/configs/nsh/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/nsh/defconfig @@ -24,6 +24,8 @@ CONFIG_DEV_ZERO=y CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -52,5 +54,3 @@ CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig b/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig index 1c23c0a7098..c246c099667 100644 --- a/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig @@ -27,6 +27,8 @@ CONFIG_EXAMPLES_POSIXSPAWN=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="posix_spawn_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y @@ -48,5 +50,3 @@ CONFIG_START_YEAR=2019 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="posix_spawn_main" diff --git a/boards/risc-v/k210/maix-bit/configs/smp/defconfig b/boards/risc-v/k210/maix-bit/configs/smp/defconfig index 674bba8aa53..bfc400f1ec5 100644 --- a/boards/risc-v/k210/maix-bit/configs/smp/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/smp/defconfig @@ -25,6 +25,8 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -57,5 +59,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/k210/maix-bit/configs/smp2/defconfig b/boards/risc-v/k210/maix-bit/configs/smp2/defconfig index ce3883bc459..0402600fb23 100644 --- a/boards/risc-v/k210/maix-bit/configs/smp2/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/smp2/defconfig @@ -26,6 +26,8 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -63,5 +65,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/k210/maix-bit/kernel/Makefile b/boards/risc-v/k210/maix-bit/kernel/Makefile index 07c9fd97484..a53f326104a 100644 --- a/boards/risc-v/k210/maix-bit/kernel/Makefile +++ b/boards/risc-v/k210/maix-bit/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/risc-v/k210/maix-bit/kernel/k210_userspace.c b/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c index fb19ab1a286..549e37d1103 100644 --- a/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c +++ b/boards/risc-v/k210/maix-bit/kernel/k210_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/risc-v/litex/arty_a7/configs/nsh/defconfig b/boards/risc-v/litex/arty_a7/configs/nsh/defconfig index 0e729656807..1bc864566af 100644 --- a/boards/risc-v/litex/arty_a7/configs/nsh/defconfig +++ b/boards/risc-v/litex/arty_a7/configs/nsh/defconfig @@ -28,6 +28,8 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_HELLO_STACKSIZE=8192 CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -56,5 +58,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 -CONFIG_USERMAIN_STACKSIZE=8192 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/mpfs/common/kernel/Makefile b/boards/risc-v/mpfs/common/kernel/Makefile index 26204b29aae..45d5b3c8b9d 100755 --- a/boards/risc-v/mpfs/common/kernel/Makefile +++ b/boards/risc-v/mpfs/common/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)) # The memory layout diff --git a/boards/risc-v/mpfs/common/kernel/mpfs_userspace.c b/boards/risc-v/mpfs/common/kernel/mpfs_userspace.c index d1c2e90d65a..6971b102da5 100755 --- a/boards/risc-v/mpfs/common/kernel/mpfs_userspace.c +++ b/boards/risc-v/mpfs/common/kernel/mpfs_userspace.c @@ -75,13 +75,13 @@ extern uintptr_t *__ld_usram_end; /* End+1 of user ram section */ /* 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/risc-v/mpfs/icicle/configs/hwtest/defconfig b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig index 82d9e2264fc..ac9978bae4b 100644 --- a/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig @@ -34,6 +34,8 @@ CONFIG_FS_ROMFS=y CONFIG_I2C=y CONFIG_I2C_DRIVER=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBC_PERROR_STDOUT=y @@ -96,5 +98,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUSIZE=264 CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig index cf8fae65e7b..d7463aa8f61 100644 --- a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig @@ -29,6 +29,8 @@ CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBC_HOSTNAME="icicle" @@ -71,5 +73,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUSIZE=264 CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig index 80bfe1ab16c..01586ead209 100644 --- a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig @@ -31,6 +31,8 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_HOSTNAME="icicle" CONFIG_LIBC_PERROR_STDOUT=y @@ -114,5 +116,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig b/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig index afab79171e4..702598e7dfe 100644 --- a/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig +++ b/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig @@ -29,6 +29,8 @@ CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBC_HOSTNAME="m100pfsevp" @@ -71,5 +73,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUSIZE=264 CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/qemu-rv32/rv32-virt/configs/nsh/defconfig b/boards/risc-v/qemu-rv32/rv32-virt/configs/nsh/defconfig index c3988411588..d4cc560908c 100644 --- a/boards/risc-v/qemu-rv32/rv32-virt/configs/nsh/defconfig +++ b/boards/risc-v/qemu-rv32/rv32-virt/configs/nsh/defconfig @@ -43,6 +43,7 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DEV_ZERO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBC_PERROR_STDOUT=y @@ -63,4 +64,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_NSH=y CONFIG_USEC_PER_TICK=1000 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/rv32m1/rv32m1-vega/configs/buttons/defconfig b/boards/risc-v/rv32m1/rv32m1-vega/configs/buttons/defconfig index 0ca29ea6304..be7ed1d9ab4 100644 --- a/boards/risc-v/rv32m1/rv32m1-vega/configs/buttons/defconfig +++ b/boards/risc-v/rv32m1/rv32m1-vega/configs/buttons/defconfig @@ -37,6 +37,7 @@ CONFIG_EXAMPLES_BUTTONS_NAMES=y CONFIG_EXAMPLES_BUTTONS_QTD=4 CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INPUT=y CONFIG_INPUT_BUTTONS=y CONFIG_INPUT_BUTTONS_LOWER=y @@ -67,4 +68,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=12 CONFIG_TESTING_GETPRIME=y CONFIG_USEC_PER_TICK=1000 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/rv32m1/rv32m1-vega/configs/nsh-itcm/defconfig b/boards/risc-v/rv32m1/rv32m1-vega/configs/nsh-itcm/defconfig index a8b2f86c0bc..cde383673a0 100644 --- a/boards/risc-v/rv32m1/rv32m1-vega/configs/nsh-itcm/defconfig +++ b/boards/risc-v/rv32m1/rv32m1-vega/configs/nsh-itcm/defconfig @@ -28,6 +28,7 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DEV_ZERO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBC_PERROR_STDOUT=y @@ -56,4 +57,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=12 CONFIG_TESTING_GETPRIME=y CONFIG_USEC_PER_TICK=1000 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/rv32m1/rv32m1-vega/configs/nsh/defconfig b/boards/risc-v/rv32m1/rv32m1-vega/configs/nsh/defconfig index 9b3d7c8345c..92fc4fd4745 100644 --- a/boards/risc-v/rv32m1/rv32m1-vega/configs/nsh/defconfig +++ b/boards/risc-v/rv32m1/rv32m1-vega/configs/nsh/defconfig @@ -28,6 +28,7 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DEV_ZERO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBC_PERROR_STDOUT=y @@ -55,4 +56,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=12 CONFIG_TESTING_GETPRIME=y CONFIG_USEC_PER_TICK=1000 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/README.txt b/boards/sim/sim/sim/README.txt index e893b717e32..e203a358c9b 100644 --- a/boards/sim/sim/sim/README.txt +++ b/boards/sim/sim/sim/README.txt @@ -132,7 +132,7 @@ the stack and overflow the small NuttX stacks. X11, in particular, requires large stacks. If you are using X11 in the simulation, make sure that you set aside a "lot" of stack for the X11 library calls (maybe 8 or 16Kb). The stack size for the thread that begins with user start is controlled by the -configuration setting CONFIG_USERMAIN_STACKSIZE; you may need to increase this +configuration setting CONFIG_INIT_STACKSIZE; you may need to increase this value to larger number to survive the X11 library calls. If you are running X11 applications such as NSH add-on programs, then the @@ -619,7 +619,7 @@ loadable This is the key part of the configuration: +CONFIG_PATH_INITIAL="/system/bin" - +CONFIG_USER_INITPATH="/system/bin/nsh" + +CONFIG_INIT_FILEPATH="/system/bin/nsh" The shell is loaded from the elf, but you can also run any of the ELFs that are in /system/bin as they are on the "PATH" diff --git a/boards/sim/sim/sim/configs/alsa/defconfig b/boards/sim/sim/sim/configs/alsa/defconfig index c69a6b81312..fa0f7dd13a8 100644 --- a/boards/sim/sim/sim/configs/alsa/defconfig +++ b/boards/sim/sim/sim/configs/alsa/defconfig @@ -31,6 +31,7 @@ CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_NSH_ARCHINIT=y @@ -55,4 +56,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NXLOOPER=y CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_NXRECORDER=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/asan/defconfig b/boards/sim/sim/sim/configs/asan/defconfig index b2bfd6392f9..1d2427d82c9 100644 --- a/boards/sim/sim/sim/configs/asan/defconfig +++ b/boards/sim/sim/sim/configs/asan/defconfig @@ -23,6 +23,7 @@ CONFIG_FS_BINFS=y CONFIG_FS_NAMED_SEMAPHORES=y CONFIG_FS_PROCFS=y CONFIG_INIT_ARGS="\"-c\", \"ostest;poweroff\"" +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_CUSTOMIZE_MANAGER=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -43,4 +44,3 @@ CONFIG_SIM_UBSAN=y CONFIG_SYSTEM_NSH=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_AIO=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/bas/defconfig b/boards/sim/sim/sim/configs/bas/defconfig index 25bca93dee5..7c4552c6618 100644 --- a/boards/sim/sim/sim/configs/bas/defconfig +++ b/boards/sim/sim/sim/configs/bas/defconfig @@ -21,6 +21,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTERPRETERS_BAS=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y @@ -40,4 +41,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/bastest/defconfig b/boards/sim/sim/sim/configs/bastest/defconfig index fe330cfcf0f..dd198bb27f9 100644 --- a/boards/sim/sim/sim/configs/bastest/defconfig +++ b/boards/sim/sim/sim/configs/bastest/defconfig @@ -32,6 +32,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTERPRETERS_BAS=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y @@ -58,4 +59,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/bluetooth/defconfig b/boards/sim/sim/sim/configs/bluetooth/defconfig index a60603090e2..279172a2b96 100644 --- a/boards/sim/sim/sim/configs/bluetooth/defconfig +++ b/boards/sim/sim/sim/configs/bluetooth/defconfig @@ -35,6 +35,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_HOSTNAME="NuttX-SIM" @@ -64,6 +65,5 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=3 CONFIG_START_MONTH=4 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_BLUETOOTH=y diff --git a/boards/sim/sim/sim/configs/bthcisock/defconfig b/boards/sim/sim/sim/configs/bthcisock/defconfig index 02604ef09f4..6e064a7488d 100644 --- a/boards/sim/sim/sim/configs/bthcisock/defconfig +++ b/boards/sim/sim/sim/configs/bthcisock/defconfig @@ -36,6 +36,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_HOSTNAME="NuttX-SIM" @@ -66,6 +67,5 @@ CONFIG_SIM_HCISOCKET=y CONFIG_START_DAY=3 CONFIG_START_MONTH=4 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_BLUETOOTH=y diff --git a/boards/sim/sim/sim/configs/btuart/defconfig b/boards/sim/sim/sim/configs/btuart/defconfig index 9f35a3cc585..8b656d2e33e 100644 --- a/boards/sim/sim/sim/configs/btuart/defconfig +++ b/boards/sim/sim/sim/configs/btuart/defconfig @@ -18,6 +18,7 @@ CONFIG_DRIVERS_BLUETOOTH=y CONFIG_DRIVERS_WIRELESS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARCHROMFS=y CONFIG_NSH_BUILTIN_APPS=y @@ -28,4 +29,3 @@ CONFIG_SCHED_WAITPID=y CONFIG_SIM_HCISOCKET=y CONFIG_SYSTEM_NSH=y CONFIG_UART_BTH4=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/configdata/defconfig b/boards/sim/sim/sim/configs/configdata/defconfig index 5cb69ac3f39..cce92ba49dd 100644 --- a/boards/sim/sim/sim/configs/configdata/defconfig +++ b/boards/sim/sim/sim/configs/configdata/defconfig @@ -20,6 +20,7 @@ CONFIG_EXAMPLES_CONFIGDATA_SILENT=y CONFIG_FS_FAT=y CONFIG_FS_NXFFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="configdata_main" CONFIG_LIBC_RAND_ORDER=3 CONFIG_MTD=y CONFIG_MTD_BYTE_WRITE=y @@ -33,4 +34,3 @@ CONFIG_START_DAY=4 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2013 CONFIG_TESTING_NXFFS=y -CONFIG_USER_ENTRYPOINT="configdata_main" diff --git a/boards/sim/sim/sim/configs/cxxtest/defconfig b/boards/sim/sim/sim/configs/cxxtest/defconfig index ed7c6980126..8f29a672d2f 100644 --- a/boards/sim/sim/sim/configs/cxxtest/defconfig +++ b/boards/sim/sim/sim/configs/cxxtest/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH_SIM=y CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="cxxtest_main" CONFIG_LIBM=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_START=0x00000000 @@ -24,4 +25,3 @@ CONFIG_START_MONTH=2 CONFIG_START_YEAR=2007 CONFIG_TESTING_CXXTEST=y CONFIG_UCLIBCXX=y -CONFIG_USER_ENTRYPOINT="cxxtest_main" diff --git a/boards/sim/sim/sim/configs/duktape/defconfig b/boards/sim/sim/sim/configs/duktape/defconfig index 32fae1922e1..87f2b7999af 100644 --- a/boards/sim/sim/sim/configs/duktape/defconfig +++ b/boards/sim/sim/sim/configs/duktape/defconfig @@ -29,6 +29,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTERPRETERS_DUKTAPE=y CONFIG_INTERPRETERS_DUKTAPE_STACKSIZE=32768 CONFIG_LIBC_ENVPATH=y @@ -55,4 +56,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/elf/defconfig b/boards/sim/sim/sim/configs/elf/defconfig index c7310d5e5e2..67a212dbdcb 100644 --- a/boards/sim/sim/sim/configs/elf/defconfig +++ b/boards/sim/sim/sim/configs/elf/defconfig @@ -35,6 +35,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_STRERROR=y CONFIG_NSH_ARCHINIT=y @@ -54,4 +55,3 @@ CONFIG_SIM_M32=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/fb/defconfig b/boards/sim/sim/sim/configs/fb/defconfig index 1460cfa0d88..85109a89601 100644 --- a/boards/sim/sim/sim/configs/fb/defconfig +++ b/boards/sim/sim/sim/configs/fb/defconfig @@ -18,9 +18,9 @@ CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DRIVERS_VIDEO=y CONFIG_EXAMPLES_FB=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="fb_main" CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=28 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2008 -CONFIG_USER_ENTRYPOINT="fb_main" CONFIG_VIDEO_FB=y diff --git a/boards/sim/sim/sim/configs/foc/defconfig b/boards/sim/sim/sim/configs/foc/defconfig index 2d2b16503c0..59f4b0aa58c 100644 --- a/boards/sim/sim/sim/configs/foc/defconfig +++ b/boards/sim/sim/sim/configs/foc/defconfig @@ -57,6 +57,7 @@ CONFIG_INDUSTRY_FOC_FIXED16=y CONFIG_INDUSTRY_FOC_FLOAT=y CONFIG_INDUSTRY_FOC_HANDLER_PRINT=y CONFIG_INDUSTRY_FOC_MODEL_PMSM=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_FLOATINGPOINT=y @@ -88,4 +89,3 @@ CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSLOG_CONSOLE=y CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/ipforward/defconfig b/boards/sim/sim/sim/configs/ipforward/defconfig index f0be3429c4b..19150b27710 100644 --- a/boards/sim/sim/sim/configs/ipforward/defconfig +++ b/boards/sim/sim/sim/configs/ipforward/defconfig @@ -30,6 +30,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_HOSTNAME="IP-Forward" @@ -65,4 +66,3 @@ CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y CONFIG_TUN_NINTERFACES=2 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/kasan/defconfig b/boards/sim/sim/sim/configs/kasan/defconfig index 75f1fd4a1b6..11def0904d3 100644 --- a/boards/sim/sim/sim/configs/kasan/defconfig +++ b/boards/sim/sim/sim/configs/kasan/defconfig @@ -23,6 +23,7 @@ CONFIG_FS_BINFS=y CONFIG_FS_NAMED_SEMAPHORES=y CONFIG_FS_PROCFS=y CONFIG_INIT_ARGS="\"-c\", \"ostest;poweroff\"" +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_KASAN=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -41,4 +42,3 @@ CONFIG_SIG_EVTHREAD=y CONFIG_SYSTEM_NSH=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_AIO=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/libcxxtest/defconfig b/boards/sim/sim/sim/configs/libcxxtest/defconfig index f5501e900bd..a430529d24a 100644 --- a/boards/sim/sim/sim/configs/libcxxtest/defconfig +++ b/boards/sim/sim/sim/configs/libcxxtest/defconfig @@ -40,6 +40,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_NOTIFIER=y CONFIG_LIBCXX=y CONFIG_LIBCXXABI=y @@ -96,4 +97,3 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TESTING_CXXTEST=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/linuxi2c/defconfig b/boards/sim/sim/sim/configs/linuxi2c/defconfig index fca047b98b1..df36f33bec2 100644 --- a/boards/sim/sim/sim/configs/linuxi2c/defconfig +++ b/boards/sim/sim/sim/configs/linuxi2c/defconfig @@ -22,6 +22,7 @@ CONFIG_DEV_ZERO=y CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_EXECFUNCS=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -37,4 +38,3 @@ CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/linuxspi/defconfig b/boards/sim/sim/sim/configs/linuxspi/defconfig index f04e33289b8..5d6a96a4f72 100644 --- a/boards/sim/sim/sim/configs/linuxspi/defconfig +++ b/boards/sim/sim/sim/configs/linuxspi/defconfig @@ -22,6 +22,7 @@ CONFIG_DEV_ZERO=y CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_EXECFUNCS=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -37,4 +38,3 @@ CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SPITOOL=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/loadable/defconfig b/boards/sim/sim/sim/configs/loadable/defconfig index aa91b15cb0e..6e762963aa8 100644 --- a/boards/sim/sim/sim/configs/loadable/defconfig +++ b/boards/sim/sim/sim/configs/loadable/defconfig @@ -23,7 +23,8 @@ CONFIG_EXECFUNCS_HAVE_SYMTAB=y CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 -CONFIG_INIT_FILEPATH=y +CONFIG_INIT_FILE=y +CONFIG_INIT_FILEPATH="/system/bin/nsh" CONFIG_INIT_MOUNT=y CONFIG_INIT_MOUNT_DATA="fs=../apps" CONFIG_INIT_MOUNT_FLAGS=0x1 @@ -49,4 +50,3 @@ CONFIG_SIM_M32=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=m -CONFIG_USER_INITPATH="/system/bin/nsh" diff --git a/boards/sim/sim/sim/configs/lvgl/defconfig b/boards/sim/sim/sim/configs/lvgl/defconfig index 9271633f751..17189757f50 100644 --- a/boards/sim/sim/sim/configs/lvgl/defconfig +++ b/boards/sim/sim/sim/configs/lvgl/defconfig @@ -28,6 +28,7 @@ CONFIG_EXAMPLES_LVGLDEMO=y CONFIG_EXAMPLES_LVGLDEMO_STACKSIZE=32768 CONFIG_GRAPHICS_LVGL=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="lvgldemo_main" CONFIG_INPUT=y CONFIG_INPUT_MOUSE=y CONFIG_LV_COLOR_DEPTH=32 @@ -54,5 +55,4 @@ CONFIG_START_DAY=28 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="lvgldemo_main" CONFIG_VIDEO_FB=y diff --git a/boards/sim/sim/sim/configs/minibasic/defconfig b/boards/sim/sim/sim/configs/minibasic/defconfig index b747b9a2bf0..e926d9a696a 100644 --- a/boards/sim/sim/sim/configs/minibasic/defconfig +++ b/boards/sim/sim/sim/configs/minibasic/defconfig @@ -27,6 +27,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTERPRETERS_MINIBASIC=y CONFIG_INTERPRETER_MINIBASIC_TESTSCRIPT=y CONFIG_LIBC_ENVPATH=y @@ -50,4 +51,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/module/defconfig b/boards/sim/sim/sim/configs/module/defconfig index 468ded86a84..bdcb2e33047 100644 --- a/boards/sim/sim/sim/configs/module/defconfig +++ b/boards/sim/sim/sim/configs/module/defconfig @@ -26,6 +26,7 @@ CONFIG_EXAMPLES_MODULE_DEVPATH="/dev/ram4" CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_ROMFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_NOTIFIER=y CONFIG_LIBC_DLFCN=y CONFIG_LIBC_ENVPATH=y @@ -75,4 +76,3 @@ CONFIG_START_YEAR=2008 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSLOG_CONSOLE=y CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/module32/defconfig b/boards/sim/sim/sim/configs/module32/defconfig index 514e19a23f1..8e578844717 100644 --- a/boards/sim/sim/sim/configs/module32/defconfig +++ b/boards/sim/sim/sim/configs/module32/defconfig @@ -26,6 +26,7 @@ CONFIG_EXAMPLES_MODULE_DEVPATH="/dev/ram4" CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_ROMFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_NOTIFIER=y CONFIG_LIBC_DLFCN=y CONFIG_LIBC_ENVPATH=y @@ -75,4 +76,3 @@ CONFIG_START_YEAR=2008 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSLOG_CONSOLE=y CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/mount/defconfig b/boards/sim/sim/sim/configs/mount/defconfig index f3ecd15ab32..7216cbdd930 100644 --- a/boards/sim/sim/sim/configs/mount/defconfig +++ b/boards/sim/sim/sim/configs/mount/defconfig @@ -16,7 +16,7 @@ CONFIG_EXAMPLES_MOUNT_BLOCKDEVICE=y CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0" CONFIG_FS_FAT=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="mount_main" CONFIG_SDCLONE_DISABLE=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 -CONFIG_USER_ENTRYPOINT="mount_main" diff --git a/boards/sim/sim/sim/configs/mtdpart/defconfig b/boards/sim/sim/sim/configs/mtdpart/defconfig index acee6ac8b76..acb7d005b51 100644 --- a/boards/sim/sim/sim/configs/mtdpart/defconfig +++ b/boards/sim/sim/sim/configs/mtdpart/defconfig @@ -17,6 +17,7 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_MTDPART=y CONFIG_FS_FAT=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="mtdpart_main" CONFIG_LIBC_RAND_ORDER=3 CONFIG_MTD=y CONFIG_MTD_PARTITION=y @@ -26,4 +27,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=29 CONFIG_START_MONTH=4 CONFIG_START_YEAR=2011 -CONFIG_USER_ENTRYPOINT="mtdpart_main" diff --git a/boards/sim/sim/sim/configs/mtdrwb/defconfig b/boards/sim/sim/sim/configs/mtdrwb/defconfig index cdfa9a23196..99789dbd42d 100644 --- a/boards/sim/sim/sim/configs/mtdrwb/defconfig +++ b/boards/sim/sim/sim/configs/mtdrwb/defconfig @@ -18,6 +18,7 @@ CONFIG_DRVR_WRITEBUFFER=y CONFIG_EXAMPLES_MTDRWB=y CONFIG_FS_FAT=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="mtdrwb_main" CONFIG_LIBC_RAND_ORDER=3 CONFIG_MTD=y CONFIG_MTD_PARTITION=y @@ -31,4 +32,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=29 CONFIG_START_MONTH=4 CONFIG_START_YEAR=2011 -CONFIG_USER_ENTRYPOINT="mtdrwb_main" diff --git a/boards/sim/sim/sim/configs/nettest/defconfig b/boards/sim/sim/sim/configs/nettest/defconfig index ff4c0cb15d1..ddecfb527ad 100644 --- a/boards/sim/sim/sim/configs/nettest/defconfig +++ b/boards/sim/sim/sim/configs/nettest/defconfig @@ -15,6 +15,7 @@ CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001 CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080 CONFIG_FS_FAT=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nettest_main" CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETUTILS_NETLIB=y @@ -28,4 +29,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=16 CONFIG_START_MONTH=8 CONFIG_START_YEAR=2008 -CONFIG_USER_ENTRYPOINT="nettest_main" diff --git a/boards/sim/sim/sim/configs/nimble/defconfig b/boards/sim/sim/sim/configs/nimble/defconfig index c9de5e1ea83..7ccbb9ca043 100644 --- a/boards/sim/sim/sim/configs/nimble/defconfig +++ b/boards/sim/sim/sim/configs/nimble/defconfig @@ -37,6 +37,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_HOSTNAME="NuttX-SIM" @@ -73,6 +74,5 @@ CONFIG_SIM_HCISOCKET=y CONFIG_START_DAY=3 CONFIG_START_MONTH=4 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_BLUETOOTH=y diff --git a/boards/sim/sim/sim/configs/note/defconfig b/boards/sim/sim/sim/configs/note/defconfig index c29c392399f..66eeb472b14 100644 --- a/boards/sim/sim/sim/configs/note/defconfig +++ b/boards/sim/sim/sim/configs/note/defconfig @@ -21,6 +21,7 @@ CONFIG_DRIVER_NOTELOG=y CONFIG_EXAMPLES_HELLO=y CONFIG_FS_BINFS=y CONFIG_FS_PROCFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y @@ -35,4 +36,3 @@ CONFIG_SCHED_INSTRUMENTATION_SWITCH=y CONFIG_SCHED_ONEXIT=y CONFIG_SCHED_WAITPID=y CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/nsh/defconfig b/boards/sim/sim/sim/configs/nsh/defconfig index e65a11067af..eaefad08c83 100644 --- a/boards/sim/sim/sim/configs/nsh/defconfig +++ b/boards/sim/sim/sim/configs/nsh/defconfig @@ -30,6 +30,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_LOCALE=y @@ -58,4 +59,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/nsh2/defconfig b/boards/sim/sim/sim/configs/nsh2/defconfig index 6de1dd3509e..7d225f93654 100644 --- a/boards/sim/sim/sim/configs/nsh2/defconfig +++ b/boards/sim/sim/sim/configs/nsh2/defconfig @@ -31,6 +31,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INPUT=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NSH_ARCHINIT=y @@ -54,5 +55,4 @@ CONFIG_START_DAY=6 CONFIG_START_MONTH=10 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y diff --git a/boards/sim/sim/sim/configs/nshcromfs/defconfig b/boards/sim/sim/sim/configs/nshcromfs/defconfig index 40020996570..4a8df7e7bb5 100644 --- a/boards/sim/sim/sim/configs/nshcromfs/defconfig +++ b/boards/sim/sim/sim/configs/nshcromfs/defconfig @@ -30,6 +30,7 @@ CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_NSH_ARCHINIT=y @@ -47,4 +48,3 @@ CONFIG_START_YEAR=2008 CONFIG_SYSTEM_LZF=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/nx/defconfig b/boards/sim/sim/sim/configs/nx/defconfig index c6d48cebb92..1236723671c 100644 --- a/boards/sim/sim/sim/configs/nx/defconfig +++ b/boards/sim/sim/sim/configs/nx/defconfig @@ -19,6 +19,7 @@ CONFIG_DRIVERS_VIDEO=y CONFIG_EXAMPLES_NX=y CONFIG_EXAMPLES_NX_BPP=8 CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nx_main" CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y @@ -29,5 +30,4 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=28 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2008 -CONFIG_USER_ENTRYPOINT="nx_main" CONFIG_VIDEO_FB=y diff --git a/boards/sim/sim/sim/configs/nx11/defconfig b/boards/sim/sim/sim/configs/nx11/defconfig index e7a7f6675d4..5b962580892 100644 --- a/boards/sim/sim/sim/configs/nx11/defconfig +++ b/boards/sim/sim/sim/configs/nx11/defconfig @@ -18,6 +18,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DRIVERS_VIDEO=y CONFIG_EXAMPLES_NX=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nx_main" CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y @@ -30,5 +31,4 @@ CONFIG_SIM_X11FB=y CONFIG_START_DAY=28 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2008 -CONFIG_USER_ENTRYPOINT="nx_main" CONFIG_VIDEO_FB=y diff --git a/boards/sim/sim/sim/configs/nxffs/defconfig b/boards/sim/sim/sim/configs/nxffs/defconfig index 13c250b39f3..e5e2dc21d11 100644 --- a/boards/sim/sim/sim/configs/nxffs/defconfig +++ b/boards/sim/sim/sim/configs/nxffs/defconfig @@ -17,6 +17,7 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_FS_FAT=y CONFIG_FS_NXFFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nxffs_main" CONFIG_LIBC_RAND_ORDER=3 CONFIG_MTD=y CONFIG_NXFFS_SCAN_VOLUME=y @@ -27,4 +28,3 @@ CONFIG_START_DAY=29 CONFIG_START_MONTH=4 CONFIG_START_YEAR=2011 CONFIG_TESTING_NXFFS=y -CONFIG_USER_ENTRYPOINT="nxffs_main" diff --git a/boards/sim/sim/sim/configs/nxlines/defconfig b/boards/sim/sim/sim/configs/nxlines/defconfig index 990ca6110ad..d3c281bd09c 100644 --- a/boards/sim/sim/sim/configs/nxlines/defconfig +++ b/boards/sim/sim/sim/configs/nxlines/defconfig @@ -31,6 +31,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nxlines_main" CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_FATDEVNO=2 @@ -54,5 +55,4 @@ CONFIG_SIM_FBBPP=32 CONFIG_SIM_X11FB=y CONFIG_START_MONTH=5 CONFIG_START_YEAR=2012 -CONFIG_USER_ENTRYPOINT="nxlines_main" CONFIG_VIDEO_FB=y diff --git a/boards/sim/sim/sim/configs/nxwm/defconfig b/boards/sim/sim/sim/configs/nxwm/defconfig index cf8fe0a3293..7799a252d4f 100644 --- a/boards/sim/sim/sim/configs/nxwm/defconfig +++ b/boards/sim/sim/sim/configs/nxwm/defconfig @@ -23,6 +23,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nxwm_main" CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NSH_FATDEVNO=2 CONFIG_NSH_LIBRARY=y @@ -52,5 +53,4 @@ CONFIG_SIM_FBBPP=32 CONFIG_SIM_X11FB=y CONFIG_START_MONTH=5 CONFIG_START_YEAR=2012 -CONFIG_USER_ENTRYPOINT="nxwm_main" CONFIG_VIDEO_FB=y diff --git a/boards/sim/sim/sim/configs/ostest/defconfig b/boards/sim/sim/sim/configs/ostest/defconfig index c05ded0832d..4b097f2a465 100644 --- a/boards/sim/sim/sim/configs/ostest/defconfig +++ b/boards/sim/sim/sim/configs/ostest/defconfig @@ -17,6 +17,7 @@ CONFIG_CANCELLATION_POINTS=y CONFIG_DEBUG_SYMBOLS=y CONFIG_FS_NAMED_SEMAPHORES=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="ostest_main" CONFIG_PTHREAD_CLEANUP=y CONFIG_PTHREAD_CLEANUP_STACKSIZE=3 CONFIG_PTHREAD_MUTEX_TYPES=y @@ -30,4 +31,3 @@ CONFIG_START_YEAR=2007 CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_LOOPS=100 CONFIG_TESTING_OSTEST_POWEROFF=y -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/sim/sim/sim/configs/pf_ieee802154/defconfig b/boards/sim/sim/sim/configs/pf_ieee802154/defconfig index fd021b0e2d4..83060406916 100644 --- a/boards/sim/sim/sim/configs/pf_ieee802154/defconfig +++ b/boards/sim/sim/sim/configs/pf_ieee802154/defconfig @@ -32,6 +32,7 @@ CONFIG_FS_PROCFS=y CONFIG_I2C_DRIVER=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IEEE802154_LOOPBACK=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=48 CONFIG_LIBC_HOSTNAME="SAMV71-XULT" @@ -68,6 +69,5 @@ CONFIG_START_DAY=10 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2014 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_IEEE802154=y diff --git a/boards/sim/sim/sim/configs/pktradio/defconfig b/boards/sim/sim/sim/configs/pktradio/defconfig index cd81eb091ef..18e56a7b455 100644 --- a/boards/sim/sim/sim/configs/pktradio/defconfig +++ b/boards/sim/sim/sim/configs/pktradio/defconfig @@ -47,6 +47,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_I2C_DRIVER=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=48 CONFIG_LIBC_HOSTNAME="SAMV71-XULT" @@ -91,6 +92,5 @@ CONFIG_START_DAY=10 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2014 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_PKTRADIO=y diff --git a/boards/sim/sim/sim/configs/posix_spawn/defconfig b/boards/sim/sim/sim/configs/posix_spawn/defconfig index c696c150a66..c16e502e71d 100644 --- a/boards/sim/sim/sim/configs/posix_spawn/defconfig +++ b/boards/sim/sim/sim/configs/posix_spawn/defconfig @@ -35,6 +35,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_STRERROR=y @@ -55,4 +56,3 @@ CONFIG_SIM_M32=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/rc/defconfig b/boards/sim/sim/sim/configs/rc/defconfig index 21b0416804e..97dfb4627da 100644 --- a/boards/sim/sim/sim/configs/rc/defconfig +++ b/boards/sim/sim/sim/configs/rc/defconfig @@ -25,6 +25,7 @@ CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_BINFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_FLOATINGPOINT=y @@ -44,4 +45,3 @@ CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y CONFIG_TESTING_IRTEST=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/romfs/defconfig b/boards/sim/sim/sim/configs/romfs/defconfig index b6999fa689e..7d3016727cf 100644 --- a/boards/sim/sim/sim/configs/romfs/defconfig +++ b/boards/sim/sim/sim/configs/romfs/defconfig @@ -30,6 +30,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_STRERROR=y @@ -54,4 +55,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/rpproxy/defconfig b/boards/sim/sim/sim/configs/rpproxy/defconfig index 76d2db3e543..634dfe2a09f 100644 --- a/boards/sim/sim/sim/configs/rpproxy/defconfig +++ b/boards/sim/sim/sim/configs/rpproxy/defconfig @@ -19,6 +19,7 @@ CONFIG_EXAMPLES_RPMSGSOCKET=y CONFIG_FS_PROCFS=y CONFIG_FS_RPMSGFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_HOSTNAME="proxy" CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y @@ -63,4 +64,3 @@ CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_CLE=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/rpserver/defconfig b/boards/sim/sim/sim/configs/rpserver/defconfig index 44135d9cf69..8d701814f98 100644 --- a/boards/sim/sim/sim/configs/rpserver/defconfig +++ b/boards/sim/sim/sim/configs/rpserver/defconfig @@ -19,6 +19,7 @@ CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_FS_RPMSGFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_HOSTNAME="server" CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y @@ -77,4 +78,3 @@ CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE="/dev/ttyproxy" CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TTY_SIGINT=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/sensor/defconfig b/boards/sim/sim/sim/configs/sensor/defconfig index ebbc29245d8..35e9a71f5f3 100644 --- a/boards/sim/sim/sim/configs/sensor/defconfig +++ b/boards/sim/sim/sim/configs/sensor/defconfig @@ -26,6 +26,7 @@ CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_BINFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_FLOATINGPOINT=y @@ -50,4 +51,3 @@ CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y CONFIG_TESTING_SENSORTEST=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/sixlowpan/defconfig b/boards/sim/sim/sim/configs/sixlowpan/defconfig index fda61a5c673..3938740013f 100644 --- a/boards/sim/sim/sim/configs/sixlowpan/defconfig +++ b/boards/sim/sim/sim/configs/sixlowpan/defconfig @@ -48,6 +48,7 @@ CONFIG_FS_PROCFS=y CONFIG_I2C_DRIVER=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IEEE802154_LOOPBACK=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=48 CONFIG_LIBC_HOSTNAME="SAMV71-XULT" @@ -91,6 +92,5 @@ CONFIG_START_DAY=10 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2014 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_IEEE802154=y diff --git a/boards/sim/sim/sim/configs/smartfs/defconfig b/boards/sim/sim/sim/configs/smartfs/defconfig index f859d299fc7..523927fcc2a 100644 --- a/boards/sim/sim/sim/configs/smartfs/defconfig +++ b/boards/sim/sim/sim/configs/smartfs/defconfig @@ -34,6 +34,7 @@ CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y CONFIG_FS_SMARTFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_EXECFUNCS=y CONFIG_MTD=y CONFIG_MTD_PARTITION=y @@ -63,4 +64,3 @@ CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_FLASH_ERASEALL=y CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/smp/defconfig b/boards/sim/sim/sim/configs/smp/defconfig index 7c58490cc78..22a56da5e31 100644 --- a/boards/sim/sim/sim/configs/smp/defconfig +++ b/boards/sim/sim/sim/configs/smp/defconfig @@ -19,6 +19,7 @@ CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_SYMBOLS=y CONFIG_EXAMPLES_HELLO=y CONFIG_FS_PROCFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y @@ -32,4 +33,3 @@ CONFIG_SYSTEM_TASKSET=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/sotest/defconfig b/boards/sim/sim/sim/configs/sotest/defconfig index 4c8d8ed7e37..f06c8178004 100644 --- a/boards/sim/sim/sim/configs/sotest/defconfig +++ b/boards/sim/sim/sim/configs/sotest/defconfig @@ -26,6 +26,7 @@ CONFIG_EXAMPLES_SOTEST_DEVPATH="/dev/ram3" CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_ROMFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_NOTIFIER=y CONFIG_LIBC_DLFCN=y CONFIG_LIBC_ENVPATH=y @@ -74,4 +75,3 @@ CONFIG_START_YEAR=2008 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSLOG_CONSOLE=y CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/sotest32/defconfig b/boards/sim/sim/sim/configs/sotest32/defconfig index 607ccc3f5a3..fe786812239 100644 --- a/boards/sim/sim/sim/configs/sotest32/defconfig +++ b/boards/sim/sim/sim/configs/sotest32/defconfig @@ -26,6 +26,7 @@ CONFIG_EXAMPLES_SOTEST_DEVPATH="/dev/ram3" CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_ROMFS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_NOTIFIER=y CONFIG_LIBC_DLFCN=y CONFIG_LIBC_ENVPATH=y @@ -75,4 +76,3 @@ CONFIG_START_YEAR=2008 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSLOG_CONSOLE=y CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/spiffs/defconfig b/boards/sim/sim/sim/configs/spiffs/defconfig index 273c0bd50a2..1ea43b8ac18 100644 --- a/boards/sim/sim/sim/configs/spiffs/defconfig +++ b/boards/sim/sim/sim/configs/spiffs/defconfig @@ -20,6 +20,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_FS_SPIFFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="fstest_main" CONFIG_LIBC_RAND_ORDER=3 CONFIG_MTD=y CONFIG_RAMMTD=y @@ -31,4 +32,3 @@ CONFIG_START_MONTH=9 CONFIG_TESTING_FSTEST=y CONFIG_TESTING_FSTEST_MOUNTPT="/mnt/spiffs" CONFIG_TESTING_FSTEST_NLOOPS=10 -CONFIG_USER_ENTRYPOINT="fstest_main" diff --git a/boards/sim/sim/sim/configs/tcpblaster/defconfig b/boards/sim/sim/sim/configs/tcpblaster/defconfig index edb227541a5..a9f9664cf77 100644 --- a/boards/sim/sim/sim/configs/tcpblaster/defconfig +++ b/boards/sim/sim/sim/configs/tcpblaster/defconfig @@ -30,6 +30,7 @@ CONFIG_FS_LITTLEFS=y CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INPUT=y CONFIG_IOB_NBUFFERS=1024 CONFIG_IOB_NCHAINS=128 @@ -119,4 +120,3 @@ CONFIG_TELNET_TXBUFFER_SIZE=64 CONFIG_TTY_SIGINT=y CONFIG_TTY_SIGINT_CHAR=0x3 CONFIG_TTY_SIGTSTP=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/tcploop/defconfig b/boards/sim/sim/sim/configs/tcploop/defconfig index 8766a9101ca..769d1158186 100644 --- a/boards/sim/sim/sim/configs/tcploop/defconfig +++ b/boards/sim/sim/sim/configs/tcploop/defconfig @@ -31,6 +31,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_HOSTNAME="IP-Forward" @@ -67,4 +68,3 @@ CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y CONFIG_TUN_NINTERFACES=2 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/touchscreen/defconfig b/boards/sim/sim/sim/configs/touchscreen/defconfig index 92a6692b1f7..dff56b98ed8 100644 --- a/boards/sim/sim/sim/configs/touchscreen/defconfig +++ b/boards/sim/sim/sim/configs/touchscreen/defconfig @@ -21,6 +21,7 @@ CONFIG_DRIVERS_VIDEO=y CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25 CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="tc_main" CONFIG_INPUT=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NX=y @@ -37,5 +38,4 @@ CONFIG_SIM_X11FB=y CONFIG_START_DAY=28 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2008 -CONFIG_USER_ENTRYPOINT="tc_main" CONFIG_VIDEO_FB=y diff --git a/boards/sim/sim/sim/configs/udgram/defconfig b/boards/sim/sim/sim/configs/udgram/defconfig index e319ec69b41..f92ed6d263e 100644 --- a/boards/sim/sim/sim/configs/udgram/defconfig +++ b/boards/sim/sim/sim/configs/udgram/defconfig @@ -28,6 +28,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=8192 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_NET=y @@ -48,4 +49,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/unionfs/defconfig b/boards/sim/sim/sim/configs/unionfs/defconfig index 83c69f40ff0..3d4a4e82968 100644 --- a/boards/sim/sim/sim/configs/unionfs/defconfig +++ b/boards/sim/sim/sim/configs/unionfs/defconfig @@ -25,6 +25,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_UNIONFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_STRERROR=y @@ -43,4 +44,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/userfs/defconfig b/boards/sim/sim/sim/configs/userfs/defconfig index 3cf10e9f517..ff9dfb0323f 100644 --- a/boards/sim/sim/sim/configs/userfs/defconfig +++ b/boards/sim/sim/sim/configs/userfs/defconfig @@ -30,6 +30,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_USERFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_NET=y @@ -56,4 +57,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/ustream/defconfig b/boards/sim/sim/sim/configs/ustream/defconfig index d7f5fbc9e84..b3d7351c88a 100644 --- a/boards/sim/sim/sim/configs/ustream/defconfig +++ b/boards/sim/sim/sim/configs/ustream/defconfig @@ -28,6 +28,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_NET=y @@ -48,4 +49,3 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_MONTH=6 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_NSH=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/vpnkit/defconfig b/boards/sim/sim/sim/configs/vpnkit/defconfig index d84490854b0..f66d95044ff 100644 --- a/boards/sim/sim/sim/configs/vpnkit/defconfig +++ b/boards/sim/sim/sim/configs/vpnkit/defconfig @@ -37,6 +37,7 @@ CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_NOTIFIER=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y @@ -91,4 +92,3 @@ CONFIG_SYSLOG_CONSOLE=y CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/x86/qemu/qemu-i486/configs/nsh/defconfig b/boards/x86/qemu/qemu-i486/configs/nsh/defconfig index 68bec834ebc..deb68769c23 100644 --- a/boards/x86/qemu/qemu-i486/configs/nsh/defconfig +++ b/boards/x86/qemu/qemu-i486/configs/nsh/defconfig @@ -32,6 +32,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_IFUPDOWN=y @@ -49,4 +50,3 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_TESTING_OSTEST=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/x86/qemu/qemu-i486/configs/ostest/defconfig b/boards/x86/qemu/qemu-i486/configs/ostest/defconfig index a343dffc325..b4dbbc59f84 100644 --- a/boards/x86/qemu/qemu-i486/configs/ostest/defconfig +++ b/boards/x86/qemu/qemu-i486/configs/ostest/defconfig @@ -18,6 +18,7 @@ CONFIG_BOOT_RUNFROMEXTSRAM=y CONFIG_CONSOLE_SYSLOG=y CONFIG_FS_FAT=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_INIT_ENTRYPOINT="ostest_main" CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x00100000 @@ -28,4 +29,3 @@ CONFIG_START_YEAR=2011 CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_LOOPS=100 CONFIG_TESTING_OSTEST_STACKSIZE=4096 -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig index 08b75e12ff8..5192ab026bb 100644 --- a/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig +++ b/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig @@ -31,6 +31,8 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_HELLO_STACKSIZE=4194304 CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=4194304 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=4194304 CONFIG_LIBM=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -57,5 +59,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_USEC_PER_TICK=1 -CONFIG_USERMAIN_STACKSIZE=4194304 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig index c26ebadbfcb..2e177636500 100644 --- a/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig +++ b/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig @@ -27,6 +27,8 @@ CONFIG_CLOCK_MONOTONIC=y CONFIG_CONSOLE_SYSLOG=y CONFIG_DEBUG_SYMBOLS=y CONFIG_IDLETHREAD_STACKSIZE=4194304 +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=4194304 CONFIG_LIBM=y CONFIG_PREALLOC_CHILDSTATUS=16 CONFIG_PRIORITY_INHERITANCE=y @@ -49,5 +51,3 @@ CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4149304 CONFIG_USEC_PER_TICK=1 -CONFIG_USERMAIN_STACKSIZE=4194304 -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig index 498516340ac..d15b279c54c 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig @@ -34,6 +34,8 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_MM_REGIONS=3 @@ -70,8 +72,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig index 0783b327709..c25583fba43 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig @@ -30,6 +30,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NETDEV_LATEINIT=y @@ -55,6 +56,5 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_BLUETOOTH=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig index 9696875ec5a..95ad36a4597 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig @@ -41,6 +41,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -92,7 +93,6 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_TELNET_CHARACTER_MODE=y CONFIG_TELNET_IOTHREAD_STACKSIZE=2048 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_BLUETOOTH=y CONFIG_WIRELESS_WAPI=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/buttons/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/buttons/defconfig index a8e31091c8b..a4cb1e23fed 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/buttons/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/buttons/defconfig @@ -28,6 +28,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INPUT=y CONFIG_INPUT_BUTTONS=y CONFIG_INPUT_BUTTONS_LOWER=y @@ -51,4 +52,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig index 73183fe5aa0..df2965bca26 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig @@ -33,6 +33,7 @@ CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y @@ -57,4 +58,3 @@ CONFIG_START_YEAR=2011 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig index 8ba0cbc813a..93d39b620b1 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig @@ -25,6 +25,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -47,4 +48,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig index 4bcd7b9155a..4cdc40fb0e9 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig @@ -31,6 +31,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -50,4 +51,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig index dc20a5f3e44..461a40de336 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig @@ -40,6 +40,7 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_MACOS=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE=y @@ -80,7 +81,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig index e0f3b66ff79..e08b7007f5b 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig @@ -30,6 +30,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y CONFIG_MM_REGIONS=3 @@ -52,4 +53,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig index f258664ca25..59e9ef3108e 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig @@ -33,6 +33,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MMCSD=y CONFIG_MMCSD_SPICLOCK=4000000 @@ -55,4 +56,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/module/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/module/defconfig index 2f6a8555ccd..7de235bf22c 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/module/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/module/defconfig @@ -39,6 +39,7 @@ CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_MODULE=y @@ -60,4 +61,3 @@ CONFIG_START_YEAR=2011 CONFIG_SUPPRESS_UART_CONFIG=y CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig index 8ee14a57d96..e444f97d742 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig @@ -32,6 +32,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_THROTTLE=0 @@ -77,7 +78,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig index c00eff379cb..15c58f9f7f9 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig @@ -25,6 +25,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NETDB_DNSCLIENT=y @@ -66,4 +67,3 @@ CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig index c567711436d..3857609f6ba 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig @@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -43,4 +44,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/oneshot/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/oneshot/defconfig index 5e4e71eda07..f3004925171 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/oneshot/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/oneshot/defconfig @@ -32,6 +32,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -55,4 +56,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TIMER=y CONFIG_TIMER_ARCH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig index ebe92afbe43..0f116eaa010 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig @@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -45,4 +46,3 @@ CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig index 578d60c04ee..a7b4860c193 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig @@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -47,4 +48,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig index ec4331f4343..8daa689436a 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig @@ -28,6 +28,7 @@ CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HEAP2_BASE=0x3F800000 CONFIG_HEAP2_SIZE=4194304 CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_NCHAINS=36 @@ -54,4 +55,3 @@ CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig index 2197d38a916..e6ba2792183 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig @@ -26,6 +26,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -46,4 +47,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/rtc/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/rtc/defconfig index de8277eb9ee..bb68d888fcd 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/rtc/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/rtc/defconfig @@ -26,6 +26,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -49,4 +50,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig index 9f0fddf116d..4b5ae24c8f8 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig @@ -28,6 +28,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=4 CONFIG_NSH_ARCHINIT=y @@ -55,4 +56,3 @@ CONFIG_SYSTEM_TASKSET=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/sotest/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/sotest/defconfig index 5835d568f13..adb640c1d95 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/sotest/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/sotest/defconfig @@ -40,6 +40,7 @@ CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_DLFCN=y CONFIG_MM_REGIONS=3 @@ -61,4 +62,3 @@ CONFIG_START_YEAR=2011 CONFIG_SUPPRESS_UART_CONFIG=y CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig index e338a82a82d..65a2334ac83 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig @@ -26,6 +26,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -47,4 +48,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig index 943efd8dec9..6cba6653631 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig @@ -42,6 +42,8 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NETDB_DNSCLIENT=y @@ -77,8 +79,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/tickless/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/tickless/defconfig index 263313331db..53c09fa9304 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/tickless/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/tickless/defconfig @@ -25,6 +25,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=2 CONFIG_NSH_ARCHINIT=y @@ -43,4 +44,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig index 96cd5623d24..93e4569b971 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig @@ -29,6 +29,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -51,4 +52,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TIMER=y CONFIG_TIMER_ARCH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig index 7ddee6eda80..e77a3917b16 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig @@ -47,6 +47,7 @@ CONFIG_ESP32_WIFI_SAVE_PARAM=y CONFIG_ESP32_WIRELESS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NAME_MAX=48 @@ -97,7 +98,6 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_TELNET_CHARACTER_MODE=y CONFIG_TELNET_IOTHREAD_STACKSIZE=2048 CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig index f3a27bd6b3b..de02ba98007 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig @@ -41,6 +41,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=3072 CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=128 CONFIG_MM_REGIONS=4 @@ -109,8 +111,6 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig index 98d901b8de5..12872128544 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig @@ -28,6 +28,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -48,5 +49,4 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig index 123de81efbb..5aca9fd127f 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig @@ -28,6 +28,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -50,5 +51,4 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig index 6028acde80a..23e7e6add8e 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig @@ -33,6 +33,8 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_MM_REGIONS=3 @@ -80,8 +82,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig index 3c43080cc67..25db94809d6 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig @@ -33,6 +33,8 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_MM_REGIONS=3 @@ -69,8 +71,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/buttons/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/buttons/defconfig index e0cfcb2cf12..86ce9c004a5 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/buttons/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/buttons/defconfig @@ -27,6 +27,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INPUT=y CONFIG_INPUT_BUTTONS=y CONFIG_INPUT_BUTTONS_LOWER=y @@ -50,4 +51,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig index 8953a8d0da3..187f5ee0caf 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig @@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NETDB_DNSCLIENT=y @@ -65,4 +66,3 @@ CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig index f0fa00f72f9..ff4b81d12c1 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig @@ -38,6 +38,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE=y @@ -78,7 +79,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig index 8214f79e2b9..37a684407da 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig @@ -29,6 +29,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y CONFIG_MM_REGIONS=3 @@ -51,4 +52,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig index 5095ef85f93..f4a67ebbd89 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig @@ -23,6 +23,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -42,4 +43,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/oneshot/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/oneshot/defconfig index e2aa263fc85..a3d6ad26cc7 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/oneshot/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/oneshot/defconfig @@ -31,6 +31,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -54,4 +55,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TIMER=y CONFIG_TIMER_ARCH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/rtc/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/rtc/defconfig index 8d82c4c67cd..42a440cf4e2 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/rtc/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/rtc/defconfig @@ -25,6 +25,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -48,4 +49,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/tickless/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/tickless/defconfig index 7fd258b05be..492b265de2c 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/tickless/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/tickless/defconfig @@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -42,4 +43,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig index 78f3edd3da8..956aae46a8b 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig @@ -31,6 +31,8 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_MM_REGIONS=3 @@ -68,8 +70,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig index 82d066e8653..12126072412 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig @@ -34,6 +34,8 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_MM_REGIONS=3 @@ -70,8 +72,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig index b2b2ada6051..6365feabfc5 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig @@ -26,6 +26,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -47,4 +48,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/buttons/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/buttons/defconfig index 5ed4e692d59..7d8e492497e 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/buttons/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/buttons/defconfig @@ -28,6 +28,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INPUT=y CONFIG_INPUT_BUTTONS=y CONFIG_INPUT_BUTTONS_LOWER=y @@ -51,4 +52,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig index ba4f1dfa39e..5432ffccc91 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig @@ -27,6 +27,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -47,5 +48,4 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_XTENSA_INTBACKTRACE=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/lcd1602/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/lcd1602/defconfig index 9c8b7dbe3e1..2964b618aa8 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/lcd1602/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/lcd1602/defconfig @@ -27,6 +27,7 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_I2C=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LCD_BACKPACK=y CONFIG_MM_REGIONS=3 @@ -48,4 +49,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig index 69214bc785b..069aa45a5a8 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig @@ -25,6 +25,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -47,4 +48,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/lvgl/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/lvgl/defconfig index 6fd81faec75..f7895f756a3 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/lvgl/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/lvgl/defconfig @@ -34,6 +34,7 @@ CONFIG_GRAPHICS_LVGL=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_DEV=y @@ -60,4 +61,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig index b5651f384f5..702dfdef087 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig @@ -39,6 +39,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE=y @@ -79,7 +80,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig index 3ea6cd45655..e1c647a0c24 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig @@ -30,6 +30,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y CONFIG_MM_REGIONS=3 @@ -52,4 +53,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig index da04fb06785..4440adb6152 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig @@ -24,6 +24,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -43,4 +44,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/nx/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/nx/defconfig index 8ca1bb8ff52..d8146089a34 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/nx/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/nx/defconfig @@ -40,6 +40,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_ILI9341=y @@ -67,4 +68,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/oneshot/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/oneshot/defconfig index 193ea9f2545..84a36c30fd4 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/oneshot/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/oneshot/defconfig @@ -31,6 +31,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -54,4 +55,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TIMER=y CONFIG_TIMER_ARCH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/rtc/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/rtc/defconfig index c69edd81ed5..102e4fd5416 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/rtc/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/rtc/defconfig @@ -26,6 +26,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -49,4 +50,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/tickless/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/tickless/defconfig index 4c6b6773dcc..3db57c684ba 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/tickless/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/tickless/defconfig @@ -25,6 +25,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -43,4 +44,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig index 13eb942de7b..38a017ef49e 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig @@ -32,6 +32,8 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_MM_REGIONS=3 @@ -69,8 +71,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USERMAIN_STACKSIZE=3072 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS=y CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/configs/nsh/defconfig b/boards/xtensa/esp32/ttgo_lora_esp32/configs/nsh/defconfig index d3117fa04b2..6659bb2b7f6 100644 --- a/boards/xtensa/esp32/ttgo_lora_esp32/configs/nsh/defconfig +++ b/boards/xtensa/esp32/ttgo_lora_esp32/configs/nsh/defconfig @@ -27,6 +27,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_MM_REGIONS=3 CONFIG_NSH_ARCHINIT=y @@ -46,4 +47,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/gpio/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/gpio/defconfig index 2110e150ab1..4261487393b 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/gpio/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/gpio/defconfig @@ -28,6 +28,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -46,4 +47,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig index 3e8d9e42145..91c9262beb6 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig @@ -28,6 +28,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -46,4 +47,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nsh/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nsh/defconfig index 4034dc9807e..1c62e4b9240 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nsh/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nsh/defconfig @@ -25,6 +25,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -43,4 +44,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/oneshot/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/oneshot/defconfig index a65ac977bd5..aa25a113edc 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/oneshot/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/oneshot/defconfig @@ -29,6 +29,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -48,4 +49,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/random/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/random/defconfig index 55de81e89aa..95d0934a15c 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/random/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/random/defconfig @@ -27,6 +27,7 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -45,4 +46,3 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/timer/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/timer/defconfig index c22ec7f3a18..86aac28d6e2 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/timer/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/timer/defconfig @@ -28,11 +28,11 @@ CONFIG_ESP32S2_TIMER2=y CONFIG_ESP32S2_TIMER3=y CONFIG_ESP32S2_UART0=y CONFIG_EXAMPLES_TIMER=y -CONFIG_EXAMPLES_TIMER_GPIO=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y @@ -53,4 +53,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TIMER=y CONFIG_TIMER_ARCH=y CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig b/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig index 853c0f787b7..74c3f070c86 100644 --- a/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig +++ b/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH_Z16=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_BUILTIN=y CONFIG_ENDIAN_BIG=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y @@ -36,4 +37,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_UART0_BAUD=57600 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=57600 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig index cac2649d7ea..898d6aedf31 100644 --- a/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig +++ b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig @@ -17,6 +17,8 @@ CONFIG_CONSOLE_SYSLOG=y CONFIG_ENDIAN_BIG=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=4096 CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_STACK_DEFAULT=4096 CONFIG_RAM_SIZE=65536 @@ -30,5 +32,3 @@ CONFIG_TESTING_OSTEST=y CONFIG_UART0_BAUD=57600 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=57600 -CONFIG_USERMAIN_STACKSIZE=4096 -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig b/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig index 84408580282..bd5f3060e9e 100644 --- a/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig +++ b/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig @@ -22,6 +22,8 @@ CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_EZ80_UART0=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_MMCSD=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 @@ -41,5 +43,3 @@ CONFIG_UART0_BAUD=57600 CONFIG_UART0_RXBUFSIZE=32 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig index b817d81c45a..5652a196af7 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig @@ -27,6 +27,8 @@ CONFIG_EZ80_EMAC=y CONFIG_EZ80_PHYCONFIG=1 CONFIG_EZ80_UART0=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="dhcpd_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_NET=y CONFIG_NETUTILS_DHCPD=y CONFIG_NETUTILS_NETLIB=y @@ -51,5 +53,3 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=32 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="dhcpd_main" diff --git a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig index 188f526eb67..0ec42acdd16 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig @@ -24,6 +24,8 @@ CONFIG_EZ80_EMAC=y CONFIG_EZ80_PHYCONFIG=1 CONFIG_EZ80_UART0=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="webserver_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NETUTILS_WEBSERVER=y @@ -50,5 +52,3 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=32 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="webserver_main" diff --git a/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig b/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig index 7330a11208a..ad87f07dd83 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig @@ -26,6 +26,8 @@ CONFIG_EZ80_EMAC=y CONFIG_EZ80_PHYCONFIG=1 CONFIG_EZ80_UART0=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nettest_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NET_ICMP=y @@ -48,5 +50,3 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=32 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nettest_main" diff --git a/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig b/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig index 743420408ef..f744ebebaff 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig @@ -22,6 +22,7 @@ CONFIG_EZ80_EMAC=y CONFIG_EZ80_PHYCONFIG=1 CONFIG_EZ80_UART0=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSCLIENT_ENTRIES=4 @@ -58,4 +59,3 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=192 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig index 328e2f5d1bf..7478513a98c 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig @@ -25,6 +25,8 @@ CONFIG_EZ80_EMAC=y CONFIG_EZ80_PHYCONFIG=1 CONFIG_EZ80_UART0=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="poll_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NET_ICMP=y @@ -50,5 +52,3 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=32 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="poll_main" diff --git a/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig b/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig index 94d5e89d7b4..f024c094b2f 100644 --- a/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig +++ b/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig @@ -27,6 +27,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_NSH_ARCHINIT=y @@ -50,4 +51,3 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=192 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig b/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig index b59ef5e5271..db6b5c80bc0 100644 --- a/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig +++ b/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig @@ -28,6 +28,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_NSH_ARCHINIT=y @@ -51,4 +52,3 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=192 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/z80/ez80/makerlisp/configs/sdboot/defconfig b/boards/z80/ez80/makerlisp/configs/sdboot/defconfig index 8999bb634fe..e876bb54bf0 100644 --- a/boards/z80/ez80/makerlisp/configs/sdboot/defconfig +++ b/boards/z80/ez80/makerlisp/configs/sdboot/defconfig @@ -25,6 +25,7 @@ CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="sd_main" CONFIG_LIBC_HEX2BIN=y CONFIG_MAKERLISP_SDBOOT=y CONFIG_MMCSD=y @@ -44,4 +45,3 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=192 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="sd_main" diff --git a/boards/z80/ez80/z20x/configs/hello/defconfig b/boards/z80/ez80/z20x/configs/hello/defconfig index cfb12cf7bd4..ba0af37840c 100644 --- a/boards/z80/ez80/z20x/configs/hello/defconfig +++ b/boards/z80/ez80/z20x/configs/hello/defconfig @@ -21,6 +21,7 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y CONFIG_EZ80_UART1=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="hello_main" CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 @@ -33,4 +34,3 @@ CONFIG_UART1_BITS=0 CONFIG_UART1_RXBUFSIZE=64 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="hello_main" diff --git a/boards/z80/ez80/z20x/configs/nsh/defconfig b/boards/z80/ez80/z20x/configs/nsh/defconfig index 61776ad50fd..c76f8f3b00a 100644 --- a/boards/z80/ez80/z20x/configs/nsh/defconfig +++ b/boards/z80/ez80/z20x/configs/nsh/defconfig @@ -28,6 +28,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_NSH_ARCHINIT=y @@ -51,4 +52,3 @@ CONFIG_UART1_BITS=0 CONFIG_UART1_RXBUFSIZE=192 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/z80/ez80/z20x/configs/sdboot/defconfig b/boards/z80/ez80/z20x/configs/sdboot/defconfig index 93555aa5a21..5a3a4e28db1 100644 --- a/boards/z80/ez80/z20x/configs/sdboot/defconfig +++ b/boards/z80/ez80/z20x/configs/sdboot/defconfig @@ -25,6 +25,7 @@ CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="sd_main" CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 @@ -40,5 +41,4 @@ CONFIG_UART1_BITS=0 CONFIG_UART1_RXBUFSIZE=64 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="sd_main" CONFIG_Z20X_SDBOOT=y diff --git a/boards/z80/ez80/z20x/configs/w25boot/defconfig b/boards/z80/ez80/z20x/configs/w25boot/defconfig index 2ceaee09477..7ca1e0121f5 100644 --- a/boards/z80/ez80/z20x/configs/w25boot/defconfig +++ b/boards/z80/ez80/z20x/configs/w25boot/defconfig @@ -20,6 +20,7 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_EZ80_SPI=y CONFIG_EZ80_UART1=y CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="w25_main" CONFIG_MTD=y CONFIG_MTD_W25=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 @@ -33,5 +34,4 @@ CONFIG_UART1_BAUD=2400 CONFIG_UART1_BITS=0 CONFIG_UART1_RXBUFSIZE=4096 CONFIG_UART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="w25_main" CONFIG_Z20X_W25BOOT=y diff --git a/boards/z80/z180/p112/configs/ostest/defconfig b/boards/z80/z180/p112/configs/ostest/defconfig index bb71518c28f..09f7aba224f 100644 --- a/boards/z80/z180/p112/configs/ostest/defconfig +++ b/boards/z80/z180/p112/configs/ostest/defconfig @@ -8,20 +8,17 @@ # CONFIG_DEV_CONSOLE is not set # CONFIG_FILE_STREAM is not set CONFIG_ARCH="z80" -CONFIG_ARCH_BOARD="p112" -CONFIG_ARCH_BOARD_P112=y -CONFIG_ARCH_CHIP="z180" -CONFIG_ARCH_CHIP_Z180=y -CONFIG_ARCH_CHIP_Z8018216FSG=y -CONFIG_ARCH_CHIP_Z80182=y +CONFIG_ARCH_BOARD="z80sim" +CONFIG_ARCH_BOARD_Z80SIM=y +CONFIG_ARCH_CHIP="z80" +CONFIG_ARCH_CHIP_Z80=y CONFIG_ARCH_Z80=y CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y -CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y -CONFIG_GRAN=y -CONFIG_HOST_WINDOWS=y +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 @@ -37,7 +34,6 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_NBARRIER_THREADS=4 CONFIG_TESTING_OSTEST_STACKSIZE=1024 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WINDOWS_NATIVE=y -CONFIG_Z180_ESCCA=y +CONFIG_UART_RXBUFSIZE=64 +CONFIG_UART_SERIAL_CONSOLE=y +CONFIG_UART_TXBUFSIZE=64 diff --git a/boards/z80/z8/z8encore000zco/configs/ostest/defconfig b/boards/z80/z8/z8encore000zco/configs/ostest/defconfig index 21e0a4f62b4..5c2de2e31d0 100644 --- a/boards/z80/z8/z8encore000zco/configs/ostest/defconfig +++ b/boards/z80/z8/z8encore000zco/configs/ostest/defconfig @@ -22,6 +22,8 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=256 +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=256 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 @@ -43,6 +45,4 @@ CONFIG_UART0_TXBUFSIZE=0 CONFIG_UART1_BAUD=57600 CONFIG_UART1_RXBUFSIZE=0 CONFIG_UART1_TXBUFSIZE=0 -CONFIG_USERMAIN_STACKSIZE=256 -CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_Z8_ZDSII_V522=y diff --git a/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig b/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig index 50ee2aa30f0..6f72c87b365 100644 --- a/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig +++ b/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig @@ -21,6 +21,8 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=256 +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=256 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 @@ -42,6 +44,4 @@ CONFIG_UART0_TXBUFSIZE=0 CONFIG_UART1_BAUD=57600 CONFIG_UART1_RXBUFSIZE=0 CONFIG_UART1_TXBUFSIZE=0 -CONFIG_USERMAIN_STACKSIZE=256 -CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_Z8_ZDSII_V522=y diff --git a/boards/z80/z80/z80sim/configs/nsh/defconfig b/boards/z80/z80/z80sim/configs/nsh/defconfig index f409f9a3576..537ec1a9d09 100644 --- a/boards/z80/z80/z80sim/configs/nsh/defconfig +++ b/boards/z80/z80/z80sim/configs/nsh/defconfig @@ -29,6 +29,8 @@ CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=40 @@ -46,5 +48,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART_RXBUFSIZE=64 CONFIG_UART_TXBUFSIZE=64 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/z80/z80/z80sim/configs/ostest/defconfig b/boards/z80/z80/z80sim/configs/ostest/defconfig index 744d956fd6c..09f7aba224f 100644 --- a/boards/z80/z80/z80sim/configs/ostest/defconfig +++ b/boards/z80/z80/z80sim/configs/ostest/defconfig @@ -17,6 +17,8 @@ CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_PTHREAD=y +CONFIG_INIT_ENTRYPOINT="ostest_main" +CONFIG_INIT_STACKSIZE=1024 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 @@ -35,5 +37,3 @@ CONFIG_TESTING_OSTEST_STACKSIZE=1024 CONFIG_UART_RXBUFSIZE=64 CONFIG_UART_SERIAL_CONSOLE=y CONFIG_UART_TXBUFSIZE=64 -CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_USER_ENTRYPOINT="ostest_main"