[WIP]: NuttX update to 7.31+

.gitmodules

@@ -5,7 +5,7 @@
 [submodule "src/drivers/uavcan/libuavcan"]
 	path = src/drivers/uavcan/libuavcan
 	url = https://github.com/PX4/uavcan.git
-	branch = px4
+	branch = pr-nuttx_update_7.31+
 [submodule "msg/tools/genmsg"]
 	path = msg/tools/genmsg
 	url = https://github.com/PX4/genmsg.git
@@ -49,11 +49,11 @@
 [submodule "platforms/nuttx/NuttX/nuttx"]
 	path = platforms/nuttx/NuttX/nuttx
 	url = https://github.com/PX4/NuttX.git
-	branch = px4_firmware_nuttx-7.29+
+	branch = px4_firmware_nuttx-7.31+
 [submodule "platforms/nuttx/NuttX/apps"]
 	path = platforms/nuttx/NuttX/apps
 	url = https://github.com/PX4/NuttX-apps.git
-	branch = px4_firmware_nuttx-7.29+
+	branch = px4_firmware_nuttx-7.31+
 [submodule "cmake/configs/uavcan_board_ident"]
 	path = cmake/configs/uavcan_board_ident
 	url = https://github.com/PX4/uavcan_board_ident.git

boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig

@@ -1,3 +1,10 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
 # CONFIG_DISABLE_OS_API is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_MMCSD_HAVE_CARDDETECT is not set
@@ -16,8 +23,11 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
+CONFIG_ARCH_CHIP="stm32"
 CONFIG_ARCH_CHIP_STM32=y
 CONFIG_ARCH_CHIP_STM32F427V=y
 CONFIG_ARCH_INTERRUPTSTACK=512

boards/auav/esc35-v1/nuttx-config/nsh/defconfig

@@ -1,11 +1,21 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
 # CONFIG_DISABLE_OS_API is not set
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_DATE is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_SERIAL is not set
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
+CONFIG_ARCH_CHIP="stm32"
 CONFIG_ARCH_CHIP_STM32=y
 CONFIG_ARCH_CHIP_STM32F303CC=y
 CONFIG_ARCH_INTERRUPTSTACK=4096
@@ -15,7 +25,6 @@ CONFIG_ARMV7M_MEMCPY=y
 CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARDCTL_RESET=y
 CONFIG_BOARD_CUSTOM_LEDS=y
-CONFIG_BOARD_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=5483
 CONFIG_BUILTIN=y
 CONFIG_BUILTIN_PROXY_STACKSIZE=4096

boards/auav/x21/nuttx-config/nsh/defconfig

@@ -1,3 +1,10 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
 # CONFIG_DISABLE_OS_API is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_MMCSD_HAVE_CARDDETECT is not set
@@ -16,8 +23,11 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
+CONFIG_ARCH_CHIP="stm32"
 CONFIG_ARCH_CHIP_STM32=y
 CONFIG_ARCH_CHIP_STM32F427V=y
 CONFIG_ARCH_INTERRUPTSTACK=512

boards/av/x-v1/nuttx-config/nsh/defconfig

@@ -40,8 +40,11 @@
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
+CONFIG_ARCH_CHIP="stm32f7"
 CONFIG_ARCH_CHIP_STM32F777NI=y
 CONFIG_ARCH_CHIP_STM32F7=y
 CONFIG_ARCH_INTERRUPTSTACK=512
@@ -78,10 +81,7 @@ CONFIG_FS_CROMFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FATTIME=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_PROCFS_EXCLUDE_BLOCKS=y
-CONFIG_FS_PROCFS_EXCLUDE_MOUNT=y
-CONFIG_FS_PROCFS_EXCLUDE_MOUNTS=y
-CONFIG_FS_PROCFS_EXCLUDE_USAGE=y
+CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_ROMFS=y
 CONFIG_GRAN=y
@@ -197,6 +197,7 @@ CONFIG_STM32F7_PHYSR_10FD=0x14
 CONFIG_STM32F7_PHYSR_10HD=0x4
 CONFIG_STM32F7_PHYSR_ALTCONFIG=y
 CONFIG_STM32F7_PHYSR_ALTMODE=0x1C
+CONFIG_STM32F7_PROGMEM=y
 CONFIG_STM32F7_PWR=y
 CONFIG_STM32F7_RTC=y
 CONFIG_STM32F7_RTC_HSECLOCK=y
@@ -233,6 +234,8 @@ CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_PING=y
 CONFIG_TASK_NAME_SIZE=24
 CONFIG_TIME_EXTENDED=y
+CONFIG_TTY_SIGINT=y
+CONFIG_TTY_SIGSTP=y
 CONFIG_UART4_BAUD=57600
 CONFIG_UART4_RS485=y
 CONFIG_UART4_RXBUFSIZE=600

boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig

@@ -1,3 +1,10 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
 # CONFIG_DISABLE_OS_API is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_MMCSD_HAVE_CARDDETECT is not set
@@ -16,8 +23,11 @@
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
+CONFIG_ARCH_CHIP="stm32"
 CONFIG_ARCH_CHIP_STM32=y
 CONFIG_ARCH_CHIP_STM32F405RG=y
 CONFIG_ARCH_INTERRUPTSTACK=512

boards/holybro/kakutef7/nuttx-config/nsh/defconfig

@@ -1,5 +1,13 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
 # CONFIG_DISABLE_OS_API is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
+# CONFIG_FS_PROCFS_EXCLUDE_VERSION is not set
 # CONFIG_MMCSD_HAVE_CARDDETECT is not set
 # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set
 # CONFIG_MMCSD_MMCSUPPORT is not set
@@ -15,11 +23,14 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_SPI_CALLBACK is not set
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
+CONFIG_ARCH_CHIP="stm32f7"
 CONFIG_ARCH_CHIP_STM32F745VG=y
 CONFIG_ARCH_CHIP_STM32F7=y
-CONFIG_ARCH_INTERRUPTSTACK=750
+CONFIG_ARCH_INTERRUPTSTACK=512
 CONFIG_ARCH_MATH_H=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_BASEPRI_WAR=y
@@ -59,11 +70,7 @@ CONFIG_FS_CROMFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FATTIME=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_PROCFS_EXCLUDE_BLOCKS=y
-CONFIG_FS_PROCFS_EXCLUDE_MOUNT=y
-CONFIG_FS_PROCFS_EXCLUDE_MOUNTS=y
-CONFIG_FS_PROCFS_EXCLUDE_PARTITIONS=y
-CONFIG_FS_PROCFS_EXCLUDE_USAGE=y
+CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_ROMFS=y
 CONFIG_GRAN=y
@@ -86,6 +93,7 @@ CONFIG_MM_REGIONS=3
 CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
 CONFIG_MTD_PARTITION=y
+CONFIG_MTD_PROGMEM=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NFILE_DESCRIPTORS=20
 CONFIG_NFILE_STREAMS=8
@@ -95,12 +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_MB=y
-CONFIG_NSH_DISABLE_MH=y
-CONFIG_NSH_DISABLE_PSSTACKUSAGE=y
-CONFIG_NSH_DISABLE_TELNETD=y
 CONFIG_NSH_LINELEN=128
 CONFIG_NSH_MAXARGUMENTS=12
 CONFIG_NSH_MMCSDSPIPORTNO=1
@@ -110,13 +112,6 @@ CONFIG_NSH_ROMFSETC=y
 CONFIG_NSH_ROMFSSECTSIZE=128
 CONFIG_NSH_STRERROR=y
 CONFIG_NSH_VARS=y
-CONFIG_NXFONTS_DISABLE_16BPP=y
-CONFIG_NXFONTS_DISABLE_1BPP=y
-CONFIG_NXFONTS_DISABLE_24BPP=y
-CONFIG_NXFONTS_DISABLE_2BPP=y
-CONFIG_NXFONTS_DISABLE_32BPP=y
-CONFIG_NXFONTS_DISABLE_4BPP=y
-CONFIG_NXFONTS_DISABLE_8BPP=y
 CONFIG_PIPES=y
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=50
@@ -133,11 +128,11 @@ CONFIG_RTC_DATETIME=y
 CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=249
-CONFIG_SCHED_HPWORKSTACKSIZE=1800
+CONFIG_SCHED_HPWORKSTACKSIZE=1280
 CONFIG_SCHED_INSTRUMENTATION=y
 CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_LPWORKPRIORITY=50
-CONFIG_SCHED_LPWORKSTACKSIZE=1800
+CONFIG_SCHED_LPWORKSTACKSIZE=1536
 CONFIG_SCHED_WAITPID=y
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_SEM_NNESTPRIO=8
@@ -161,6 +156,7 @@ CONFIG_STM32F7_I2C1=y
 CONFIG_STM32F7_I2C_DYNTIMEO=y
 CONFIG_STM32F7_I2C_DYNTIMEO_STARTSTOP=10
 CONFIG_STM32F7_OTGFS=y
+CONFIG_STM32F7_PROGMEM=y
 CONFIG_STM32F7_PWR=y
 CONFIG_STM32F7_RTC=y
 CONFIG_STM32F7_RTC_HSECLOCK=y
@@ -190,6 +186,8 @@ CONFIG_SYSTEM_CDCACM=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=24
 CONFIG_TIME_EXTENDED=y
+CONFIG_TTY_SIGINT=y
+CONFIG_TTY_SIGSTP=y
 CONFIG_UART4_BAUD=57600
 CONFIG_UART4_RXBUFSIZE=600
 CONFIG_UART4_RXDMA=y

boards/intel/aerofc-v1/nuttx-config/nsh/defconfig

@@ -1,3 +1,10 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
 # CONFIG_DISABLE_OS_API is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_FSUTILS_MKFATFS is not set
@@ -13,8 +20,11 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
+CONFIG_ARCH_CHIP="stm32"
 CONFIG_ARCH_CHIP_STM32=y
 CONFIG_ARCH_CHIP_STM32F429V=y
 CONFIG_ARCH_INTERRUPTSTACK=512

boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig

@@ -7,6 +7,7 @@
 #
 # CONFIG_DISABLE_OS_API is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
+# CONFIG_FS_PROCFS_EXCLUDE_VERSION is not set
 # CONFIG_MMCSD_HAVE_CARDDETECT is not set
 # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set
 # CONFIG_MMCSD_MMCSUPPORT is not set
@@ -22,8 +23,11 @@
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
+CONFIG_ARCH_CHIP="stm32f7"
 CONFIG_ARCH_CHIP_STM32F777NI=y
 CONFIG_ARCH_CHIP_STM32F7=y
 CONFIG_ARCH_INTERRUPTSTACK=512
@@ -66,11 +70,7 @@ CONFIG_FS_CROMFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FATTIME=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_PROCFS_EXCLUDE_BLOCKS=y
-CONFIG_FS_PROCFS_EXCLUDE_MOUNT=y
-CONFIG_FS_PROCFS_EXCLUDE_MOUNTS=y
-CONFIG_FS_PROCFS_EXCLUDE_PARTITIONS=y
-CONFIG_FS_PROCFS_EXCLUDE_USAGE=y
+CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_ROMFS=y
 CONFIG_GRAN=y
@@ -95,6 +95,7 @@ CONFIG_MM_REGIONS=3
 CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
 CONFIG_MTD_PARTITION=y
+CONFIG_MTD_PROGMEM=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NFILE_DESCRIPTORS=20
 CONFIG_NFILE_STREAMS=8
@@ -173,6 +174,7 @@ CONFIG_STM32F7_I2C1=y
 CONFIG_STM32F7_I2C_DYNTIMEO=y
 CONFIG_STM32F7_I2C_DYNTIMEO_STARTSTOP=10
 CONFIG_STM32F7_OTGFS=y
+CONFIG_STM32F7_PROGMEM=y
 CONFIG_STM32F7_PWR=y
 CONFIG_STM32F7_RTC=y
 CONFIG_STM32F7_RTC_HSECLOCK=y
@@ -206,6 +208,8 @@ CONFIG_SYSTEM_CDCACM=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=24
 CONFIG_TIME_EXTENDED=y
+CONFIG_TTY_SIGINT=y
+CONFIG_TTY_SIGSTP=y
 CONFIG_UART4_BAUD=57600
 CONFIG_UART4_RXBUFSIZE=600
 CONFIG_UART4_RXDMA=y

boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig

@@ -1,9 +1,19 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
 # CONFIG_DISABLE_OS_API is not set
 # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set
 # CONFIG_MMCSD_SPI is not set
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
+CONFIG_ARCH_CHIP="kinetis"
 CONFIG_ARCH_CHIP_KINETIS=y
 CONFIG_ARCH_CHIP_MK66FN2M0VMD18=y
 CONFIG_ARCH_INTERRUPTSTACK=512
@@ -171,7 +181,6 @@ CONFIG_SDCLONE_DISABLE=y
 CONFIG_SEM_NNESTPRIO=8
 CONFIG_SEM_PREALLOCHOLDERS=0
 CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS=y
-CONFIG_SERIAL_TERMIOS=y
 CONFIG_SIG_DEFAULT=y
 CONFIG_SIG_SIGALRM_ACTION=y
 CONFIG_SIG_SIGUSR1_ACTION=y
@@ -199,6 +208,6 @@ CONFIG_USBDEV_BUSPOWERED=y
 CONFIG_USBDEV_DUALSPEED=y
 CONFIG_USBDEV_MAXPOWER=500
 CONFIG_USEC_PER_TICK=1000
-CONFIG_USERMAIN_STACKSIZE=2864
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WATCHDOG=y

boards/nxp/fmuk66-v3/src/board_config.h

@@ -50,7 +50,7 @@ __BEGIN_DECLS
 
 /* these headers are not C++ safe */
 #include <kinetis.h>
-#include <chip/kinetis_pinmux.h>
+#include <hardware/kinetis_pinmux.h>
 #include <arch/board/board.h>
 
 /* FMUK66 GPIOs ***********************************************************************************/