From e37382edcb87b26b27f9a036d0bb341d25723021 Mon Sep 17 00:00:00 2001 From: JacobCrabill Date: Thu, 31 Mar 2022 14:26:16 -0700 Subject: [PATCH] boards: Update NuttX configs for NuttX 10.3.0 Rename USER_ENTRYPOINT -> INIT_ENTRYPOINT Rename USERMAIN_STACKSIZE -> INIT_STACKSIZE --- boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig | 4 ++-- boards/ark/can-flow/nuttx-config/canbootloader/defconfig | 2 +- boards/ark/can-flow/nuttx-config/nsh/defconfig | 4 ++-- boards/ark/can-gps/nuttx-config/canbootloader/defconfig | 2 +- boards/ark/can-gps/nuttx-config/nsh/defconfig | 4 ++-- .../ark/can-rtk-gps/nuttx-config/canbootloader/defconfig | 2 +- boards/ark/can-rtk-gps/nuttx-config/nsh/defconfig | 4 ++-- boards/atl/mantis-edu/nuttx-config/nsh/defconfig | 4 ++-- boards/av/x-v1/nuttx-config/nsh/defconfig | 4 ++-- boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig | 4 ++-- boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig | 4 ++-- .../cuav/can-gps-v1/nuttx-config/canbootloader/defconfig | 2 +- boards/cuav/can-gps-v1/nuttx-config/nsh/defconfig | 4 ++-- boards/cuav/nora/nuttx-config/bootloader/defconfig | 4 ++-- boards/cuav/nora/nuttx-config/nsh/defconfig | 4 ++-- boards/cuav/x7pro/nuttx-config/bootloader/defconfig | 4 ++-- boards/cuav/x7pro/nuttx-config/nsh/defconfig | 4 ++-- .../cubeorange/nuttx-config/bootloader/defconfig | 4 ++-- boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig | 4 ++-- .../cubeorange/nuttx-config/socketcan/defconfig | 4 ++-- boards/cubepilot/cubeorange/nuttx-config/test/defconfig | 4 ++-- boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig | 4 ++-- boards/cubepilot/io-v2/nuttx-config/nsh/defconfig | 4 ++-- .../can-rtk-gps/nuttx-config/canbootloader/defconfig | 2 +- boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig | 4 ++-- .../can-gps-v1/nuttx-config/canbootloader/defconfig | 2 +- boards/holybro/can-gps-v1/nuttx-config/nsh/defconfig | 4 ++-- .../durandal-v1/nuttx-config/bootloader/defconfig | 4 ++-- boards/holybro/durandal-v1/nuttx-config/nsh/defconfig | 4 ++-- boards/holybro/kakutef7/nuttx-config/nsh/defconfig | 4 ++-- .../holybro/kakuteh7/nuttx-config/bootloader/defconfig | 4 ++-- boards/holybro/kakuteh7/nuttx-config/nsh/defconfig | 4 ++-- boards/holybro/pix32v5/nuttx-config/nsh/defconfig | 4 ++-- .../gnss-m9n-f4/nuttx-config/canbootloader/defconfig | 2 +- boards/matek/gnss-m9n-f4/nuttx-config/nsh/defconfig | 4 ++-- boards/matek/h743-slim/nuttx-config/bootloader/defconfig | 4 ++-- boards/matek/h743-slim/nuttx-config/nsh/defconfig | 4 ++-- boards/modalai/fc-v1/nuttx-config/nsh/defconfig | 4 ++-- boards/modalai/fc-v2/nuttx-config/bootloader/defconfig | 4 ++-- boards/modalai/fc-v2/nuttx-config/nsh/defconfig | 4 ++-- boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig | 4 ++-- boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig | 4 ++-- .../ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig | 4 ++-- boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig | 4 ++-- .../ctrl-zero-h7-oem/nuttx-config/socketcan/defconfig | 4 ++-- .../mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig | 4 ++-- boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig | 4 ++-- boards/mro/pixracerpro/nuttx-config/bootloader/defconfig | 4 ++-- boards/mro/pixracerpro/nuttx-config/nsh/defconfig | 4 ++-- boards/mro/x21-777/nuttx-config/nsh/defconfig | 4 ++-- boards/mro/x21/nuttx-config/nsh/defconfig | 4 ++-- boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig | 4 ++-- boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig | 4 ++-- boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig | 4 ++-- boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig | 4 ++-- boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig | 4 ++-- .../nxp/ucans32k146/nuttx-config/canbootloader/defconfig | 2 +- boards/nxp/ucans32k146/nuttx-config/nsh/defconfig | 4 ++-- boards/omnibus/f4sd/nuttx-config/nsh/defconfig | 4 ++-- boards/px4/fmu-v2/nuttx-config/nsh/defconfig | 4 ++-- boards/px4/fmu-v3/nuttx-config/nsh/defconfig | 4 ++-- boards/px4/fmu-v4/nuttx-config/nsh/defconfig | 4 ++-- boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig | 4 ++-- boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig | 4 ++-- boards/px4/fmu-v5/nuttx-config/debug/defconfig | 4 ++-- boards/px4/fmu-v5/nuttx-config/nsh/defconfig | 4 ++-- boards/px4/fmu-v5/nuttx-config/protected/defconfig | 4 ++-- boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig | 4 ++-- boards/px4/fmu-v5/nuttx-config/uavcanv1/defconfig | 9 ++++----- boards/px4/fmu-v5/src/stm32_userspace.c | 6 +++--- boards/px4/fmu-v5x/nuttx-config/nsh/defconfig | 4 ++-- boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig | 4 ++-- boards/px4/fmu-v6u/nuttx-config/nsh/defconfig | 4 ++-- boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig | 4 ++-- boards/px4/fmu-v6x/nuttx-config/nsh/defconfig | 4 ++-- boards/px4/io-v2/nuttx-config/nsh/defconfig | 4 ++-- boards/raspberrypi/pico/nuttx-config/nsh/defconfig | 4 ++-- boards/spracing/h7extreme/nuttx-config/nsh/defconfig | 4 ++-- boards/uvify/core/nuttx-config/nsh/defconfig | 4 ++-- 79 files changed, 153 insertions(+), 154 deletions(-) diff --git a/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig b/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig index 4802f6fe06..de7a2647c6 100644 --- a/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig +++ b/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig @@ -227,5 +227,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/ark/can-flow/nuttx-config/canbootloader/defconfig b/boards/ark/can-flow/nuttx-config/canbootloader/defconfig index 75230422cf..ad69105494 100644 --- a/boards/ark/can-flow/nuttx-config/canbootloader/defconfig +++ b/boards/ark/can-flow/nuttx-config/canbootloader/defconfig @@ -58,4 +58,4 @@ CONFIG_STM32_NOEXT_VECTORS=y CONFIG_STM32_TIM8=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_INIT_STACKSIZE=4096 diff --git a/boards/ark/can-flow/nuttx-config/nsh/defconfig b/boards/ark/can-flow/nuttx-config/nsh/defconfig index 6a16a5db17..868fa78d09 100644 --- a/boards/ark/can-flow/nuttx-config/nsh/defconfig +++ b/boards/ark/can-flow/nuttx-config/nsh/defconfig @@ -150,5 +150,5 @@ CONFIG_USART2_RXBUFSIZE=600 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=1100 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2624 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2624 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/ark/can-gps/nuttx-config/canbootloader/defconfig b/boards/ark/can-gps/nuttx-config/canbootloader/defconfig index 8d495caa8d..c2a262cefc 100644 --- a/boards/ark/can-gps/nuttx-config/canbootloader/defconfig +++ b/boards/ark/can-gps/nuttx-config/canbootloader/defconfig @@ -58,4 +58,4 @@ CONFIG_STM32_NOEXT_VECTORS=y CONFIG_STM32_TIM8=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_INIT_STACKSIZE=4096 diff --git a/boards/ark/can-gps/nuttx-config/nsh/defconfig b/boards/ark/can-gps/nuttx-config/nsh/defconfig index bb7562c63e..ce1b59b5bf 100644 --- a/boards/ark/can-gps/nuttx-config/nsh/defconfig +++ b/boards/ark/can-gps/nuttx-config/nsh/defconfig @@ -155,5 +155,5 @@ CONFIG_USART2_RXBUFSIZE=600 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=1100 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2624 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2624 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/ark/can-rtk-gps/nuttx-config/canbootloader/defconfig b/boards/ark/can-rtk-gps/nuttx-config/canbootloader/defconfig index 1ce0048f92..675079c17d 100644 --- a/boards/ark/can-rtk-gps/nuttx-config/canbootloader/defconfig +++ b/boards/ark/can-rtk-gps/nuttx-config/canbootloader/defconfig @@ -58,4 +58,4 @@ CONFIG_STM32_NOEXT_VECTORS=y CONFIG_STM32_TIM8=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_INIT_STACKSIZE=4096 diff --git a/boards/ark/can-rtk-gps/nuttx-config/nsh/defconfig b/boards/ark/can-rtk-gps/nuttx-config/nsh/defconfig index bb1d82dd42..e2afc0b91b 100644 --- a/boards/ark/can-rtk-gps/nuttx-config/nsh/defconfig +++ b/boards/ark/can-rtk-gps/nuttx-config/nsh/defconfig @@ -156,5 +156,5 @@ CONFIG_USART2_RXBUFSIZE=600 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=1100 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2624 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2624 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/atl/mantis-edu/nuttx-config/nsh/defconfig b/boards/atl/mantis-edu/nuttx-config/nsh/defconfig index b196b71d28..56713b836c 100644 --- a/boards/atl/mantis-edu/nuttx-config/nsh/defconfig +++ b/boards/atl/mantis-edu/nuttx-config/nsh/defconfig @@ -235,5 +235,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/av/x-v1/nuttx-config/nsh/defconfig b/boards/av/x-v1/nuttx-config/nsh/defconfig index 79b9178a79..d670f2e59e 100644 --- a/boards/av/x-v1/nuttx-config/nsh/defconfig +++ b/boards/av/x-v1/nuttx-config/nsh/defconfig @@ -267,5 +267,5 @@ CONFIG_USART6_RXBUFSIZE=600 CONFIG_USART6_RXDMA=y CONFIG_USART6_TXBUFSIZE=1500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig b/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig index f3465a41b9..226fd9dcf2 100644 --- a/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig +++ b/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig @@ -185,5 +185,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig b/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig index 3202fd8125..03626023be 100644 --- a/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig +++ b/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig @@ -184,5 +184,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/cuav/can-gps-v1/nuttx-config/canbootloader/defconfig b/boards/cuav/can-gps-v1/nuttx-config/canbootloader/defconfig index 01f7bafa11..9352eacce9 100644 --- a/boards/cuav/can-gps-v1/nuttx-config/canbootloader/defconfig +++ b/boards/cuav/can-gps-v1/nuttx-config/canbootloader/defconfig @@ -59,4 +59,4 @@ CONFIG_STM32_NOEXT_VECTORS=y CONFIG_STM32_TIM8=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_INIT_STACKSIZE=4096 diff --git a/boards/cuav/can-gps-v1/nuttx-config/nsh/defconfig b/boards/cuav/can-gps-v1/nuttx-config/nsh/defconfig index d149e1d69c..3d8945c2cc 100644 --- a/boards/cuav/can-gps-v1/nuttx-config/nsh/defconfig +++ b/boards/cuav/can-gps-v1/nuttx-config/nsh/defconfig @@ -152,5 +152,5 @@ CONFIG_USART2_BAUD=57600 CONFIG_USART2_RXBUFSIZE=600 CONFIG_USART2_TXBUFSIZE=1100 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2624 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2624 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/cuav/nora/nuttx-config/bootloader/defconfig b/boards/cuav/nora/nuttx-config/bootloader/defconfig index 9ea14fb7c9..6de5210f38 100644 --- a/boards/cuav/nora/nuttx-config/bootloader/defconfig +++ b/boards/cuav/nora/nuttx-config/bootloader/defconfig @@ -89,5 +89,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/cuav/nora/nuttx-config/nsh/defconfig b/boards/cuav/nora/nuttx-config/nsh/defconfig index 202c77ee81..5efc080ea5 100644 --- a/boards/cuav/nora/nuttx-config/nsh/defconfig +++ b/boards/cuav/nora/nuttx-config/nsh/defconfig @@ -238,6 +238,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/cuav/x7pro/nuttx-config/bootloader/defconfig b/boards/cuav/x7pro/nuttx-config/bootloader/defconfig index 56d0a0be58..3347485674 100644 --- a/boards/cuav/x7pro/nuttx-config/bootloader/defconfig +++ b/boards/cuav/x7pro/nuttx-config/bootloader/defconfig @@ -89,5 +89,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/cuav/x7pro/nuttx-config/nsh/defconfig b/boards/cuav/x7pro/nuttx-config/nsh/defconfig index 720cfbf338..f44ad647b3 100644 --- a/boards/cuav/x7pro/nuttx-config/nsh/defconfig +++ b/boards/cuav/x7pro/nuttx-config/nsh/defconfig @@ -237,6 +237,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig b/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig index 0975c4e372..5360d3682b 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig +++ b/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig @@ -89,5 +89,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig index 4e0386b66f..4fe8588dd3 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig +++ b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig @@ -228,6 +228,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/cubepilot/cubeorange/nuttx-config/socketcan/defconfig b/boards/cubepilot/cubeorange/nuttx-config/socketcan/defconfig index 1d155b51f7..e5df0d5cc3 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/socketcan/defconfig +++ b/boards/cubepilot/cubeorange/nuttx-config/socketcan/defconfig @@ -240,6 +240,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/cubepilot/cubeorange/nuttx-config/test/defconfig b/boards/cubepilot/cubeorange/nuttx-config/test/defconfig index 6470c318c1..6cb76a9d35 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/test/defconfig +++ b/boards/cubepilot/cubeorange/nuttx-config/test/defconfig @@ -226,6 +226,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig b/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig index 8609d06f24..cba568a14a 100644 --- a/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig +++ b/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig @@ -234,5 +234,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/cubepilot/io-v2/nuttx-config/nsh/defconfig b/boards/cubepilot/io-v2/nuttx-config/nsh/defconfig index 86125cabee..f29fa29edd 100644 --- a/boards/cubepilot/io-v2/nuttx-config/nsh/defconfig +++ b/boards/cubepilot/io-v2/nuttx-config/nsh/defconfig @@ -61,5 +61,5 @@ CONFIG_USART3_RXBUFSIZE=64 CONFIG_USART3_RXDMA=y CONFIG_USART3_TXBUFSIZE=64 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=1100 -CONFIG_USER_ENTRYPOINT="user_start" +CONFIG_INIT_STACKSIZE=1100 +CONFIG_INIT_ENTRYPOINT="user_start" diff --git a/boards/freefly/can-rtk-gps/nuttx-config/canbootloader/defconfig b/boards/freefly/can-rtk-gps/nuttx-config/canbootloader/defconfig index 4c8d867815..1474ce4cfc 100644 --- a/boards/freefly/can-rtk-gps/nuttx-config/canbootloader/defconfig +++ b/boards/freefly/can-rtk-gps/nuttx-config/canbootloader/defconfig @@ -64,4 +64,4 @@ CONFIG_STM32F7_PROGMEM=y CONFIG_STM32F7_TIM8=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_INIT_STACKSIZE=4096 diff --git a/boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig b/boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig index c700035380..9e32be6818 100644 --- a/boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig +++ b/boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig @@ -171,5 +171,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2624 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2624 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/holybro/can-gps-v1/nuttx-config/canbootloader/defconfig b/boards/holybro/can-gps-v1/nuttx-config/canbootloader/defconfig index 96608932d1..dc8a470ea2 100644 --- a/boards/holybro/can-gps-v1/nuttx-config/canbootloader/defconfig +++ b/boards/holybro/can-gps-v1/nuttx-config/canbootloader/defconfig @@ -58,4 +58,4 @@ CONFIG_STM32_NOEXT_VECTORS=y CONFIG_STM32_TIM8=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_INIT_STACKSIZE=4096 diff --git a/boards/holybro/can-gps-v1/nuttx-config/nsh/defconfig b/boards/holybro/can-gps-v1/nuttx-config/nsh/defconfig index 1a6c764072..4bd5bcc8af 100644 --- a/boards/holybro/can-gps-v1/nuttx-config/nsh/defconfig +++ b/boards/holybro/can-gps-v1/nuttx-config/nsh/defconfig @@ -159,5 +159,5 @@ CONFIG_USART2_RXDMA=y CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=2500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=4096 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=4096 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig b/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig index fa77567d82..f9ca0b47cb 100644 --- a/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig +++ b/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig @@ -90,5 +90,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig b/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig index a934d55097..c24a688a1c 100644 --- a/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig +++ b/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig @@ -237,6 +237,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/holybro/kakutef7/nuttx-config/nsh/defconfig b/boards/holybro/kakutef7/nuttx-config/nsh/defconfig index 73a8c67619..14feee7ca3 100644 --- a/boards/holybro/kakutef7/nuttx-config/nsh/defconfig +++ b/boards/holybro/kakutef7/nuttx-config/nsh/defconfig @@ -216,5 +216,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/holybro/kakuteh7/nuttx-config/bootloader/defconfig b/boards/holybro/kakuteh7/nuttx-config/bootloader/defconfig index 97b6db2867..6f0db0015b 100644 --- a/boards/holybro/kakuteh7/nuttx-config/bootloader/defconfig +++ b/boards/holybro/kakuteh7/nuttx-config/bootloader/defconfig @@ -89,5 +89,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/holybro/kakuteh7/nuttx-config/nsh/defconfig b/boards/holybro/kakuteh7/nuttx-config/nsh/defconfig index 1b3ab69e68..8b3e3ceb00 100644 --- a/boards/holybro/kakuteh7/nuttx-config/nsh/defconfig +++ b/boards/holybro/kakuteh7/nuttx-config/nsh/defconfig @@ -219,6 +219,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/holybro/pix32v5/nuttx-config/nsh/defconfig b/boards/holybro/pix32v5/nuttx-config/nsh/defconfig index cbf89393bf..08ca50fe38 100644 --- a/boards/holybro/pix32v5/nuttx-config/nsh/defconfig +++ b/boards/holybro/pix32v5/nuttx-config/nsh/defconfig @@ -239,5 +239,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/matek/gnss-m9n-f4/nuttx-config/canbootloader/defconfig b/boards/matek/gnss-m9n-f4/nuttx-config/canbootloader/defconfig index a15e228515..7c4e18bc69 100644 --- a/boards/matek/gnss-m9n-f4/nuttx-config/canbootloader/defconfig +++ b/boards/matek/gnss-m9n-f4/nuttx-config/canbootloader/defconfig @@ -61,4 +61,4 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 +CONFIG_INIT_STACKSIZE=2944 diff --git a/boards/matek/gnss-m9n-f4/nuttx-config/nsh/defconfig b/boards/matek/gnss-m9n-f4/nuttx-config/nsh/defconfig index 7ae8c5ed83..ff44ce6212 100644 --- a/boards/matek/gnss-m9n-f4/nuttx-config/nsh/defconfig +++ b/boards/matek/gnss-m9n-f4/nuttx-config/nsh/defconfig @@ -191,5 +191,5 @@ CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_DUALSPEED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/matek/h743-slim/nuttx-config/bootloader/defconfig b/boards/matek/h743-slim/nuttx-config/bootloader/defconfig index 92fb47fcec..9246a7aa16 100644 --- a/boards/matek/h743-slim/nuttx-config/bootloader/defconfig +++ b/boards/matek/h743-slim/nuttx-config/bootloader/defconfig @@ -90,5 +90,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/matek/h743-slim/nuttx-config/nsh/defconfig b/boards/matek/h743-slim/nuttx-config/nsh/defconfig index 2b103ac9a9..bf384800de 100644 --- a/boards/matek/h743-slim/nuttx-config/nsh/defconfig +++ b/boards/matek/h743-slim/nuttx-config/nsh/defconfig @@ -224,6 +224,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/modalai/fc-v1/nuttx-config/nsh/defconfig b/boards/modalai/fc-v1/nuttx-config/nsh/defconfig index 9d1b8e46f0..997ce060da 100644 --- a/boards/modalai/fc-v1/nuttx-config/nsh/defconfig +++ b/boards/modalai/fc-v1/nuttx-config/nsh/defconfig @@ -244,5 +244,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/modalai/fc-v2/nuttx-config/bootloader/defconfig b/boards/modalai/fc-v2/nuttx-config/bootloader/defconfig index 4d847c2713..3a2b9e65cd 100644 --- a/boards/modalai/fc-v2/nuttx-config/bootloader/defconfig +++ b/boards/modalai/fc-v2/nuttx-config/bootloader/defconfig @@ -89,5 +89,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/modalai/fc-v2/nuttx-config/nsh/defconfig b/boards/modalai/fc-v2/nuttx-config/nsh/defconfig index 8fb5ab7319..31278439b9 100644 --- a/boards/modalai/fc-v2/nuttx-config/nsh/defconfig +++ b/boards/modalai/fc-v2/nuttx-config/nsh/defconfig @@ -240,7 +240,7 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y CONFIG_WQUEUE_NOTIFIER=y diff --git a/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig index 99ebf28cf5..ad2366636d 100644 --- a/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig @@ -234,5 +234,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig index 1ccadd795e..0b6cd4803b 100644 --- a/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig @@ -232,5 +232,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig b/boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig index 920a30bf1d..bd9c931233 100644 --- a/boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig +++ b/boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig @@ -90,5 +90,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig index 5785698b27..d2f0e88a5c 100644 --- a/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig @@ -233,5 +233,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/mro/ctrl-zero-h7-oem/nuttx-config/socketcan/defconfig b/boards/mro/ctrl-zero-h7-oem/nuttx-config/socketcan/defconfig index 75d193d1fa..226374ff5f 100644 --- a/boards/mro/ctrl-zero-h7-oem/nuttx-config/socketcan/defconfig +++ b/boards/mro/ctrl-zero-h7-oem/nuttx-config/socketcan/defconfig @@ -243,5 +243,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig b/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig index bea411e71f..5dd4ac4614 100644 --- a/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig +++ b/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig @@ -90,5 +90,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig index b7a87538ea..e9a3ff1303 100644 --- a/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig @@ -230,5 +230,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig b/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig index 0f4a2da8fc..7e73c60dea 100644 --- a/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig +++ b/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig @@ -90,5 +90,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/mro/pixracerpro/nuttx-config/nsh/defconfig b/boards/mro/pixracerpro/nuttx-config/nsh/defconfig index d72f637f37..e2404c493d 100644 --- a/boards/mro/pixracerpro/nuttx-config/nsh/defconfig +++ b/boards/mro/pixracerpro/nuttx-config/nsh/defconfig @@ -230,6 +230,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/mro/x21-777/nuttx-config/nsh/defconfig b/boards/mro/x21-777/nuttx-config/nsh/defconfig index 10853a2be3..85cf96e24c 100644 --- a/boards/mro/x21-777/nuttx-config/nsh/defconfig +++ b/boards/mro/x21-777/nuttx-config/nsh/defconfig @@ -234,5 +234,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/mro/x21/nuttx-config/nsh/defconfig b/boards/mro/x21/nuttx-config/nsh/defconfig index e09d3dbb50..b05d38d178 100644 --- a/boards/mro/x21/nuttx-config/nsh/defconfig +++ b/boards/mro/x21/nuttx-config/nsh/defconfig @@ -227,5 +227,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig b/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig index 1695958c99..6dc03f8070 100644 --- a/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig +++ b/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig @@ -223,6 +223,6 @@ CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_DUALSPEED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig b/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig index 4ef6c3549f..3820192034 100644 --- a/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig +++ b/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig @@ -223,6 +223,6 @@ CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_DUALSPEED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig b/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig index 78935afa45..a7da7d7d26 100644 --- a/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig +++ b/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig @@ -219,6 +219,6 @@ CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_DUALSPEED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig b/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig index f99173c797..0edb52d175 100644 --- a/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig +++ b/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig @@ -220,6 +220,6 @@ CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_DUALSPEED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig b/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig index 527c9916e8..39fb5bd1e2 100644 --- a/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig +++ b/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig @@ -227,6 +227,6 @@ CONFIG_USBDEV_DMA=y CONFIG_USBDEV_DUALSPEED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/nxp/ucans32k146/nuttx-config/canbootloader/defconfig b/boards/nxp/ucans32k146/nuttx-config/canbootloader/defconfig index ce1602d8a0..a86f59af27 100644 --- a/boards/nxp/ucans32k146/nuttx-config/canbootloader/defconfig +++ b/boards/nxp/ucans32k146/nuttx-config/canbootloader/defconfig @@ -63,4 +63,4 @@ CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSLOG_DEFAULT=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_INIT_STACKSIZE=4096 diff --git a/boards/nxp/ucans32k146/nuttx-config/nsh/defconfig b/boards/nxp/ucans32k146/nuttx-config/nsh/defconfig index 54fd7511e4..f5bd06d66c 100644 --- a/boards/nxp/ucans32k146/nuttx-config/nsh/defconfig +++ b/boards/nxp/ucans32k146/nuttx-config/nsh/defconfig @@ -112,6 +112,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SPITOOL=y -CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_USERMAIN_STACKSIZE=2176 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2176 CONFIG_WATCHDOG=y diff --git a/boards/omnibus/f4sd/nuttx-config/nsh/defconfig b/boards/omnibus/f4sd/nuttx-config/nsh/defconfig index 2b87fb28bf..5f985c759d 100644 --- a/boards/omnibus/f4sd/nuttx-config/nsh/defconfig +++ b/boards/omnibus/f4sd/nuttx-config/nsh/defconfig @@ -184,5 +184,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/px4/fmu-v2/nuttx-config/nsh/defconfig b/boards/px4/fmu-v2/nuttx-config/nsh/defconfig index b3144a3820..9acae180cb 100644 --- a/boards/px4/fmu-v2/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v2/nuttx-config/nsh/defconfig @@ -233,5 +233,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig b/boards/px4/fmu-v3/nuttx-config/nsh/defconfig index fb85646a8d..f2d96a6d4b 100644 --- a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v3/nuttx-config/nsh/defconfig @@ -230,5 +230,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/px4/fmu-v4/nuttx-config/nsh/defconfig b/boards/px4/fmu-v4/nuttx-config/nsh/defconfig index 83df59eb0d..fe0b066d5d 100644 --- a/boards/px4/fmu-v4/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v4/nuttx-config/nsh/defconfig @@ -228,5 +228,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig b/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig index 05ee2ec9bb..735b0d2f7e 100644 --- a/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig @@ -236,5 +236,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig b/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig index e245364b99..5238af5edc 100644 --- a/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig @@ -242,5 +242,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/px4/fmu-v5/nuttx-config/debug/defconfig b/boards/px4/fmu-v5/nuttx-config/debug/defconfig index ec4e61d5e3..e9ad812a5b 100644 --- a/boards/px4/fmu-v5/nuttx-config/debug/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/debug/defconfig @@ -287,5 +287,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig index 937cd5ab8b..40212c1dde 100644 --- a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig @@ -239,5 +239,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/px4/fmu-v5/nuttx-config/protected/defconfig b/boards/px4/fmu-v5/nuttx-config/protected/defconfig index cb6b60d0e1..5a41ffac46 100644 --- a/boards/px4/fmu-v5/nuttx-config/protected/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/protected/defconfig @@ -247,5 +247,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="px4_entry" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="px4_entry" diff --git a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig b/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig index 94f4eca1bd..5442d77c4d 100644 --- a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig @@ -241,5 +241,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/px4/fmu-v5/nuttx-config/uavcanv1/defconfig b/boards/px4/fmu-v5/nuttx-config/uavcanv1/defconfig index 5b27f12ead..34b198428f 100644 --- a/boards/px4/fmu-v5/nuttx-config/uavcanv1/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/uavcanv1/defconfig @@ -7,6 +7,7 @@ # # CONFIG_DISABLE_ENVIRON is not set # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set +# CONFIG_DISABLE_PTHREAD is not set # CONFIG_FS_PROCFS_EXCLUDE_ENVIRON is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set @@ -41,6 +42,7 @@ CONFIG_ARMV7M_MEMCPY=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_ARM_MPU_EARLY_RESET=y CONFIG_BOARDCTL_RESET=y +CONFIG_BOARD_ASSERT_RESET_VALUE=0 CONFIG_BOARD_CRASHDUMP=y CONFIG_BOARD_LOOPSPERMSEC=22114 CONFIG_BOARD_RESET_ON_ASSERT=2 @@ -56,7 +58,6 @@ CONFIG_CDCACM_RXBUFSIZE=600 CONFIG_CDCACM_TXBUFSIZE=12000 CONFIG_CDCACM_VENDORID=0x26ac CONFIG_CDCACM_VENDORSTR="3D Robotics" -CONFIG_CLOCK_MONOTONIC=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_HARDFAULT_ALERT=y CONFIG_DEBUG_SYMBOLS=y @@ -64,11 +65,11 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DEV_FIFO_SIZE=0 CONFIG_DEV_PIPE_MAXSIZE=1024 CONFIG_DEV_PIPE_SIZE=70 -CONFIG_DISABLE_MQUEUE=y CONFIG_FAT_DMAMEMORY=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FAT_LFN_ALIAS_HASH=y +CONFIG_FAT_MAXFNAME=32 CONFIG_FDCLONE_STDIO=y CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y @@ -139,7 +140,6 @@ CONFIG_SCHED_LPWORK=y CONFIG_SCHED_LPWORKPRIORITY=50 CONFIG_SCHED_LPWORKSTACKSIZE=1632 CONFIG_SCHED_WAITPID=y -CONFIG_SDCLONE_DISABLE=y CONFIG_SDMMC1_SDIO_MODE=y CONFIG_SDMMC1_SDIO_PULLUP=y CONFIG_SEM_NNESTPRIO=8 @@ -147,6 +147,7 @@ CONFIG_SEM_PREALLOCHOLDERS=0 CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS=y CONFIG_SERIAL_TERMIOS=y CONFIG_SIG_DEFAULT=y +CONFIG_SIG_PREALLOC_IRQ_ACTIONS=8 CONFIG_SIG_SIGALRM_ACTION=y CONFIG_SIG_SIGUSR1_ACTION=y CONFIG_SIG_SIGUSR2_ACTION=y @@ -246,5 +247,3 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/px4/fmu-v5/src/stm32_userspace.c b/boards/px4/fmu-v5/src/stm32_userspace.c index 2c52f986bb..d906e41eb5 100644 --- a/boards/px4/fmu-v5/src/stm32_userspace.c +++ b/boards/px4/fmu-v5/src/stm32_userspace.c @@ -89,13 +89,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[]); int nsh_main(int argc, char *argv[]); const struct userspace_s userspace __attribute__((section(".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, @@ -129,7 +129,7 @@ const struct userspace_s userspace __attribute__((section(".userspace"))) = { void px4_userspace_init(void); -int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]) +int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]) { #ifdef CONFIG_NSH_ARCHINIT diff --git a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig index 21b259b835..2f20ce7001 100644 --- a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig @@ -290,5 +290,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig b/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig index 17da3161c3..8d4e7b2c22 100644 --- a/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig +++ b/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig @@ -89,5 +89,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig b/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig index 23990065ff..064f3019bb 100644 --- a/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig @@ -244,7 +244,7 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y CONFIG_WQUEUE_NOTIFIER=y diff --git a/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig b/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig index 40e04d9178..dfd0208501 100644 --- a/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig +++ b/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig @@ -92,5 +92,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="bootloader_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="bootloader_main" diff --git a/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig b/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig index 34e91912d4..bc6a43036d 100644 --- a/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig @@ -291,6 +291,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/px4/io-v2/nuttx-config/nsh/defconfig b/boards/px4/io-v2/nuttx-config/nsh/defconfig index 1444f21613..9bea6e9805 100644 --- a/boards/px4/io-v2/nuttx-config/nsh/defconfig +++ b/boards/px4/io-v2/nuttx-config/nsh/defconfig @@ -61,5 +61,5 @@ CONFIG_USART3_RXBUFSIZE=64 CONFIG_USART3_RXDMA=y CONFIG_USART3_TXBUFSIZE=64 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=1100 -CONFIG_USER_ENTRYPOINT="user_start" +CONFIG_INIT_STACKSIZE=1100 +CONFIG_INIT_ENTRYPOINT="user_start" diff --git a/boards/raspberrypi/pico/nuttx-config/nsh/defconfig b/boards/raspberrypi/pico/nuttx-config/nsh/defconfig index 9615fa4f5d..551bf04f02 100644 --- a/boards/raspberrypi/pico/nuttx-config/nsh/defconfig +++ b/boards/raspberrypi/pico/nuttx-config/nsh/defconfig @@ -112,6 +112,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/spracing/h7extreme/nuttx-config/nsh/defconfig b/boards/spracing/h7extreme/nuttx-config/nsh/defconfig index 842fca4579..75831a9f9f 100644 --- a/boards/spracing/h7extreme/nuttx-config/nsh/defconfig +++ b/boards/spracing/h7extreme/nuttx-config/nsh/defconfig @@ -221,6 +221,6 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2688 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2688 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/uvify/core/nuttx-config/nsh/defconfig b/boards/uvify/core/nuttx-config/nsh/defconfig index dc6761f43c..88d339c245 100644 --- a/boards/uvify/core/nuttx-config/nsh/defconfig +++ b/boards/uvify/core/nuttx-config/nsh/defconfig @@ -227,5 +227,5 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 +CONFIG_INIT_ENTRYPOINT="nsh_main"