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

holybro_kakutef7: defconfig MMCSD enable multiblock
---
 boards/holybro/kakutef7/nuttx-config/nsh/defconfig     | 4 ----
 boards/holybro/kakutef7/nuttx-config/scripts/script.ld | 5 -----
 boards/holybro/kakutef7/src/init.c                     | 4 ++--
 boards/holybro/kakutef7/src/led.c                      | 2 +-
 boards/holybro/kakutef7/src/usb.c                      | 2 +-
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/boards/holybro/kakutef7/nuttx-config/nsh/defconfig b/boards/holybro/kakutef7/nuttx-config/nsh/defconfig
index 432c3ee218..88bc769d53 100644
--- a/boards/holybro/kakutef7/nuttx-config/nsh/defconfig
+++ b/boards/holybro/kakutef7/nuttx-config/nsh/defconfig
@@ -87,11 +87,9 @@ CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=64
-CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
-CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MM_REGIONS=3
 CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
@@ -122,7 +120,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
@@ -194,7 +191,6 @@ CONFIG_STM32F7_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=600
 CONFIG_UART4_TXBUFSIZE=1500
diff --git a/boards/holybro/kakutef7/nuttx-config/scripts/script.ld b/boards/holybro/kakutef7/nuttx-config/scripts/script.ld
index 8b468bd621..5b158f4c96 100644
--- a/boards/holybro/kakutef7/nuttx-config/scripts/script.ld
+++ b/boards/holybro/kakutef7/nuttx-config/scripts/script.ld
@@ -114,11 +114,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/holybro/kakutef7/src/init.c b/boards/holybro/kakutef7/src/init.c
index ed212a8fc0..506b390c1a 100644
--- a/boards/holybro/kakutef7/src/init.c
+++ b/boards/holybro/kakutef7/src/init.c
@@ -62,7 +62,7 @@
 #include <chip.h>
 #include <stm32_uart.h>
 #include <arch/board/board.h>
-#include "up_internal.h"
+#include "arm_internal.h"
 
 #include <px4_arch/io_timer.h>
 #include <drivers/drv_hrt.h>
@@ -83,7 +83,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
diff --git a/boards/holybro/kakutef7/src/led.c b/boards/holybro/kakutef7/src/led.c
index a45d35c1c5..5169b86d22 100644
--- a/boards/holybro/kakutef7/src/led.c
+++ b/boards/holybro/kakutef7/src/led.c
@@ -49,7 +49,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/holybro/kakutef7/src/usb.c b/boards/holybro/kakutef7/src/usb.c
index e753f37649..0ea22da849 100644
--- a/boards/holybro/kakutef7/src/usb.c
+++ b/boards/holybro/kakutef7/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 <stm32_gpio.h>
 #include <stm32_otg.h>