diff --git a/boards/uvify/core/nuttx-config/nsh/defconfig b/boards/uvify/core/nuttx-config/nsh/defconfig
index 8d67e1a91f..d789861ef3 100644
--- a/boards/uvify/core/nuttx-config/nsh/defconfig
+++ b/boards/uvify/core/nuttx-config/nsh/defconfig
@@ -79,11 +79,9 @@ CONFIG_IDLETHREAD_STACKSIZE=750
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
-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=2
@@ -114,7 +112,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
@@ -178,7 +175,6 @@ CONFIG_STM32_SPI1=y
 CONFIG_STM32_SPI1_DMA=y
 CONFIG_STM32_SPI1_DMA_BUFFER=1024
 CONFIG_STM32_SPI2=y
-CONFIG_STM32_SPI4=n
 CONFIG_STM32_SPI_DMA=y
 CONFIG_STM32_SPI_DMATHRESHOLD=8
 CONFIG_STM32_TIM10=y
@@ -198,7 +194,6 @@ CONFIG_STM32_WWDG=y
 CONFIG_SYSTEM_CDCACM=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=24
-CONFIG_TIME_EXTENDED=y
 CONFIG_UART4_BAUD=57600
 CONFIG_UART4_RXBUFSIZE=300
 CONFIG_UART4_RXDMA=y
diff --git a/boards/uvify/core/nuttx-config/scripts/script.ld b/boards/uvify/core/nuttx-config/scripts/script.ld
index 0d19229c01..db27829f89 100644
--- a/boards/uvify/core/nuttx-config/scripts/script.ld
+++ b/boards/uvify/core/nuttx-config/scripts/script.ld
@@ -89,11 +89,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/uvify/core/src/can.c b/boards/uvify/core/src/can.c
index 3dd1ad7c68..87e4ae6ec1 100644
--- a/boards/uvify/core/src/can.c
+++ b/boards/uvify/core/src/can.c
@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
 
 #include "stm32.h"
 #include "stm32_can.h"
diff --git a/boards/uvify/core/src/init.c b/boards/uvify/core/src/init.c
index e4c6ca166e..f29d060a3c 100644
--- a/boards/uvify/core/src/init.c
+++ b/boards/uvify/core/src/init.c
@@ -84,7 +84,7 @@
  ****************************************************************************/
 
 /**
- * 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
diff --git a/boards/uvify/core/src/led.c b/boards/uvify/core/src/led.c
index bb233d6767..3f6e1d0528 100644
--- a/boards/uvify/core/src/led.c
+++ b/boards/uvify/core/src/led.c
@@ -47,7 +47,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
diff --git a/boards/uvify/core/src/usb.c b/boards/uvify/core/src/usb.c
index fd118d050d..9c089afb79 100644
--- a/boards/uvify/core/src/usb.c
+++ b/boards/uvify/core/src/usb.c
@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <up_arch.h>
+#include <arm_arch.h>
 #include <stm32.h>
 #include "board_config.h"