From aa67fbdbcbc8133833be1d0bf0925245428bede2 Mon Sep 17 00:00:00 2001
From: David Sidrane <David.Sidrane@NscDg.com>
Date: Wed, 12 Aug 2020 03:25:20 -0700
Subject: [PATCH] nxp_fmuk66-e:  Updates for NuttX 9.1.0-

---
 boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig       | 3 ---
 boards/nxp/fmuk66-e/nuttx-config/scripts/script.ld   | 5 -----
 boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig | 3 ---
 boards/nxp/fmuk66-e/src/can.c                        | 2 +-
 boards/nxp/fmuk66-e/src/init.c                       | 4 ++--
 boards/nxp/fmuk66-e/src/led.c                        | 2 +-
 boards/nxp/fmuk66-e/src/spi.cpp                      | 2 +-
 boards/nxp/fmuk66-e/src/usb.c                        | 2 +-
 8 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig b/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig
index 625760319e..b985f810cf 100644
--- a/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig
+++ b/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig
@@ -106,11 +106,9 @@ CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_LPUART0_BAUD=57600
 CONFIG_LPUART0_SERIAL_CONSOLE=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_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
@@ -167,7 +165,6 @@ CONFIG_NSH_VARS=y
 CONFIG_PIPES=y
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=50
-CONFIG_PREALLOC_WDOGS=50
 CONFIG_PRIORITY_INHERITANCE=y
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_RAMTRON_SETSPEED=y
diff --git a/boards/nxp/fmuk66-e/nuttx-config/scripts/script.ld b/boards/nxp/fmuk66-e/nuttx-config/scripts/script.ld
index 92c5732af1..3d6fb8fdb7 100644
--- a/boards/nxp/fmuk66-e/nuttx-config/scripts/script.ld
+++ b/boards/nxp/fmuk66-e/nuttx-config/scripts/script.ld
@@ -82,11 +82,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;
 		 . = ALIGN(8);
 		 FILL(0xff)
 		 . += 8;
diff --git a/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig b/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig
index 0c560106fe..9b696b1a49 100644
--- a/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig
+++ b/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig
@@ -107,11 +107,9 @@ CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_LPUART0_BAUD=57600
 CONFIG_LPUART0_SERIAL_CONSOLE=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_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
@@ -164,7 +162,6 @@ CONFIG_NSH_VARS=y
 CONFIG_PIPES=y
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=50
-CONFIG_PREALLOC_WDOGS=50
 CONFIG_PRIORITY_INHERITANCE=y
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_RAMTRON_SETSPEED=y
diff --git a/boards/nxp/fmuk66-e/src/can.c b/boards/nxp/fmuk66-e/src/can.c
index b0e9ff91c9..7589439f48 100644
--- a/boards/nxp/fmuk66-e/src/can.c
+++ b/boards/nxp/fmuk66-e/src/can.c
@@ -51,7 +51,7 @@
 
 #include <chip.h>
 #include <kinetis.h>
-#include "up_arch.h"
+#include "arm_arch.h"
 
 #include "board_config.h"
 
diff --git a/boards/nxp/fmuk66-e/src/init.c b/boards/nxp/fmuk66-e/src/init.c
index 95fdceca5b..a1d0fcaf76 100644
--- a/boards/nxp/fmuk66-e/src/init.c
+++ b/boards/nxp/fmuk66-e/src/init.c
@@ -67,7 +67,7 @@
 #include <hardware/kinetis_sim.h>
 #include "board_config.h"
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
@@ -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/nxp/fmuk66-e/src/led.c b/boards/nxp/fmuk66-e/src/led.c
index 360f8b017d..b317665519 100644
--- a/boards/nxp/fmuk66-e/src/led.c
+++ b/boards/nxp/fmuk66-e/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/fmuk66-e/src/spi.cpp b/boards/nxp/fmuk66-e/src/spi.cpp
index 8a7f0d7b05..ba6669f8b9 100644
--- a/boards/nxp/fmuk66-e/src/spi.cpp
+++ b/boards/nxp/fmuk66-e/src/spi.cpp
@@ -47,7 +47,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "chip.h"
 #include <kinetis.h>
 #include "board_config.h"
diff --git a/boards/nxp/fmuk66-e/src/usb.c b/boards/nxp/fmuk66-e/src/usb.c
index c4943f9f37..3c7098437e 100644
--- a/boards/nxp/fmuk66-e/src/usb.c
+++ b/boards/nxp/fmuk66-e/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 <kinetis.h>
 #include <kinetis_usbotg.h>
 #include "board_config.h"