diff --git a/boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig b/boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig
index 5af3467da6..1c5c140297 100644
--- a/boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig
+++ b/boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig
@@ -49,7 +49,6 @@ CONFIG_LPUART1_RXBUFSIZE=64
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_LPUART1_TXBUFSIZE=64
 CONFIG_MAX_TASKS=16
-CONFIG_MAX_WDOGPARMS=2
 CONFIG_MOTOROLA_SREC=y
 CONFIG_NET=y
 CONFIG_NETDEV_IFINDEX=y
@@ -100,6 +99,5 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_SPITOOL=y
-CONFIG_TIME_EXTENDED=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WATCHDOG=y
diff --git a/boards/nxp/rddrone-uavcan146/nuttx-config/scripts/script.ld b/boards/nxp/rddrone-uavcan146/nuttx-config/scripts/script.ld
index 8918005fcd..b6e616d1bd 100644
--- a/boards/nxp/rddrone-uavcan146/nuttx-config/scripts/script.ld
+++ b/boards/nxp/rddrone-uavcan146/nuttx-config/scripts/script.ld
@@ -84,11 +84,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;
   } > dflash
 
   .init_section :
diff --git a/boards/nxp/rddrone-uavcan146/src/autoleds.c b/boards/nxp/rddrone-uavcan146/src/autoleds.c
index 1f063e77c6..49180ad500 100644
--- a/boards/nxp/rddrone-uavcan146/src/autoleds.c
+++ b/boards/nxp/rddrone-uavcan146/src/autoleds.c
@@ -72,8 +72,8 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "s32k1xx_pin.h"
 #include "board_config.h"
diff --git a/boards/nxp/rddrone-uavcan146/src/spi.c b/boards/nxp/rddrone-uavcan146/src/spi.c
index 5629b94151..ff6235e6cc 100644
--- a/boards/nxp/rddrone-uavcan146/src/spi.c
+++ b/boards/nxp/rddrone-uavcan146/src/spi.c
@@ -48,7 +48,7 @@
 #include <nuttx/spi/spi_transfer.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 
 #include "s32k1xx_config.h"
 #include "s32k1xx_lpspi.h"
diff --git a/boards/nxp/rddrone-uavcan146/src/userleds.c b/boards/nxp/rddrone-uavcan146/src/userleds.c
index 76bdccf8f3..fafc71f07b 100644
--- a/boards/nxp/rddrone-uavcan146/src/userleds.c
+++ b/boards/nxp/rddrone-uavcan146/src/userleds.c
@@ -45,8 +45,8 @@
 
 #include <nuttx/board.h>
 
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "s32k1xx_pin.h"
 #include "board_config.h"