diff --git a/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig b/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig
index cd6d509c4f..dd7900dcac 100644
--- a/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig
+++ b/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig
@@ -44,7 +44,6 @@ CONFIG_DISABLE_PTHREAD=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_FDCLONE_DISABLE=y
 CONFIG_FDCLONE_STDIO=y
-CONFIG_FS_WRITABLE=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=750
@@ -53,15 +52,12 @@ CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
-CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MM_REGIONS=3
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_NFILE_STREAMS=3
-CONFIG_NPTHREAD_KEYS=4
 CONFIG_PREALLOC_TIMERS=50
-CONFIG_PREALLOC_WDOGS=50
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_RAM_SIZE=245760
 CONFIG_RAM_START=0x20010000
@@ -87,7 +83,6 @@ CONFIG_STM32H7_USART3=y
 CONFIG_SYSTEMTICK_HOOK=y
 CONFIG_SYSTEM_CDCACM=y
 CONFIG_TASK_NAME_SIZE=24
-CONFIG_TIME_EXTENDED=y
 CONFIG_TTY_SIGINT=y
 CONFIG_TTY_SIGINT_CHAR=0x03
 CONFIG_TTY_SIGSTP=y
diff --git a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig
index b46f1f8426..0f897eee66 100644
--- a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig
+++ b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig
@@ -84,11 +84,9 @@ 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
 CONFIG_MMCSD=y
-CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
 CONFIG_MM_REGIONS=3
@@ -120,7 +118,6 @@ CONFIG_NSH_STRERROR=y
 CONFIG_NSH_VARS=y
 CONFIG_PIPES=y
 CONFIG_PREALLOC_TIMERS=50
-CONFIG_PREALLOC_WDOGS=50
 CONFIG_PRIORITY_INHERITANCE=y
 CONFIG_PTHREAD_MUTEX_ROBUST=y
 CONFIG_PTHREAD_STACK_MIN=512
@@ -204,7 +201,6 @@ CONFIG_STM32H7_USART_SWAP=y
 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
diff --git a/boards/cubepilot/cubeorange/nuttx-config/scripts/bootloader_script.ld b/boards/cubepilot/cubeorange/nuttx-config/scripts/bootloader_script.ld
index 19f54da6d7..8d5c394482 100644
--- a/boards/cubepilot/cubeorange/nuttx-config/scripts/bootloader_script.ld
+++ b/boards/cubepilot/cubeorange/nuttx-config/scripts/bootloader_script.ld
@@ -158,11 +158,6 @@ SECTIONS
 		*(.gnu.linkonce.r.*)
 		_etext = ABSOLUTE(.);
 
-		/*
-		 * This is a hack to make the newlib libm __errno() call
-		 * use the NuttX get_errno_ptr() function.
-		 */
-		__errno = get_errno_ptr;
 	} > FLASH
 
 	/*
diff --git a/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld b/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld
index 35d756014a..4ea14a8455 100644
--- a/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld
+++ b/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld
@@ -157,11 +157,6 @@ SECTIONS
 		*(.gnu.linkonce.r.*)
 		_etext = ABSOLUTE(.);
 
-		/*
-		 * This is a hack to make the newlib libm __errno() call
-		 * use the NuttX get_errno_ptr() function.
-		 */
-		__errno = get_errno_ptr;
 	} > FLASH
 
 	/*
diff --git a/boards/cubepilot/cubeorange/src/bootloader_main.c b/boards/cubepilot/cubeorange/src/bootloader_main.c
index d2b0c0e0de..88b10e683d 100644
--- a/boards/cubepilot/cubeorange/src/bootloader_main.c
+++ b/boards/cubepilot/cubeorange/src/bootloader_main.c
@@ -45,7 +45,7 @@
 #include <chip.h>
 #include <stm32_uart.h>
 #include <arch/board/board.h>
-#include "up_internal.h"
+#include "arm_internal.h"
 
 extern int sercon_main(int c, char **argv);
 
diff --git a/boards/cubepilot/cubeorange/src/init.c b/boards/cubepilot/cubeorange/src/init.c
index c20ff56789..7702d67463 100644
--- a/boards/cubepilot/cubeorange/src/init.c
+++ b/boards/cubepilot/cubeorange/src/init.c
@@ -48,7 +48,7 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 #include <arch/board/board.h>
-#include "up_internal.h"
+#include "arm_internal.h"
 
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_board_led.h>
diff --git a/boards/cubepilot/cubeorange/src/led.c b/boards/cubepilot/cubeorange/src/led.c
index 5564a16fc0..f3c25469c4 100644
--- a/boards/cubepilot/cubeorange/src/led.c
+++ b/boards/cubepilot/cubeorange/src/led.c
@@ -49,7 +49,7 @@
 #include <arch/board/board.h>
 
 /*
- * Ideally we'd be able to get these from up_internal.h,
+ * Ideally we'd be able to get these from arm_internal.h,
  * but since we want to be able to disable the NuttX use
  * of leds for system indication at will and there is no
  * separate switch, we need to build independent of the