diff --git a/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig b/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig index 9f7d02d481..c2039b18d6 100644 --- a/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig +++ b/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig @@ -226,5 +226,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/airmind/mindpx-v2/src/can.c b/boards/airmind/mindpx-v2/src/can.c index 9d07cf7a35..b826cf001e 100644 --- a/boards/airmind/mindpx-v2/src/can.c +++ b/boards/airmind/mindpx-v2/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/airmind/mindpx-v2/src/usb.c b/boards/airmind/mindpx-v2/src/usb.c index 1f942b04af..93a008cf0f 100644 --- a/boards/airmind/mindpx-v2/src/usb.c +++ b/boards/airmind/mindpx-v2/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" 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 7c8691089f..25723f83d7 100644 --- a/boards/ark/can-flow/nuttx-config/nsh/defconfig +++ b/boards/ark/can-flow/nuttx-config/nsh/defconfig @@ -149,5 +149,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-flow/src/can.c b/boards/ark/can-flow/src/can.c index acc20252fa..7737965dc6 100644 --- a/boards/ark/can-flow/src/can.c +++ b/boards/ark/can-flow/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" 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 c305c085f4..2072601831 100644 --- a/boards/ark/can-gps/nuttx-config/nsh/defconfig +++ b/boards/ark/can-gps/nuttx-config/nsh/defconfig @@ -154,5 +154,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/src/can.c b/boards/ark/can-gps/src/can.c index acc20252fa..7737965dc6 100644 --- a/boards/ark/can-gps/src/can.c +++ b/boards/ark/can-gps/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" 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 b669e96463..9ba880be0d 100644 --- a/boards/ark/can-rtk-gps/nuttx-config/nsh/defconfig +++ b/boards/ark/can-rtk-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/src/can.c b/boards/ark/can-rtk-gps/src/can.c index acc20252fa..7737965dc6 100644 --- a/boards/ark/can-rtk-gps/src/can.c +++ b/boards/ark/can-rtk-gps/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/ark/cannode/nuttx-config/canbootloader/defconfig b/boards/ark/cannode/nuttx-config/canbootloader/defconfig index 2e99504e20..71e3173272 100644 --- a/boards/ark/cannode/nuttx-config/canbootloader/defconfig +++ b/boards/ark/cannode/nuttx-config/canbootloader/defconfig @@ -58,4 +58,4 @@ CONFIG_STM32_FLASH_CONFIG_G=y CONFIG_STM32_NOEXT_VECTORS=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_INIT_STACKSIZE=4096 diff --git a/boards/ark/cannode/nuttx-config/nsh/defconfig b/boards/ark/cannode/nuttx-config/nsh/defconfig index 5b6364324e..0245c5ccd8 100644 --- a/boards/ark/cannode/nuttx-config/nsh/defconfig +++ b/boards/ark/cannode/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/ark/cannode/src/can.c b/boards/ark/cannode/src/can.c index acc20252fa..7737965dc6 100644 --- a/boards/ark/cannode/src/can.c +++ b/boards/ark/cannode/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/atl/mantis-edu/nuttx-config/nsh/defconfig b/boards/atl/mantis-edu/nuttx-config/nsh/defconfig index 94f275a25b..5644ba5997 100644 --- a/boards/atl/mantis-edu/nuttx-config/nsh/defconfig +++ b/boards/atl/mantis-edu/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/atl/mantis-edu/src/pwr.cpp b/boards/atl/mantis-edu/src/pwr.cpp index e645d00529..d732370cb6 100644 --- a/boards/atl/mantis-edu/src/pwr.cpp +++ b/boards/atl/mantis-edu/src/pwr.cpp @@ -55,7 +55,7 @@ #include #include -#include +#include #include "board_config.h" #include diff --git a/boards/av/x-v1/nuttx-config/nsh/defconfig b/boards/av/x-v1/nuttx-config/nsh/defconfig index f5dbb79fbe..affc4dbd3d 100644 --- a/boards/av/x-v1/nuttx-config/nsh/defconfig +++ b/boards/av/x-v1/nuttx-config/nsh/defconfig @@ -266,5 +266,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 af6ca377c5..6a1c2c03c8 100644 --- a/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig +++ b/boards/bitcraze/crazyflie/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/bitcraze/crazyflie/src/spi.cpp b/boards/bitcraze/crazyflie/src/spi.cpp index e9beabbdb3..bd5f6db353 100644 --- a/boards/bitcraze/crazyflie/src/spi.cpp +++ b/boards/bitcraze/crazyflie/src/spi.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include #include "board_config.h" diff --git a/boards/bitcraze/crazyflie/src/usb.c b/boards/bitcraze/crazyflie/src/usb.c index af187d8df6..29bae3dcf9 100644 --- a/boards/bitcraze/crazyflie/src/usb.c +++ b/boards/bitcraze/crazyflie/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" diff --git a/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig b/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig index 72cd38e642..92751122b7 100644 --- a/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig +++ b/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig @@ -183,5 +183,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/src/spi.cpp b/boards/bitcraze/crazyflie21/src/spi.cpp index e9beabbdb3..bd5f6db353 100644 --- a/boards/bitcraze/crazyflie21/src/spi.cpp +++ b/boards/bitcraze/crazyflie21/src/spi.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include #include "board_config.h" diff --git a/boards/bitcraze/crazyflie21/src/usb.c b/boards/bitcraze/crazyflie21/src/usb.c index af187d8df6..29bae3dcf9 100644 --- a/boards/bitcraze/crazyflie21/src/usb.c +++ b/boards/bitcraze/crazyflie21/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" 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 c33c19ca78..804eba4382 100644 --- a/boards/cuav/can-gps-v1/nuttx-config/nsh/defconfig +++ b/boards/cuav/can-gps-v1/nuttx-config/nsh/defconfig @@ -151,5 +151,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/can-gps-v1/src/can.c b/boards/cuav/can-gps-v1/src/can.c index 5a32d62832..89b8ba2281 100644 --- a/boards/cuav/can-gps-v1/src/can.c +++ b/boards/cuav/can-gps-v1/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" 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 8b0629c4d0..8a82027c5a 100644 --- a/boards/cuav/nora/nuttx-config/nsh/defconfig +++ b/boards/cuav/nora/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/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 277039146c..f4db5a96fd 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/cuav/x7pro/nuttx-config/test/defconfig b/boards/cuav/x7pro/nuttx-config/test/defconfig index 97b93866e5..068cdb2573 100644 --- a/boards/cuav/x7pro/nuttx-config/test/defconfig +++ b/boards/cuav/x7pro/nuttx-config/test/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/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 997dd320d1..a8d20d7279 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig +++ b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig @@ -227,6 +227,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 21ae31492d..7b2cbac600 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/test/defconfig +++ b/boards/cubepilot/cubeorange/nuttx-config/test/defconfig @@ -229,6 +229,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 4c1c3c5a57..8df9df1574 100644 --- a/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig +++ b/boards/cubepilot/cubeyellow/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/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/diatone/mamba-f405-mk2/nuttx-config/nsh/defconfig b/boards/diatone/mamba-f405-mk2/nuttx-config/nsh/defconfig index 7290e1d6b0..edb806ee70 100644 --- a/boards/diatone/mamba-f405-mk2/nuttx-config/nsh/defconfig +++ b/boards/diatone/mamba-f405-mk2/nuttx-config/nsh/defconfig @@ -188,5 +188,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/diatone/mamba-f405-mk2/src/usb.c b/boards/diatone/mamba-f405-mk2/src/usb.c index f02ec76bb8..09f0cde408 100644 --- a/boards/diatone/mamba-f405-mk2/src/usb.c +++ b/boards/diatone/mamba-f405-mk2/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" 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 7f6030b465..0ed26b99c1 100644 --- a/boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig +++ b/boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig @@ -170,5 +170,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/freefly/can-rtk-gps/src/can.c b/boards/freefly/can-rtk-gps/src/can.c index 9e9d09c4f9..4fd810d041 100644 --- a/boards/freefly/can-rtk-gps/src/can.c +++ b/boards/freefly/can-rtk-gps/src/can.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_can.h" diff --git a/boards/freefly/can-rtk-gps/src/usb.c b/boards/freefly/can-rtk-gps/src/usb.c index 587516cb8d..553bd8f0f7 100644 --- a/boards/freefly/can-rtk-gps/src/usb.c +++ b/boards/freefly/can-rtk-gps/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include 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 dede82a525..b213b6582c 100644 --- a/boards/holybro/can-gps-v1/nuttx-config/nsh/defconfig +++ b/boards/holybro/can-gps-v1/nuttx-config/nsh/defconfig @@ -158,5 +158,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/can-gps-v1/src/can.c b/boards/holybro/can-gps-v1/src/can.c index 5a32d62832..89b8ba2281 100644 --- a/boards/holybro/can-gps-v1/src/can.c +++ b/boards/holybro/can-gps-v1/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/holybro/can-gps-v1/src/usb.c b/boards/holybro/can-gps-v1/src/usb.c index 7705c0d907..ac46c4a4fe 100644 --- a/boards/holybro/can-gps-v1/src/usb.c +++ b/boards/holybro/can-gps-v1/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" 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 e849cf0bf2..8554d0f13e 100644 --- a/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig +++ b/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig @@ -236,6 +236,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/durandal-v1/src/can.c b/boards/holybro/durandal-v1/src/can.c index 3834074f37..c71b2e8793 100644 --- a/boards/holybro/durandal-v1/src/can.c +++ b/boards/holybro/durandal-v1/src/can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_can.h" diff --git a/boards/holybro/durandal-v1/src/usb.c b/boards/holybro/durandal-v1/src/usb.c index 9d5915c0e6..6d42476b71 100644 --- a/boards/holybro/durandal-v1/src/usb.c +++ b/boards/holybro/durandal-v1/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/holybro/kakutef7/nuttx-config/nsh/defconfig b/boards/holybro/kakutef7/nuttx-config/nsh/defconfig index d97354e910..dd095093cf 100644 --- a/boards/holybro/kakutef7/nuttx-config/nsh/defconfig +++ b/boards/holybro/kakutef7/nuttx-config/nsh/defconfig @@ -215,5 +215,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/kakutef7/src/usb.c b/boards/holybro/kakutef7/src/usb.c index 0ea22da849..4ac9829971 100644 --- a/boards/holybro/kakutef7/src/usb.c +++ b/boards/holybro/kakutef7/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/holybro/kakuteh7/nuttx-config/bootloader/defconfig b/boards/holybro/kakuteh7/nuttx-config/bootloader/defconfig index 5852ec0448..81d8cfb504 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 9a402cc427..8ff6db942a 100644 --- a/boards/holybro/kakuteh7/nuttx-config/nsh/defconfig +++ b/boards/holybro/kakuteh7/nuttx-config/nsh/defconfig @@ -218,6 +218,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/kakuteh7/src/usb.c b/boards/holybro/kakuteh7/src/usb.c index 9d5915c0e6..6d42476b71 100644 --- a/boards/holybro/kakuteh7/src/usb.c +++ b/boards/holybro/kakuteh7/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/holybro/pix32v5/nuttx-config/nsh/defconfig b/boards/holybro/pix32v5/nuttx-config/nsh/defconfig index 898ff192dd..1eb8f1f78b 100644 --- a/boards/holybro/pix32v5/nuttx-config/nsh/defconfig +++ b/boards/holybro/pix32v5/nuttx-config/nsh/defconfig @@ -238,5 +238,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/pix32v5/src/can.c b/boards/holybro/pix32v5/src/can.c index d25a500cd4..fb3ecceb2d 100644 --- a/boards/holybro/pix32v5/src/can.c +++ b/boards/holybro/pix32v5/src/can.c @@ -69,7 +69,7 @@ uint16_t board_get_can_interfaces(void) #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_can.h" diff --git a/boards/holybro/pix32v5/src/usb.c b/boards/holybro/pix32v5/src/usb.c index ef279653d9..0e28676586 100644 --- a/boards/holybro/pix32v5/src/usb.c +++ b/boards/holybro/pix32v5/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include 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 b2d50ba188..34cea68020 100644 --- a/boards/matek/gnss-m9n-f4/nuttx-config/nsh/defconfig +++ b/boards/matek/gnss-m9n-f4/nuttx-config/nsh/defconfig @@ -190,5 +190,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/gnss-m9n-f4/src/can.c b/boards/matek/gnss-m9n-f4/src/can.c index acc20252fa..7737965dc6 100755 --- a/boards/matek/gnss-m9n-f4/src/can.c +++ b/boards/matek/gnss-m9n-f4/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/matek/gnss-m9n-f4/src/usb.c b/boards/matek/gnss-m9n-f4/src/usb.c index d90fa31c30..6ecbb60321 100755 --- a/boards/matek/gnss-m9n-f4/src/usb.c +++ b/boards/matek/gnss-m9n-f4/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" diff --git a/boards/matek/h743-mini/nuttx-config/bootloader/defconfig b/boards/matek/h743-mini/nuttx-config/bootloader/defconfig index b058e087e7..d154697189 100644 --- a/boards/matek/h743-mini/nuttx-config/bootloader/defconfig +++ b/boards/matek/h743-mini/nuttx-config/bootloader/defconfig @@ -88,5 +88,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-mini/nuttx-config/nsh/defconfig b/boards/matek/h743-mini/nuttx-config/nsh/defconfig index 2a9c353c9d..9616746b0b 100644 --- a/boards/matek/h743-mini/nuttx-config/nsh/defconfig +++ b/boards/matek/h743-mini/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/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 8597eeb6af..68fb20cd32 100644 --- a/boards/matek/h743-slim/nuttx-config/nsh/defconfig +++ b/boards/matek/h743-slim/nuttx-config/nsh/defconfig @@ -223,6 +223,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/matek/h743/nuttx-config/bootloader/defconfig b/boards/matek/h743/nuttx-config/bootloader/defconfig index 12722330d4..6f72b25e6e 100644 --- a/boards/matek/h743/nuttx-config/bootloader/defconfig +++ b/boards/matek/h743/nuttx-config/bootloader/defconfig @@ -88,5 +88,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/nuttx-config/nsh/defconfig b/boards/matek/h743/nuttx-config/nsh/defconfig index adfc3394b0..7417d7e8b2 100644 --- a/boards/matek/h743/nuttx-config/nsh/defconfig +++ b/boards/matek/h743/nuttx-config/nsh/defconfig @@ -220,6 +220,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 1c6174376b..58f27ea01b 100644 --- a/boards/modalai/fc-v1/nuttx-config/nsh/defconfig +++ b/boards/modalai/fc-v1/nuttx-config/nsh/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/modalai/fc-v1/src/can.c b/boards/modalai/fc-v1/src/can.c index 471eac6274..1523056e8f 100644 --- a/boards/modalai/fc-v1/src/can.c +++ b/boards/modalai/fc-v1/src/can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_can.h" diff --git a/boards/modalai/fc-v1/src/usb.c b/boards/modalai/fc-v1/src/usb.c index 8fbe73df91..28965c442d 100644 --- a/boards/modalai/fc-v1/src/usb.c +++ b/boards/modalai/fc-v1/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include 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 134ec7e122..338efdc7e9 100644 --- a/boards/modalai/fc-v2/nuttx-config/nsh/defconfig +++ b/boards/modalai/fc-v2/nuttx-config/nsh/defconfig @@ -242,7 +242,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/modalai/fc-v2/src/can.c b/boards/modalai/fc-v2/src/can.c index fb8f730d4b..f65a1952ad 100644 --- a/boards/modalai/fc-v2/src/can.c +++ b/boards/modalai/fc-v2/src/can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_can.h" diff --git a/boards/modalai/fc-v2/src/usb.c b/boards/modalai/fc-v2/src/usb.c index 9d5915c0e6..6d42476b71 100644 --- a/boards/modalai/fc-v2/src/usb.c +++ b/boards/modalai/fc-v2/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/mro/ctrl-zero-classic/nuttx-config/bootloader/defconfig b/boards/mro/ctrl-zero-classic/nuttx-config/bootloader/defconfig index d29195ef58..988032758c 100644 --- a/boards/mro/ctrl-zero-classic/nuttx-config/bootloader/defconfig +++ b/boards/mro/ctrl-zero-classic/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-classic/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-classic/nuttx-config/nsh/defconfig index 7de8c128fd..abb8280ebb 100644 --- a/boards/mro/ctrl-zero-classic/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-classic/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-classic/src/usb.c b/boards/mro/ctrl-zero-classic/src/usb.c index e60a93bb59..fe32ce71ac 100644 --- a/boards/mro/ctrl-zero-classic/src/usb.c +++ b/boards/mro/ctrl-zero-classic/src/usb.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include #include 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 ad56d733ab..17b34868e6 100644 --- a/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-f7-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-f7-oem/src/usb.c b/boards/mro/ctrl-zero-f7-oem/src/usb.c index 0ea22da849..4ac9829971 100644 --- a/boards/mro/ctrl-zero-f7-oem/src/usb.c +++ b/boards/mro/ctrl-zero-f7-oem/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig index ad7a96047d..2847bba591 100644 --- a/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig @@ -231,5 +231,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/src/usb.c b/boards/mro/ctrl-zero-f7/src/usb.c index 0ea22da849..4ac9829971 100644 --- a/boards/mro/ctrl-zero-f7/src/usb.c +++ b/boards/mro/ctrl-zero-f7/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include 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 ac21595e47..29198b91b4 100644 --- a/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-h7-oem/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/src/usb.c b/boards/mro/ctrl-zero-h7-oem/src/usb.c index e60a93bb59..fe32ce71ac 100644 --- a/boards/mro/ctrl-zero-h7-oem/src/usb.c +++ b/boards/mro/ctrl-zero-h7-oem/src/usb.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include #include 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 1db30f975a..3ab1cc9b60 100644 --- a/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig @@ -229,5 +229,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/src/usb.c b/boards/mro/ctrl-zero-h7/src/usb.c index e60a93bb59..fe32ce71ac 100644 --- a/boards/mro/ctrl-zero-h7/src/usb.c +++ b/boards/mro/ctrl-zero-h7/src/usb.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include #include 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 6ecff1756a..cec10361d8 100644 --- a/boards/mro/pixracerpro/nuttx-config/nsh/defconfig +++ b/boards/mro/pixracerpro/nuttx-config/nsh/defconfig @@ -229,6 +229,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 1ddbbe7600..20e19de666 100644 --- a/boards/mro/x21-777/nuttx-config/nsh/defconfig +++ b/boards/mro/x21-777/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/x21-777/src/usb.c b/boards/mro/x21-777/src/usb.c index 0ea22da849..4ac9829971 100644 --- a/boards/mro/x21-777/src/usb.c +++ b/boards/mro/x21-777/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/mro/x21/nuttx-config/nsh/defconfig b/boards/mro/x21/nuttx-config/nsh/defconfig index fe47ead119..6e7cd547e7 100644 --- a/boards/mro/x21/nuttx-config/nsh/defconfig +++ b/boards/mro/x21/nuttx-config/nsh/defconfig @@ -226,5 +226,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/src/can.c b/boards/mro/x21/src/can.c index 5a32d62832..89b8ba2281 100644 --- a/boards/mro/x21/src/can.c +++ b/boards/mro/x21/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/mro/x21/src/usb.c b/boards/mro/x21/src/usb.c index 6fbea86a0b..eed786901e 100644 --- a/boards/mro/x21/src/usb.c +++ b/boards/mro/x21/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" diff --git a/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig b/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig index 9c28b07896..2a8d5daa1d 100644 --- a/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig +++ b/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig @@ -222,6 +222,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 063557447b..d1ed73b9e8 100644 --- a/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig +++ b/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig @@ -222,6 +222,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/src/can.c b/boards/nxp/fmuk66-e/src/can.c index 7589439f48..934e3f4fce 100644 --- a/boards/nxp/fmuk66-e/src/can.c +++ b/boards/nxp/fmuk66-e/src/can.c @@ -51,7 +51,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #include "board_config.h" diff --git a/boards/nxp/fmuk66-e/src/init.c b/boards/nxp/fmuk66-e/src/init.c index ecb7f1bd87..affa94492e 100644 --- a/boards/nxp/fmuk66-e/src/init.c +++ b/boards/nxp/fmuk66-e/src/init.c @@ -67,7 +67,7 @@ #include #include "board_config.h" -#include "arm_arch.h" +#include "arm_internal.h" #include #include diff --git a/boards/nxp/fmuk66-e/src/spi.cpp b/boards/nxp/fmuk66-e/src/spi.cpp index efdd6c484d..78d1a57ce2 100644 --- a/boards/nxp/fmuk66-e/src/spi.cpp +++ b/boards/nxp/fmuk66-e/src/spi.cpp @@ -47,7 +47,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include #include "board_config.h" diff --git a/boards/nxp/fmuk66-e/src/usb.c b/boards/nxp/fmuk66-e/src/usb.c index 3c7098437e..20dd7e78cf 100644 --- a/boards/nxp/fmuk66-e/src/usb.c +++ b/boards/nxp/fmuk66-e/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include "board_config.h" diff --git a/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig b/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig index b9d1df401c..62f67525a0 100644 --- a/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig +++ b/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig @@ -9,6 +9,7 @@ # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_MMCSD_SPI is not set +# CONFIG_NET_TCP_FAST_RETRANSMIT is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD_CUSTOM=y CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/nxp/fmuk66-v3/nuttx-config" @@ -25,7 +26,6 @@ CONFIG_BOARDCTL_RESET=y CONFIG_BOARD_LOOPSPERMSEC=15175 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y -CONFIG_C99_BOOL8=y CONFIG_CDCACM=y CONFIG_CDCACM_BULKIN_REQLEN=96 CONFIG_CDCACM_PRODUCTID=0x001c @@ -62,6 +62,8 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_I2C_RESET=y CONFIG_IDLETHREAD_STACKSIZE=750 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_THROTTLE=0 CONFIG_KINETIS_ADC0=y @@ -116,7 +118,6 @@ CONFIG_LPUART0_SERIAL_CONSOLE=y CONFIG_MEMSET_64BIT=y CONFIG_MEMSET_OPTSPEED=y CONFIG_MMCSD=y -CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MMCSD_SDIO=y CONFIG_MTD=y CONFIG_MTD_BYTE_WRITE=y @@ -175,7 +176,6 @@ CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x1fff0000 CONFIG_RAW_BINARY=y CONFIG_RTC=y -CONFIG_SCHED_ATEXIT=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=249 CONFIG_SCHED_HPWORKSTACKSIZE=1280 @@ -184,7 +184,6 @@ CONFIG_SCHED_INSTRUMENTATION_EXTERNAL=y CONFIG_SCHED_LPWORKPRIORITY=50 CONFIG_SCHED_LPWORKSTACKSIZE=1632 CONFIG_SCHED_WAITPID=y -CONFIG_SDCLONE_DISABLE=y CONFIG_SEM_PREALLOCHOLDERS=32 CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS=y CONFIG_SIG_DEFAULT=y @@ -218,6 +217,4 @@ 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_WATCHDOG=y diff --git a/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig b/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig index 906bd0ce85..7951e6b941 100644 --- a/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig +++ b/boards/nxp/fmuk66-v3/nuttx-config/socketcan/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/test/defconfig b/boards/nxp/fmuk66-v3/nuttx-config/test/defconfig index 9a0ddfc5a1..a2f91fffa5 100644 --- a/boards/nxp/fmuk66-v3/nuttx-config/test/defconfig +++ b/boards/nxp/fmuk66-v3/nuttx-config/test/defconfig @@ -221,6 +221,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/src/init.c b/boards/nxp/fmuk66-v3/src/init.c index 6d0c2f91fa..57e8633459 100644 --- a/boards/nxp/fmuk66-v3/src/init.c +++ b/boards/nxp/fmuk66-v3/src/init.c @@ -67,7 +67,7 @@ #include #include "board_config.h" -#include "arm_arch.h" +#include "arm_internal.h" #include #include diff --git a/boards/nxp/fmuk66-v3/src/spi.cpp b/boards/nxp/fmuk66-v3/src/spi.cpp index ccf25dfd04..5231e4c79e 100644 --- a/boards/nxp/fmuk66-v3/src/spi.cpp +++ b/boards/nxp/fmuk66-v3/src/spi.cpp @@ -47,7 +47,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include #include "board_config.h" diff --git a/boards/nxp/fmuk66-v3/src/usb.c b/boards/nxp/fmuk66-v3/src/usb.c index 3c7098437e..20dd7e78cf 100644 --- a/boards/nxp/fmuk66-v3/src/usb.c +++ b/boards/nxp/fmuk66-v3/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include "board_config.h" diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig b/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig index fd6c7667e5..b4e22d4f19 100644 --- a/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig +++ b/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig @@ -226,6 +226,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/fmurt1062-v1/src/can.c b/boards/nxp/fmurt1062-v1/src/can.c index eb5c40d188..f5d9a2280b 100644 --- a/boards/nxp/fmurt1062-v1/src/can.c +++ b/boards/nxp/fmurt1062-v1/src/can.c @@ -50,7 +50,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #include "board_config.h" diff --git a/boards/nxp/fmurt1062-v1/src/init.c b/boards/nxp/fmurt1062-v1/src/init.c index 9f2bb13b98..1b6feae537 100644 --- a/boards/nxp/fmurt1062-v1/src/init.c +++ b/boards/nxp/fmurt1062-v1/src/init.c @@ -63,7 +63,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #include "arm_internal.h" #include "imxrt_flexspi_nor_boot.h" #include "imxrt_iomuxc.h" diff --git a/boards/nxp/fmurt1062-v1/src/spi.cpp b/boards/nxp/fmurt1062-v1/src/spi.cpp index 5e9fa6131f..04274128f0 100644 --- a/boards/nxp/fmurt1062-v1/src/spi.cpp +++ b/boards/nxp/fmurt1062-v1/src/spi.cpp @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include "imxrt_lpspi.h" #include "imxrt_gpio.h" diff --git a/boards/nxp/fmurt1062-v1/src/usb.c b/boards/nxp/fmurt1062-v1/src/usb.c index 24fe740fed..0d3c71348d 100644 --- a/boards/nxp/fmurt1062-v1/src/usb.c +++ b/boards/nxp/fmurt1062-v1/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include "board_config.h" 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 72c84a0de2..bc051c7186 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_USERMAIN_STACKSIZE=2176 -CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2176 +CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y diff --git a/boards/nxp/ucans32k146/src/autoleds.c b/boards/nxp/ucans32k146/src/autoleds.c index c4b67f8ca9..a762b71d28 100644 --- a/boards/nxp/ucans32k146/src/autoleds.c +++ b/boards/nxp/ucans32k146/src/autoleds.c @@ -72,7 +72,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #include "arm_internal.h" #include "s32k1xx_pin.h" diff --git a/boards/nxp/ucans32k146/src/spi.c b/boards/nxp/ucans32k146/src/spi.c index 9136edb2cc..e6e75202f3 100644 --- a/boards/nxp/ucans32k146/src/spi.c +++ b/boards/nxp/ucans32k146/src/spi.c @@ -48,7 +48,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_config.h" #include "s32k1xx_lpspi.h" diff --git a/boards/nxp/ucans32k146/src/spi.cpp b/boards/nxp/ucans32k146/src/spi.cpp index 7ed6b8194f..860f3de249 100644 --- a/boards/nxp/ucans32k146/src/spi.cpp +++ b/boards/nxp/ucans32k146/src/spi.cpp @@ -47,7 +47,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include diff --git a/boards/nxp/ucans32k146/src/userleds.c b/boards/nxp/ucans32k146/src/userleds.c index e9fce1b85a..1361c129da 100644 --- a/boards/nxp/ucans32k146/src/userleds.c +++ b/boards/nxp/ucans32k146/src/userleds.c @@ -45,7 +45,7 @@ #include -#include "arm_arch.h" +#include "arm_internal.h" #include "arm_internal.h" #include "s32k1xx_pin.h" diff --git a/boards/omnibus/f4sd/nuttx-config/nsh/defconfig b/boards/omnibus/f4sd/nuttx-config/nsh/defconfig index 76a57aada2..44bd45b198 100644 --- a/boards/omnibus/f4sd/nuttx-config/nsh/defconfig +++ b/boards/omnibus/f4sd/nuttx-config/nsh/defconfig @@ -183,5 +183,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/omnibus/f4sd/src/usb.c b/boards/omnibus/f4sd/src/usb.c index f02ec76bb8..09f0cde408 100644 --- a/boards/omnibus/f4sd/src/usb.c +++ b/boards/omnibus/f4sd/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" diff --git a/boards/px4/fmu-v2/nuttx-config/nsh/defconfig b/boards/px4/fmu-v2/nuttx-config/nsh/defconfig index e99d9b2682..556787fb45 100644 --- a/boards/px4/fmu-v2/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v2/nuttx-config/nsh/defconfig @@ -224,5 +224,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/src/can.c b/boards/px4/fmu-v2/src/can.c index 5eea9bef17..25943d53e1 100644 --- a/boards/px4/fmu-v2/src/can.c +++ b/boards/px4/fmu-v2/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/px4/fmu-v2/src/usb.c b/boards/px4/fmu-v2/src/usb.c index 09920c9dfe..023ec0701e 100644 --- a/boards/px4/fmu-v2/src/usb.c +++ b/boards/px4/fmu-v2/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" diff --git a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig b/boards/px4/fmu-v3/nuttx-config/nsh/defconfig index 63f1162998..405855cc85 100644 --- a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v3/nuttx-config/nsh/defconfig @@ -229,5 +229,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/test/defconfig b/boards/px4/fmu-v3/nuttx-config/test/defconfig index 9f2cc8b1fb..e2fa14d666 100644 --- a/boards/px4/fmu-v3/nuttx-config/test/defconfig +++ b/boards/px4/fmu-v3/nuttx-config/test/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/px4/fmu-v3/src/can.c b/boards/px4/fmu-v3/src/can.c index 5eea9bef17..25943d53e1 100644 --- a/boards/px4/fmu-v3/src/can.c +++ b/boards/px4/fmu-v3/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/px4/fmu-v3/src/usb.c b/boards/px4/fmu-v3/src/usb.c index 09920c9dfe..023ec0701e 100644 --- a/boards/px4/fmu-v3/src/usb.c +++ b/boards/px4/fmu-v3/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" diff --git a/boards/px4/fmu-v4/nuttx-config/nsh/defconfig b/boards/px4/fmu-v4/nuttx-config/nsh/defconfig index afa537f7eb..782aa31d2b 100644 --- a/boards/px4/fmu-v4/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v4/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/px4/fmu-v4/nuttx-config/test/defconfig b/boards/px4/fmu-v4/nuttx-config/test/defconfig index fd63253ba1..894f72344b 100644 --- a/boards/px4/fmu-v4/nuttx-config/test/defconfig +++ b/boards/px4/fmu-v4/nuttx-config/test/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/src/can.c b/boards/px4/fmu-v4/src/can.c index 5a32d62832..89b8ba2281 100644 --- a/boards/px4/fmu-v4/src/can.c +++ b/boards/px4/fmu-v4/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/px4/fmu-v4/src/usb.c b/boards/px4/fmu-v4/src/usb.c index 1b148e6eb0..5791d52cb0 100644 --- a/boards/px4/fmu-v4/src/usb.c +++ b/boards/px4/fmu-v4/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" diff --git a/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig b/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig index 9ac90eefa8..6337d21e2c 100644 --- a/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v4pro/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/px4/fmu-v4pro/nuttx-config/test/defconfig b/boards/px4/fmu-v4pro/nuttx-config/test/defconfig index ade487fadf..eaf19aabf7 100644 --- a/boards/px4/fmu-v4pro/nuttx-config/test/defconfig +++ b/boards/px4/fmu-v4pro/nuttx-config/test/defconfig @@ -238,5 +238,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/src/can.c b/boards/px4/fmu-v4pro/src/can.c index 5eea9bef17..25943d53e1 100644 --- a/boards/px4/fmu-v4pro/src/can.c +++ b/boards/px4/fmu-v4pro/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/px4/fmu-v4pro/src/usb.c b/boards/px4/fmu-v4pro/src/usb.c index 09920c9dfe..023ec0701e 100644 --- a/boards/px4/fmu-v4pro/src/usb.c +++ b/boards/px4/fmu-v4pro/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" diff --git a/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig b/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig index 5ab78cad77..f5b2b5af38 100644 --- a/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/cryptotest/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/cyphal/defconfig b/boards/px4/fmu-v5/nuttx-config/cyphal/defconfig index 7695c64029..55fe508982 100644 --- a/boards/px4/fmu-v5/nuttx-config/cyphal/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/cyphal/defconfig @@ -245,5 +245,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 6b0e41bc6b..7bcc11cf80 100644 --- a/boards/px4/fmu-v5/nuttx-config/debug/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/debug/defconfig @@ -289,5 +289,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 e194b35406..1075d1cb74 100644 --- a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/nsh/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 @@ -45,7 +46,6 @@ CONFIG_BOARD_CRASHDUMP=y CONFIG_BOARD_LOOPSPERMSEC=22114 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y -CONFIG_C99_BOOL8=y CONFIG_CDCACM=y CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0032 @@ -61,7 +61,6 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DEV_FIFO_SIZE=0 CONFIG_DEV_PIPE_MAXSIZE=1024 CONFIG_DEV_PIPE_SIZE=70 -CONFIG_DISABLE_MQUEUE=y CONFIG_EXAMPLES_CALIB_UDELAY=y CONFIG_FAT_DMAMEMORY=y CONFIG_FAT_LCNAMES=y @@ -84,6 +83,8 @@ CONFIG_HAVE_CXXINITIALIZE=y CONFIG_I2C=y CONFIG_I2C_RESET=y CONFIG_IDLETHREAD_STACKSIZE=750 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=2944 CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_STRERROR=y CONFIG_MEMSET_64BIT=y @@ -102,9 +103,6 @@ CONFIG_NSH_ARGCAT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_CMDPARMS=y CONFIG_NSH_CROMFSETC=y -CONFIG_NSH_DISABLE_IFCONFIG=y -CONFIG_NSH_DISABLE_IFUPDOWN=y -CONFIG_NSH_DISABLE_TELNETD=y CONFIG_NSH_LINELEN=128 CONFIG_NSH_MAXARGUMENTS=15 CONFIG_NSH_NESTDEPTH=8 @@ -117,7 +115,6 @@ CONFIG_OTG_ID_GPIO_DISABLE=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=50 CONFIG_PRIORITY_INHERITANCE=y -CONFIG_PTHREAD_MUTEX_ROBUST=y CONFIG_PTHREAD_STACK_MIN=512 CONFIG_RAMTRON_SETSPEED=y CONFIG_RAM_SIZE=245760 @@ -126,7 +123,6 @@ CONFIG_RAW_BINARY=y CONFIG_READLINE_CMD_HISTORY=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_RTC_DATETIME=y -CONFIG_SCHED_ATEXIT=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=249 CONFIG_SCHED_HPWORKSTACKSIZE=1280 @@ -136,7 +132,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_PREALLOCHOLDERS=32 @@ -183,7 +178,6 @@ CONFIG_STM32F7_SPI2=y CONFIG_STM32F7_SPI4=y CONFIG_STM32F7_SPI5=y CONFIG_STM32F7_SPI6=y -CONFIG_STM32F7_SPI_DMA=y CONFIG_STM32F7_SPI_DMATHRESHOLD=8 CONFIG_STM32F7_TIM10=y CONFIG_STM32F7_TIM11=y @@ -238,5 +232,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/nuttx-config/protected/defconfig b/boards/px4/fmu-v5/nuttx-config/protected/defconfig index bec6725e77..8587b725aa 100644 --- a/boards/px4/fmu-v5/nuttx-config/protected/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/protected/defconfig @@ -246,5 +246,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 d93a7f3149..abcf8e42e2 100644 --- a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig @@ -240,5 +240,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/test/defconfig b/boards/px4/fmu-v5/nuttx-config/test/defconfig index e5e893f1cd..03d951c98c 100644 --- a/boards/px4/fmu-v5/nuttx-config/test/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/test/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/src/can.c b/boards/px4/fmu-v5/src/can.c index d25a500cd4..fb3ecceb2d 100644 --- a/boards/px4/fmu-v5/src/can.c +++ b/boards/px4/fmu-v5/src/can.c @@ -69,7 +69,7 @@ uint16_t board_get_can_interfaces(void) #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_can.h" 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-v5/src/usb.c b/boards/px4/fmu-v5/src/usb.c index ef279653d9..0e28676586 100644 --- a/boards/px4/fmu-v5/src/usb.c +++ b/boards/px4/fmu-v5/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig index e36b4ef4e3..0e0b1bff90 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-v5x/nuttx-config/test/defconfig b/boards/px4/fmu-v5x/nuttx-config/test/defconfig index e4c812c34b..dff3409783 100644 --- a/boards/px4/fmu-v5x/nuttx-config/test/defconfig +++ b/boards/px4/fmu-v5x/nuttx-config/test/defconfig @@ -293,5 +293,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-v5x/src/can.c b/boards/px4/fmu-v5x/src/can.c index a383a56edd..bb777d8f04 100644 --- a/boards/px4/fmu-v5x/src/can.c +++ b/boards/px4/fmu-v5x/src/can.c @@ -65,7 +65,7 @@ uint16_t board_get_can_interfaces(void) #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_can.h" diff --git a/boards/px4/fmu-v5x/src/usb.c b/boards/px4/fmu-v5x/src/usb.c index 8fbe73df91..28965c442d 100644 --- a/boards/px4/fmu-v5x/src/usb.c +++ b/boards/px4/fmu-v5x/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/px4/fmu-v6c/nuttx-config/bootloader/defconfig b/boards/px4/fmu-v6c/nuttx-config/bootloader/defconfig index b1a80c8587..c67bbf2a92 100644 --- a/boards/px4/fmu-v6c/nuttx-config/bootloader/defconfig +++ b/boards/px4/fmu-v6c/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-v6c/nuttx-config/nsh/defconfig b/boards/px4/fmu-v6c/nuttx-config/nsh/defconfig index 886d41030c..a23c9a88e4 100644 --- a/boards/px4/fmu-v6c/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v6c/nuttx-config/nsh/defconfig @@ -234,7 +234,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-v6c/src/can.c b/boards/px4/fmu-v6c/src/can.c index 3834074f37..c71b2e8793 100644 --- a/boards/px4/fmu-v6c/src/can.c +++ b/boards/px4/fmu-v6c/src/can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_can.h" diff --git a/boards/px4/fmu-v6c/src/usb.c b/boards/px4/fmu-v6c/src/usb.c index 9d5915c0e6..6d42476b71 100644 --- a/boards/px4/fmu-v6c/src/usb.c +++ b/boards/px4/fmu-v6c/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include 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 b1f2c9c2ed..6df9434ba3 100644 --- a/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig @@ -243,7 +243,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-v6u/src/can.c b/boards/px4/fmu-v6u/src/can.c index 3834074f37..c71b2e8793 100644 --- a/boards/px4/fmu-v6u/src/can.c +++ b/boards/px4/fmu-v6u/src/can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_can.h" diff --git a/boards/px4/fmu-v6u/src/usb.c b/boards/px4/fmu-v6u/src/usb.c index 9d5915c0e6..6d42476b71 100644 --- a/boards/px4/fmu-v6u/src/usb.c +++ b/boards/px4/fmu-v6u/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include 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 274c7617a3..51be73e832 100644 --- a/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig @@ -290,6 +290,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/fmu-v6x/src/can.c b/boards/px4/fmu-v6x/src/can.c index e11790a659..1f4e1f28a3 100644 --- a/boards/px4/fmu-v6x/src/can.c +++ b/boards/px4/fmu-v6x/src/can.c @@ -65,7 +65,7 @@ uint16_t board_get_can_interfaces(void) #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_can.h" diff --git a/boards/px4/fmu-v6x/src/usb.c b/boards/px4/fmu-v6x/src/usb.c index 9d5915c0e6..6d42476b71 100644 --- a/boards/px4/fmu-v6x/src/usb.c +++ b/boards/px4/fmu-v6x/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include 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 58d939dda3..d19ceb0639 100644 --- a/boards/raspberrypi/pico/nuttx-config/nsh/defconfig +++ b/boards/raspberrypi/pico/nuttx-config/nsh/defconfig @@ -111,6 +111,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/raspberrypi/pico/src/usb.c b/boards/raspberrypi/pico/src/usb.c index 393f80960e..bc6306ae6b 100644 --- a/boards/raspberrypi/pico/src/usb.c +++ b/boards/raspberrypi/pico/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include "board_config.h" /************************************************************************************ diff --git a/boards/sky-drones/smartap-airlink/nuttx-config/nsh/defconfig b/boards/sky-drones/smartap-airlink/nuttx-config/nsh/defconfig index 7017364cff..953a24458f 100644 --- a/boards/sky-drones/smartap-airlink/nuttx-config/nsh/defconfig +++ b/boards/sky-drones/smartap-airlink/nuttx-config/nsh/defconfig @@ -284,5 +284,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/sky-drones/smartap-airlink/src/can.c b/boards/sky-drones/smartap-airlink/src/can.c index 1a2775d698..3074b01cfb 100644 --- a/boards/sky-drones/smartap-airlink/src/can.c +++ b/boards/sky-drones/smartap-airlink/src/can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_can.h" diff --git a/boards/sky-drones/smartap-airlink/src/usb.c b/boards/sky-drones/smartap-airlink/src/usb.c index 20d223245c..8377bb4bef 100644 --- a/boards/sky-drones/smartap-airlink/src/usb.c +++ b/boards/sky-drones/smartap-airlink/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/spracing/h7extreme/nuttx-config/nsh/defconfig b/boards/spracing/h7extreme/nuttx-config/nsh/defconfig index cdcdf8f068..6d6f7ae5eb 100644 --- a/boards/spracing/h7extreme/nuttx-config/nsh/defconfig +++ b/boards/spracing/h7extreme/nuttx-config/nsh/defconfig @@ -220,6 +220,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/spracing/h7extreme/src/qspi.c b/boards/spracing/h7extreme/src/qspi.c index 5e8df9e816..262045a622 100644 --- a/boards/spracing/h7extreme/src/qspi.c +++ b/boards/spracing/h7extreme/src/qspi.c @@ -59,7 +59,7 @@ #include #include "arm_internal.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "barriers.h" #include "stm32_gpio.h" diff --git a/boards/spracing/h7extreme/src/usb.c b/boards/spracing/h7extreme/src/usb.c index 9d5915c0e6..6d42476b71 100644 --- a/boards/spracing/h7extreme/src/usb.c +++ b/boards/spracing/h7extreme/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/uvify/core/nuttx-config/nsh/defconfig b/boards/uvify/core/nuttx-config/nsh/defconfig index 08921db7e1..d6028700a7 100644 --- a/boards/uvify/core/nuttx-config/nsh/defconfig +++ b/boards/uvify/core/nuttx-config/nsh/defconfig @@ -226,5 +226,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/uvify/core/src/can.c b/boards/uvify/core/src/can.c index 87e4ae6ec1..f35924dd26 100644 --- a/boards/uvify/core/src/can.c +++ b/boards/uvify/core/src/can.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/uvify/core/src/usb.c b/boards/uvify/core/src/usb.c index 9c089afb79..32f853b747 100644 --- a/boards/uvify/core/src/usb.c +++ b/boards/uvify/core/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include "board_config.h" diff --git a/platforms/nuttx/NuttX/Make.defs.in b/platforms/nuttx/NuttX/Make.defs.in index 1e56ddff8f..315bf92300 100644 --- a/platforms/nuttx/NuttX/Make.defs.in +++ b/platforms/nuttx/NuttX/Make.defs.in @@ -102,7 +102,6 @@ FLAGS = $(MAXOPTIMIZATION) -g2 \ -fno-strict-aliasing \ -fomit-frame-pointer \ -Wall \ - -Werror \ -Wextra \ -Wlogical-op \ -Wno-cpp \ diff --git a/platforms/nuttx/NuttX/apps b/platforms/nuttx/NuttX/apps index 6d9010f47e..ab43c625d1 160000 --- a/platforms/nuttx/NuttX/apps +++ b/platforms/nuttx/NuttX/apps @@ -1 +1 @@ -Subproject commit 6d9010f47e7b00d9d86bbdd4630c78cd8d57ba35 +Subproject commit ab43c625d18b283336ea91ae857b0b208a34f365 diff --git a/platforms/nuttx/src/bootloader/stm/stm32_common/systick.c b/platforms/nuttx/src/bootloader/stm/stm32_common/systick.c index 3bc2d00720..ebc83c400d 100644 --- a/platforms/nuttx/src/bootloader/stm/stm32_common/systick.c +++ b/platforms/nuttx/src/bootloader/stm/stm32_common/systick.c @@ -31,7 +31,7 @@ * ****************************************************************************/ -#include "arm_arch.h" +#include "arm_internal.h" #include "lib/systick.h" #include diff --git a/platforms/nuttx/src/px4/common/cpuload.cpp b/platforms/nuttx/src/px4/common/cpuload.cpp index 62c5c6205d..77ca8f942b 100644 --- a/platforms/nuttx/src/px4/common/cpuload.cpp +++ b/platforms/nuttx/src/px4/common/cpuload.cpp @@ -143,53 +143,5 @@ void sched_note_stop(FAR struct tcb_s *tcb) } } -void sched_note_suspend(FAR struct tcb_s *tcb) -{ - if (system_load.initialized) { - if (tcb->pid == 0) { - system_load.tasks[0].total_runtime += hrt_elapsed_time(&system_load.tasks[0].curr_start_time); - return; - - } else { - if (cpuload_monitor_all_count.load() == 0) { - return; - } - } - - for (auto &task : system_load.tasks) { - // Task ending its current scheduling run - if (task.valid && (task.curr_start_time > 0) - && task.tcb && task.tcb->pid == tcb->pid) { - - task.total_runtime += hrt_elapsed_time(&task.curr_start_time); - break; - } - } - } -} - -void sched_note_resume(FAR struct tcb_s *tcb) -{ - if (system_load.initialized) { - if (tcb->pid == 0) { - hrt_store_absolute_time(&system_load.tasks[0].curr_start_time); - return; - - } else { - if (cpuload_monitor_all_count.load() == 0) { - return; - } - } - - for (auto &task : system_load.tasks) { - if (task.valid && task.tcb && task.tcb->pid == tcb->pid) { - // curr_start_time is accessed from an IRQ handler (in logger), so we need - // to make the update atomic - hrt_store_absolute_time(&task.curr_start_time); - break; - } - } - } -} __END_DECLS #endif // PX4_NUTTX && CONFIG_SCHED_INSTRUMENTATION diff --git a/platforms/nuttx/src/px4/common/px4_24xxxx_mtd.c b/platforms/nuttx/src/px4/common/px4_24xxxx_mtd.c index bbca9c80c3..65e5794a96 100644 --- a/platforms/nuttx/src/px4/common/px4_24xxxx_mtd.c +++ b/platforms/nuttx/src/px4/common/px4_24xxxx_mtd.c @@ -514,7 +514,6 @@ static int at24c_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) ret = at24c_eraseall(priv); break; - case MTDIOC_XIPBASE: default: ret = -ENOTTY; /* Bad command */ break; diff --git a/platforms/nuttx/src/px4/nxp/imxrt/board_critmon/board_critmon.c b/platforms/nuttx/src/px4/nxp/imxrt/board_critmon/board_critmon.c index a11632c3a6..723f21505f 100644 --- a/platforms/nuttx/src/px4/nxp/imxrt/board_critmon/board_critmon.c +++ b/platforms/nuttx/src/px4/nxp/imxrt/board_critmon/board_critmon.c @@ -42,7 +42,7 @@ #include #include "dwt.h" -#include "arm_arch.h" +#include "arm_internal.h" #include diff --git a/platforms/nuttx/src/px4/nxp/imxrt/board_reset/board_reset.cpp b/platforms/nuttx/src/px4/nxp/imxrt/board_reset/board_reset.cpp index b067e1c242..b60d57a4d4 100644 --- a/platforms/nuttx/src/px4/nxp/imxrt/board_reset/board_reset.cpp +++ b/platforms/nuttx/src/px4/nxp/imxrt/board_reset/board_reset.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #define PX4_IMXRT_RTC_REBOOT_REG 3 // Must be common with bootloader and: diff --git a/platforms/nuttx/src/px4/nxp/imxrt/version/board_identity.c b/platforms/nuttx/src/px4/nxp/imxrt/version/board_identity.c index 522c7400b7..36345e5bb4 100644 --- a/platforms/nuttx/src/px4/nxp/imxrt/version/board_identity.c +++ b/platforms/nuttx/src/px4/nxp/imxrt/version/board_identity.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #define CPU_UUID_BYTE_FORMAT_ORDER {3, 2, 1, 0, 7, 6, 5, 4} diff --git a/platforms/nuttx/src/px4/nxp/imxrt/version/board_mcu_version.c b/platforms/nuttx/src/px4/nxp/imxrt/version/board_mcu_version.c index a9e4a07609..d28253894e 100644 --- a/platforms/nuttx/src/px4/nxp/imxrt/version/board_mcu_version.c +++ b/platforms/nuttx/src/px4/nxp/imxrt/version/board_mcu_version.c @@ -42,7 +42,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #define DIGPROG_MINOR_SHIFT 0 #define DIGPROG_MINOR_MASK (0xff << DIGPROG_MINOR_SHIFT) diff --git a/platforms/nuttx/src/px4/nxp/kinetis/version/board_mcu_version.c b/platforms/nuttx/src/px4/nxp/kinetis/version/board_mcu_version.c index 8b0d174bc1..e92cb1dcda 100644 --- a/platforms/nuttx/src/px4/nxp/kinetis/version/board_mcu_version.c +++ b/platforms/nuttx/src/px4/nxp/kinetis/version/board_mcu_version.c @@ -40,7 +40,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/kinetis_sim.h" #define CHIP_TAG "Kinetis K??" diff --git a/platforms/nuttx/src/px4/nxp/s32k1xx/version/board_mcu_version.c b/platforms/nuttx/src/px4/nxp/s32k1xx/version/board_mcu_version.c index 93ebd40505..61e8819303 100644 --- a/platforms/nuttx/src/px4/nxp/s32k1xx/version/board_mcu_version.c +++ b/platforms/nuttx/src/px4/nxp/s32k1xx/version/board_mcu_version.c @@ -41,7 +41,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/s32k1xx_sim.h" #define CHIP_TAG "S32KXXX" diff --git a/platforms/nuttx/src/px4/rpi/rpi_common/spi/spi.cpp b/platforms/nuttx/src/px4/rpi/rpi_common/spi/spi.cpp index 350b914342..9b05e6542a 100644 --- a/platforms/nuttx/src/px4/rpi/rpi_common/spi/spi.cpp +++ b/platforms/nuttx/src/px4/rpi/rpi_common/spi/spi.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include static const px4_spi_bus_t *_spi_bus0; diff --git a/platforms/nuttx/src/px4/stm/stm32_common/board_critmon/board_critmon.c b/platforms/nuttx/src/px4/stm/stm32_common/board_critmon/board_critmon.c index 7b05384ab7..480bfc0250 100644 --- a/platforms/nuttx/src/px4/stm/stm32_common/board_critmon/board_critmon.c +++ b/platforms/nuttx/src/px4/stm/stm32_common/board_critmon/board_critmon.c @@ -42,7 +42,7 @@ #include #include "dwt.h" -#include "arm_arch.h" +#include "arm_internal.h" #include diff --git a/platforms/nuttx/src/px4/stm/stm32_common/spi/spi.cpp b/platforms/nuttx/src/px4/stm/stm32_common/spi/spi.cpp index a4e12318b6..989a543893 100644 --- a/platforms/nuttx/src/px4/stm/stm32_common/spi/spi.cpp +++ b/platforms/nuttx/src/px4/stm/stm32_common/spi/spi.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include diff --git a/platforms/nuttx/src/px4/stm/stm32f7/watchdog/iwdg.c b/platforms/nuttx/src/px4/stm/stm32f7/watchdog/iwdg.c index a2c272a385..57fcfd067a 100644 --- a/platforms/nuttx/src/px4/stm/stm32f7/watchdog/iwdg.c +++ b/platforms/nuttx/src/px4/stm/stm32f7/watchdog/iwdg.c @@ -34,7 +34,7 @@ #include #include "arm_internal.h" -#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "nvic.h" diff --git a/src/drivers/bootloaders/boot_app_shared.c b/src/drivers/bootloaders/boot_app_shared.c index a63efa5430..cdee0d4649 100644 --- a/src/drivers/bootloaders/boot_app_shared.c +++ b/src/drivers/bootloaders/boot_app_shared.c @@ -43,7 +43,7 @@ #include #include -#include "arm_arch.h" +#include "arm_internal.h" #include "boot_app_shared.h" #include diff --git a/src/drivers/uavcan/uavcan_drivers/kinetis/driver/src/internal.hpp b/src/drivers/uavcan/uavcan_drivers/kinetis/driver/src/internal.hpp index 0dc4331a77..a76b5fde5b 100644 --- a/src/drivers/uavcan/uavcan_drivers/kinetis/driver/src/internal.hpp +++ b/src/drivers/uavcan/uavcan_drivers/kinetis/driver/src/internal.hpp @@ -9,7 +9,7 @@ #if UAVCAN_KINETIS_NUTTX # include -# include "arm_arch.h" +# include "arm_internal.h" # include # include # include diff --git a/src/modules/px4iofirmware/serial.cpp b/src/modules/px4iofirmware/serial.cpp index 9829fc2907..ef4a18cba7 100644 --- a/src/modules/px4iofirmware/serial.cpp +++ b/src/modules/px4iofirmware/serial.cpp @@ -49,7 +49,7 @@ /* XXX might be able to prune these */ #include #include -#include +#include #include //#define DEBUG