From 2d477c8f0714f863997aba4f046febd72cba901a Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Wed, 24 May 2017 13:09:48 -1000
Subject: [PATCH] px4-stm32f4discovery nsh: Upstream NuttX defconfig changes

   was:CONFIG_ARM_TOOLCHAIN_IAR is:CONFIG_ARCH_TOOLCHAIN_IAR
   was:CONFIG_ARM_TOOLCHAIN_GNU is:CONFIG_ARCH_TOOLCHAIN_GNU
   was:CONFIG_MUTEX_TYPES is:CONFIG_PTHREAD_MUTEX_TYPES
---
 nuttx-configs/px4-stm32f4discovery/nsh/defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nuttx-configs/px4-stm32f4discovery/nsh/defconfig b/nuttx-configs/px4-stm32f4discovery/nsh/defconfig
index 9395017c7a..0d4d884bcb 100644
--- a/nuttx-configs/px4-stm32f4discovery/nsh/defconfig
+++ b/nuttx-configs/px4-stm32f4discovery/nsh/defconfig
@@ -122,8 +122,8 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="stm32"
-# CONFIG_ARM_TOOLCHAIN_IAR is not set
-CONFIG_ARM_TOOLCHAIN_GNU=y
+# CONFIG_ARCH_TOOLCHAIN_IAR is not set
+CONFIG_ARCH_TOOLCHAIN_GNU=y
 CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARMV7M_CMNVECTOR=y
@@ -684,7 +684,7 @@ CONFIG_SCHED_WAITPID=y
 #
 # Pthread Options
 #
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
 CONFIG_NPTHREAD_KEYS=4
 # CONFIG_PTHREAD_CLEANUP is not set
 # CONFIG_CANCELLATION_POINTS is not set