diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h b/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h
index 03976828fa..724dcc82c0 100644
--- a/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h
+++ b/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h
@@ -121,6 +121,8 @@
 
 #define IMXRT_SYS_PLL_SELECT      CCM_ANALOG_PLL_SYS_DIV_SELECT_22
 
+#define IMXRT_USB1_PLL_DIV_SELECT  CCM_ANALOG_PLL_USB1_DIV_SELECT_20
+
 #define BOARD_CPU_FREQUENCY \
 	(BOARD_XTAL_FREQUENCY * (IMXRT_ARM_PLL_DIV_SELECT / 2)) / IMXRT_ARM_PODF_DIVIDER
 
diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig b/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig
index f2612cd71d..6dc106df7e 100644
--- a/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig
+++ b/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig
@@ -72,7 +72,6 @@ CONFIG_FS_CROMFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FATTIME=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_ROMFS=y
 CONFIG_GRAN=y
@@ -155,7 +154,6 @@ CONFIG_LPUART7_TXBUFSIZE=1500
 CONFIG_LPUART8_BAUD=57600
 CONFIG_LPUART8_RXBUFSIZE=600
 CONFIG_LPUART8_TXBUFSIZE=1500
-CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
@@ -189,7 +187,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
@@ -226,7 +223,6 @@ CONFIG_STDIO_BUFFER_SIZE=256
 CONFIG_SYSTEM_CDCACM=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=24
-CONFIG_TIME_EXTENDED=y
 CONFIG_USBDEV=y
 CONFIG_USBDEV_BUSPOWERED=y
 CONFIG_USBDEV_MAXPOWER=500
diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/scripts/ocram-script.ld b/boards/nxp/fmurt1062-v1/nuttx-config/scripts/ocram-script.ld
index a78368f916..c464edf34e 100644
--- a/boards/nxp/fmurt1062-v1/nuttx-config/scripts/ocram-script.ld
+++ b/boards/nxp/fmurt1062-v1/nuttx-config/scripts/ocram-script.ld
@@ -146,11 +146,6 @@ SECTIONS
         *(.text .text.*)
         _etext = ABSOLUTE(.);
 
-		/*
-		 * This is a hack to make the newlib libm __errno() call
-		 * use the NuttX get_errno_ptr() function.
-		 */
-		__errno = get_errno_ptr;
     } > sram AT> flash
 
 	/*
diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/scripts/script.ld b/boards/nxp/fmurt1062-v1/nuttx-config/scripts/script.ld
index 0e417e0584..232c472357 100644
--- a/boards/nxp/fmurt1062-v1/nuttx-config/scripts/script.ld
+++ b/boards/nxp/fmurt1062-v1/nuttx-config/scripts/script.ld
@@ -91,11 +91,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/nxp/fmurt1062-v1/src/can.c b/boards/nxp/fmurt1062-v1/src/can.c
index dda8e78cae..eb5c40d188 100644
--- a/boards/nxp/fmurt1062-v1/src/can.c
+++ b/boards/nxp/fmurt1062-v1/src/can.c
@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include <chip.h>
-#include "up_arch.h"
+#include "arm_arch.h"
 
 #include "board_config.h"
 
diff --git a/boards/nxp/fmurt1062-v1/src/init.c b/boards/nxp/fmurt1062-v1/src/init.c
index 033a0c9734..5c82bd2535 100644
--- a/boards/nxp/fmurt1062-v1/src/init.c
+++ b/boards/nxp/fmurt1062-v1/src/init.c
@@ -62,8 +62,8 @@
 #include <nuttx/analog/adc.h>
 #include <nuttx/mm/gran.h>
 
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imxrt_flexspi_nor_boot.h"
 #include "imxrt_iomuxc.h"
 #include <chip.h>
@@ -89,7 +89,7 @@
 /* Configuration ************************************************************/
 
 /*
- * 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
@@ -326,7 +326,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 
 // USB Stubs
 #include <nuttx/usb/usbdev.h>
-void up_usbinitialize(void)
+void arm_usbinitialize(void)
 {
 }
 
diff --git a/boards/nxp/fmurt1062-v1/src/led.c b/boards/nxp/fmurt1062-v1/src/led.c
index 9e1e0dbe37..0d9236a4c3 100644
--- a/boards/nxp/fmurt1062-v1/src/led.c
+++ b/boards/nxp/fmurt1062-v1/src/led.c
@@ -48,7 +48,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/nxp/fmurt1062-v1/src/spi.cpp b/boards/nxp/fmurt1062-v1/src/spi.cpp
index ae85253f52..5e9fa6131f 100644
--- a/boards/nxp/fmurt1062-v1/src/spi.cpp
+++ b/boards/nxp/fmurt1062-v1/src/spi.cpp
@@ -53,7 +53,7 @@
 #include <systemlib/px4_macros.h>
 #include <px4_platform/gpio.h>
 
-#include <up_arch.h>
+#include <arm_arch.h>
 #include <chip.h>
 #include "imxrt_lpspi.h"
 #include "imxrt_gpio.h"
diff --git a/boards/nxp/fmurt1062-v1/src/usb.c b/boards/nxp/fmurt1062-v1/src/usb.c
index 5ef6169180..24fe740fed 100644
--- a/boards/nxp/fmurt1062-v1/src/usb.c
+++ b/boards/nxp/fmurt1062-v1/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 <chip.h>
 #include <hardware/imxrt_usb_analog.h>
 #include "board_config.h"