From 0da14887d0bd3ecdf7b5791088f28dfe6187fe89 Mon Sep 17 00:00:00 2001
From: David Sidrane <David.Sidrane@NscDg.com>
Date: Wed, 17 Jun 2020 14:32:26 -0700
Subject: [PATCH] px4_fmu-v3 Updates for NuttX 9.1.0-

px4_fmu-v3: defconfig MMCSD enable multiblock
---
 boards/px4/fmu-v3/nuttx-config/nsh/defconfig        | 4 ----
 boards/px4/fmu-v3/nuttx-config/scripts/script.ld    | 5 -----
 boards/px4/fmu-v3/nuttx-config/stackcheck/defconfig | 4 ----
 boards/px4/fmu-v3/src/can.c                         | 2 +-
 boards/px4/fmu-v3/src/init.c                        | 2 +-
 boards/px4/fmu-v3/src/led.c                         | 2 +-
 boards/px4/fmu-v3/src/usb.c                         | 2 +-
 7 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig b/boards/px4/fmu-v3/nuttx-config/nsh/defconfig
index 4751b4f145..01623cdcee 100644
--- a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v3/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
@@ -201,7 +198,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/px4/fmu-v3/nuttx-config/scripts/script.ld b/boards/px4/fmu-v3/nuttx-config/scripts/script.ld
index 0d19229c01..db27829f89 100644
--- a/boards/px4/fmu-v3/nuttx-config/scripts/script.ld
+++ b/boards/px4/fmu-v3/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/px4/fmu-v3/nuttx-config/stackcheck/defconfig b/boards/px4/fmu-v3/nuttx-config/stackcheck/defconfig
index 21ce97086a..a90f9b98ea 100644
--- a/boards/px4/fmu-v3/nuttx-config/stackcheck/defconfig
+++ b/boards/px4/fmu-v3/nuttx-config/stackcheck/defconfig
@@ -80,11 +80,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
@@ -115,7 +113,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
@@ -202,7 +199,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/px4/fmu-v3/src/can.c b/boards/px4/fmu-v3/src/can.c
index 8a2bcbf406..5eea9bef17 100644
--- a/boards/px4/fmu-v3/src/can.c
+++ b/boards/px4/fmu-v3/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/px4/fmu-v3/src/init.c b/boards/px4/fmu-v3/src/init.c
index 9d71cd3d49..2295a8672f 100644
--- a/boards/px4/fmu-v3/src/init.c
+++ b/boards/px4/fmu-v3/src/init.c
@@ -81,7 +81,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/px4/fmu-v3/src/led.c b/boards/px4/fmu-v3/src/led.c
index 747ea981d4..de15c05532 100644
--- a/boards/px4/fmu-v3/src/led.c
+++ b/boards/px4/fmu-v3/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/px4/fmu-v3/src/usb.c b/boards/px4/fmu-v3/src/usb.c
index a809c69dd3..09920c9dfe 100644
--- a/boards/px4/fmu-v3/src/usb.c
+++ b/boards/px4/fmu-v3/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"