diff --git a/boards/av/x-v1/nuttx-config/nsh/defconfig b/boards/av/x-v1/nuttx-config/nsh/defconfig
index 19fbc95d5d6..1ddcd0872eb 100644
--- a/boards/av/x-v1/nuttx-config/nsh/defconfig
+++ b/boards/av/x-v1/nuttx-config/nsh/defconfig
@@ -95,6 +95,7 @@ CONFIG_IOB_NBUFFERS=24
 CONFIG_IOB_THROTTLE=0
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
+CONFIG_MAX_TASKS=64
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
diff --git a/boards/holybro/kakutef7/nuttx-config/nsh/defconfig b/boards/holybro/kakutef7/nuttx-config/nsh/defconfig
index 4a5071a58d1..84c7873a1a6 100644
--- a/boards/holybro/kakutef7/nuttx-config/nsh/defconfig
+++ b/boards/holybro/kakutef7/nuttx-config/nsh/defconfig
@@ -83,6 +83,7 @@ CONFIG_IDLETHREAD_STACKSIZE=750
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
+CONFIG_MAX_TASKS=64
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
diff --git a/boards/modalai/fc-v1/nuttx-config/nsh/defconfig b/boards/modalai/fc-v1/nuttx-config/nsh/defconfig
index 72c56335721..4aba94910a6 100644
--- a/boards/modalai/fc-v1/nuttx-config/nsh/defconfig
+++ b/boards/modalai/fc-v1/nuttx-config/nsh/defconfig
@@ -83,6 +83,7 @@ CONFIG_IDLETHREAD_STACKSIZE=750
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
+CONFIG_MAX_TASKS=64
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
@@ -186,8 +187,6 @@ CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 CONFIG_STM32F7_SERIAL_DISABLE_REORDERING=y
 CONFIG_STM32F7_SPI1=y
 CONFIG_STM32F7_SPI2=y
-CONFIG_STM32F7_SPI3=n
-CONFIG_STM32F7_SPI4=n
 CONFIG_STM32F7_SPI5=y
 CONFIG_STM32F7_SPI6=y
 CONFIG_STM32F7_TIM10=y
diff --git a/boards/modalai/fc-v1/nuttx-config/stackcheck/defconfig b/boards/modalai/fc-v1/nuttx-config/stackcheck/defconfig
index 2dcbde30251..cd828fd1d9b 100644
--- a/boards/modalai/fc-v1/nuttx-config/stackcheck/defconfig
+++ b/boards/modalai/fc-v1/nuttx-config/stackcheck/defconfig
@@ -77,6 +77,7 @@ CONFIG_IDLETHREAD_STACKSIZE=750
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
+CONFIG_MAX_TASKS=64
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
diff --git a/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig
index eee32a16468..cd7774f62b1 100644
--- a/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig
+++ b/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig
@@ -83,6 +83,7 @@ CONFIG_IDLETHREAD_STACKSIZE=750
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
+CONFIG_MAX_TASKS=64
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
diff --git a/boards/px4/fmu-v5/nuttx-config/critmonitor/defconfig b/boards/px4/fmu-v5/nuttx-config/critmonitor/defconfig
index 84b9a985eba..4a95559d9ee 100644
--- a/boards/px4/fmu-v5/nuttx-config/critmonitor/defconfig
+++ b/boards/px4/fmu-v5/nuttx-config/critmonitor/defconfig
@@ -83,6 +83,7 @@ CONFIG_IDLETHREAD_STACKSIZE=750
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
+CONFIG_MAX_TASKS=64
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
diff --git a/boards/px4/fmu-v5/nuttx-config/irqmonitor/defconfig b/boards/px4/fmu-v5/nuttx-config/irqmonitor/defconfig
index ba037bc8ec9..18f7f3ee1a8 100644
--- a/boards/px4/fmu-v5/nuttx-config/irqmonitor/defconfig
+++ b/boards/px4/fmu-v5/nuttx-config/irqmonitor/defconfig
@@ -83,6 +83,7 @@ CONFIG_IDLETHREAD_STACKSIZE=750
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
+CONFIG_MAX_TASKS=64
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
diff --git a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig
index 9846adfaaa7..f1185bc0c01 100644
--- a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig
@@ -83,6 +83,7 @@ CONFIG_IDLETHREAD_STACKSIZE=750
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
+CONFIG_MAX_TASKS=64
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
diff --git a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig b/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig
index 6f01c87d537..ecfb71899ed 100644
--- a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig
+++ b/boards/px4/fmu-v5/nuttx-config/stackcheck/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
@@ -77,6 +84,7 @@ CONFIG_IDLETHREAD_STACKSIZE=750
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
+CONFIG_MAX_TASKS=64
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
diff --git a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig
index 079f9d58468..dbb28a5b28a 100644
--- a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig
@@ -81,11 +81,12 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_I2C=y
 CONFIG_I2C_RESET=y
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_IOB_NBUFFERS=24
 CONFIG_IOB_THROTTLE=0
+CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
+CONFIG_MAX_TASKS=64
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
@@ -98,7 +99,6 @@ CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
 CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
-CONFIG_NFILE_DESCRIPTORS=20
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDB_DNSCLIENT_ENTRIES=8
@@ -117,6 +117,7 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
+CONFIG_NFILE_DESCRIPTORS=20
 CONFIG_NFILE_STREAMS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y