diff --git a/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig b/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig
index 768d2730c1..229fc74df9 100644
--- a/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig
+++ b/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig
@@ -70,7 +70,6 @@ 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_MM_REGIONS=2
@@ -100,7 +99,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
@@ -173,7 +171,6 @@ CONFIG_STM32_USART_SINGLEWIRE=y
 CONFIG_STM32_WWDG=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/intel/aerofc-v1/nuttx-config/scripts/script.ld b/boards/intel/aerofc-v1/nuttx-config/scripts/script.ld
index e2d376d35c..45ce3349f6 100644
--- a/boards/intel/aerofc-v1/nuttx-config/scripts/script.ld
+++ b/boards/intel/aerofc-v1/nuttx-config/scripts/script.ld
@@ -81,11 +81,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/intel/aerofc-v1/src/init.c b/boards/intel/aerofc-v1/src/init.c
index 50c2156e7b..9e37d59a72 100644
--- a/boards/intel/aerofc-v1/src/init.c
+++ b/boards/intel/aerofc-v1/src/init.c
@@ -80,7 +80,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/intel/aerofc-v1/src/led.c b/boards/intel/aerofc-v1/src/led.c
index e85294b7f6..30fb9dd9b0 100644
--- a/boards/intel/aerofc-v1/src/led.c
+++ b/boards/intel/aerofc-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