diff --git a/boards/cuav/nora/nuttx-config/bootloader/defconfig b/boards/cuav/nora/nuttx-config/bootloader/defconfig
index b5f3f4bdf4..8dfb24534c 100644
--- a/boards/cuav/nora/nuttx-config/bootloader/defconfig
+++ b/boards/cuav/nora/nuttx-config/bootloader/defconfig
@@ -54,7 +54,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_PREALLOC_TIMERS=50
 CONFIG_PTHREAD_STACK_MIN=512
diff --git a/boards/cuav/x7pro/nuttx-config/bootloader/defconfig b/boards/cuav/x7pro/nuttx-config/bootloader/defconfig
index 471f3b4220..f5d83bcba0 100644
--- a/boards/cuav/x7pro/nuttx-config/bootloader/defconfig
+++ b/boards/cuav/x7pro/nuttx-config/bootloader/defconfig
@@ -54,7 +54,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_PREALLOC_TIMERS=50
 CONFIG_PTHREAD_STACK_MIN=512
diff --git a/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig b/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig
index c86f936ca5..236fc23435 100644
--- a/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig
+++ b/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig
@@ -54,7 +54,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_PREALLOC_TIMERS=50
 CONFIG_PTHREAD_STACK_MIN=512
diff --git a/boards/cubepilot/cubeorange/nuttx-config/console/defconfig b/boards/cubepilot/cubeorange/nuttx-config/console/defconfig
index 001bdebf66..bda59d08c8 100644
--- a/boards/cubepilot/cubeorange/nuttx-config/console/defconfig
+++ b/boards/cubepilot/cubeorange/nuttx-config/console/defconfig
@@ -53,6 +53,7 @@ CONFIG_CDCACM_VENDORSTR="CubePilot"
 CONFIG_CLOCK_MONOTONIC=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_HARDFAULT_ALERT=y
+CONFIG_DEBUG_MEMFAULT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_DEV_FIFO_SIZE=0
@@ -89,7 +90,6 @@ CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
-CONFIG_MM_REGIONS=3
 CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
 CONFIG_MTD_PARTITION=y
@@ -140,7 +140,7 @@ CONFIG_SCHED_LPWORKPRIORITY=50
 CONFIG_SCHED_LPWORKSTACKSIZE=1632
 CONFIG_SCHED_WAITPID=y
 CONFIG_SDCLONE_DISABLE=y
-CONFIG_SDMMC1_SDIO_MODE=y
+CONFIG_SDMMC1_SDIO_PULLUP=y
 CONFIG_SEM_NNESTPRIO=8
 CONFIG_SEM_PREALLOCHOLDERS=0
 CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS=y
@@ -204,7 +204,6 @@ CONFIG_SYSTEM_CDCACM=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=24
 CONFIG_TTY_SIGINT=y
-CONFIG_TTY_SIGINT_CHAR=0x03
 CONFIG_TTY_SIGSTP=y
 CONFIG_UART4_BAUD=57600
 CONFIG_UART4_RXBUFSIZE=600
diff --git a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig
index eba1a877f9..cedbc82f53 100644
--- a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig
+++ b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig
@@ -54,6 +54,7 @@ CONFIG_CDCACM_VENDORSTR="CubePilot"
 CONFIG_CLOCK_MONOTONIC=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_HARDFAULT_ALERT=y
+CONFIG_DEBUG_MEMFAULT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_DEV_FIFO_SIZE=0
@@ -90,7 +91,6 @@ CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
-CONFIG_MM_REGIONS=3
 CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
 CONFIG_MTD_PARTITION=y
diff --git a/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig b/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig
index c1aa5183b7..4bb3bd9a61 100644
--- a/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig
+++ b/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig
@@ -54,7 +54,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_PREALLOC_TIMERS=50
 CONFIG_PTHREAD_STACK_MIN=512
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 2f526b433c..faf0f8608e 100644
--- a/boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig
+++ b/boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig
@@ -54,7 +54,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_PREALLOC_TIMERS=50
 CONFIG_PTHREAD_STACK_MIN=512
diff --git a/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig b/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig
index 6eb96642e4..271291fd95 100644
--- a/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig
+++ b/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig
@@ -54,7 +54,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_PREALLOC_TIMERS=50
 CONFIG_PTHREAD_STACK_MIN=512
diff --git a/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig
index 7cbd9aa662..1c55d4caca 100644
--- a/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig
+++ b/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig
@@ -90,7 +90,6 @@ CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
-CONFIG_MM_REGIONS=3
 CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
 CONFIG_MTD_PARTITION=y
diff --git a/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig b/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig
index c1fadaf531..4f70aaab3d 100644
--- a/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig
+++ b/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig
@@ -54,7 +54,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_PREALLOC_TIMERS=50
 CONFIG_PTHREAD_STACK_MIN=512
diff --git a/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig b/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig
index f03be1440f..71b63bb5b0 100644
--- a/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig
+++ b/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig
@@ -54,7 +54,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_PREALLOC_TIMERS=50
 CONFIG_PTHREAD_STACK_MIN=512
diff --git a/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig b/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig
index 29127e6c9a..51719a40eb 100644
--- a/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig
+++ b/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig
@@ -54,7 +54,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_PREALLOC_TIMERS=50
 CONFIG_PTHREAD_STACK_MIN=512
diff --git a/boards/spracing/h7extreme/nuttx-config/nsh/defconfig b/boards/spracing/h7extreme/nuttx-config/nsh/defconfig
index 57864d0326..7692520a25 100644
--- a/boards/spracing/h7extreme/nuttx-config/nsh/defconfig
+++ b/boards/spracing/h7extreme/nuttx-config/nsh/defconfig
@@ -89,7 +89,6 @@ CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
-CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y