From 3fff9e5826594912c98f3d9f47029f5843a07556 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lorenz@px4.io>
Date: Thu, 11 Aug 2016 14:01:30 +0200
Subject: [PATCH] Harmonize TAP config with FMUv4 config

---
 nuttx-configs/tap-v1/nsh/appconfig | 52 ++++++++++++++++++++++++++++++
 nuttx-configs/tap-v1/nsh/defconfig | 19 +++++++----
 2 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 nuttx-configs/tap-v1/nsh/appconfig

diff --git a/nuttx-configs/tap-v1/nsh/appconfig b/nuttx-configs/tap-v1/nsh/appconfig
new file mode 100644
index 0000000000..0e18aa8ef1
--- /dev/null
+++ b/nuttx-configs/tap-v1/nsh/appconfig
@@ -0,0 +1,52 @@
+############################################################################
+# configs/px4fmu/nsh/appconfig
+#
+#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+# Path to example in apps/examples containing the user_start entry point
+
+CONFIGURED_APPS	+= examples/nsh
+
+# The NSH application library
+CONFIGURED_APPS += nshlib
+CONFIGURED_APPS += system/readline
+
+ifeq ($(CONFIG_CAN),y)
+#CONFIGURED_APPS += examples/can
+endif
+
+#ifeq ($(CONFIG_USBDEV),y)
+#ifeq ($(CONFIG_CDCACM),y)
+CONFIGURED_APPS += examples/cdcacm
+#endif
+#endif
diff --git a/nuttx-configs/tap-v1/nsh/defconfig b/nuttx-configs/tap-v1/nsh/defconfig
index 63471b4727..a9730cf148 100644
--- a/nuttx-configs/tap-v1/nsh/defconfig
+++ b/nuttx-configs/tap-v1/nsh/defconfig
@@ -8,8 +8,8 @@ CONFIG_NUTTX_NEWCONFIG=y
 # Build Setup
 #
 # CONFIG_EXPERIMENTAL is not set
-CONFIG_HOST_LINUX=y
-# CONFIG_HOST_OSX is not set
+# CONFIG_HOST_LINUX is not set
+CONFIG_HOST_OSX=y
 # CONFIG_HOST_WINDOWS is not set
 # CONFIG_HOST_OTHER is not set
 
@@ -38,7 +38,8 @@ CONFIG_ARCH_MATH_H=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+CONFIG_DEBUG=n
+CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=y
 
 #
@@ -94,7 +95,7 @@ CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y
-# CONFIG_ARMV7M_STACKCHECK is not set
+CONFIG_ARMV7M_STACKCHECK=n
 CONFIG_SERIAL_TERMIOS=y
 
 #
@@ -176,6 +177,7 @@ CONFIG_ARCH_CHIP_STM32F405RG=y
 # CONFIG_STM32_STM32F20XX is not set
 # CONFIG_STM32_STM32F30XX is not set
 CONFIG_STM32_STM32F40XX=y
+CONFIG_STM32_STM32F405=y
 # CONFIG_STM32_DFU is not set
 
 #
@@ -264,6 +266,8 @@ CONFIG_STM32_USART=y
 #
 # U[S]ART Configuration
 #
+# Hot fix for lost data
+CONFIG_STM32_RXDMA_BUFFER_SIZE_OVERRIDE=256
 # CONFIG_USART1_RS485 is not set
 CONFIG_USART1_RXDMA=y
 # CONFIG_USART2_RS485 is not set
@@ -312,7 +316,7 @@ CONFIG_STM32_I2CTIMEOMS=10
 # CONFIG_ARCH_NOINTC is not set
 # CONFIG_ARCH_VECNOTIRQ is not set
 CONFIG_ARCH_DMA=y
-CONFIG_ARCH_IRQPRIO=y
+# CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
 CONFIG_ARCH_HAVE_VFORK=y
@@ -345,6 +349,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
 # Board Selection
 #
 CONFIG_ARCH_BOARD_TAP_V1=y
+CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD="tap-v1"
 
 #
@@ -451,7 +456,7 @@ CONFIG_WATCHDOG=y
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
-# CONFIG_MMCSD_MULTIBLOCK_DISABLE is not set
+CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 # CONFIG_MMCSD_MMCSUPPORT is not set
 # CONFIG_MMCSD_HAVECARDDETECT is not set
 # CONFIG_MMCSD_HAVE_SDIOWAIT_WRCOMPLETE is not set
@@ -678,7 +683,7 @@ CONFIG_BUILTIN=y
 #
 # Standard C Library Options
 #
-CONFIG_STDIO_BUFFER_SIZE=180
+CONFIG_STDIO_BUFFER_SIZE=32
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
 CONFIG_LIB_HOMEDIR="/"