Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1

1 files changed, 61 insertions, 64 deletions

diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig
index 0615950a2..8e2ae2d00 100644
--- a/nuttx-configs/px4fmu-v2/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v2/nsh/defconfig
@@ -38,7 +38,31 @@ CONFIG_ARCH_MATH_H=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+CONFIG_DEBUG=n
+CONFIG_DEBUG_VERBOSE=n
+
+#
+# Subsystem Debug Options
+#
+# CONFIG_DEBUG_MM is not set
+# CONFIG_DEBUG_SCHED is not set
+# CONFIG_DEBUG_USB is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_DEBUG_LIB is not set
+# CONFIG_DEBUG_BINFMT is not set
+# CONFIG_DEBUG_GRAPHICS is not set
+
+#
+# Driver Debug Options
+#
+# CONFIG_DEBUG_ANALOG is not set
+# CONFIG_DEBUG_I2C is not set
+# CONFIG_DEBUG_SPI is not set
+# CONFIG_DEBUG_SDIO is not set
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_DEBUG_DMA=y
+# CONFIG_DEBUG_WATCHDOG is not set
+# CONFIG_DEBUG_AUDIO is not set
 CONFIG_DEBUG_SYMBOLS=y
 
 #
@@ -86,6 +110,7 @@ CONFIG_ARCH_HAVE_FPU=y
 CONFIG_ARCH_FPU=y
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
+# CONFIG_DEBUG_HARDFAULT is not set
 
 #
 # ARMV7M Configuration Options
@@ -94,7 +119,9 @@ CONFIG_ARCH_HAVE_MPU=y
 CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y
 CONFIG_ARMV7M_STACKCHECK=y
 CONFIG_SERIAL_TERMIOS=y
-CONFIG_SERIAL_DISABLE_REORDERING=y
+CONFIG_SDIO_DMA=y
+CONFIG_SDIO_DMAPRIO=0x00010000
+# CONFIG_SDIO_WIDTH_D1_ONLY is not set
 
 #
 # STM32 Configuration Options
@@ -240,9 +267,6 @@ CONFIG_STM32_ADC=y
 CONFIG_STM32_SPI=y
 CONFIG_STM32_I2C=y
 
-CONFIG_ARCH_HAVE_LEDS=y
-# CONFIG_ARCH_LEDS is not set
-
 #
 # Alternate Pin Mapping
 #
@@ -254,7 +278,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
-CONFIG_STM32_CCMEXCLUDE=y
+# CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_STM32_DMACAPABLE=y
 # CONFIG_STM32_TIM1_PWM is not set
 # CONFIG_STM32_TIM3_PWM is not set
@@ -271,40 +295,22 @@ CONFIG_STM32_USART=y
 # U[S]ART Configuration
 #
 # CONFIG_USART1_RS485 is not set
-CONFIG_USART1_RXDMA=y
+# CONFIG_USART1_RXDMA is not set
 # CONFIG_USART2_RS485 is not set
 CONFIG_USART2_RXDMA=y
 # CONFIG_USART3_RS485 is not set
 # CONFIG_USART3_RXDMA is not set
 # CONFIG_UART4_RS485 is not set
 # CONFIG_UART4_RXDMA is not set
-# CONFIG_UART5_RXDMA is not set
 # CONFIG_USART6_RS485 is not set
 # CONFIG_USART6_RXDMA is not set
-# CONFIG_USART7_RXDMA is not set
-CONFIG_USART8_RXDMA=y
+# CONFIG_UART7_RS485 is not set
+# CONFIG_UART7_RXDMA is not set
+# CONFIG_UART8_RS485 is not set
+# CONFIG_UART8_RXDMA is not set
+CONFIG_SERIAL_DISABLE_REORDERING=y
 CONFIG_STM32_USART_SINGLEWIRE=y
 
-
-# Previous:
-## CONFIG_USART1_RS485 is not set
-#CONFIG_USART1_RXDMA=y
-## CONFIG_USART2_RS485 is not set
-#CONFIG_USART2_RXDMA=y
-## CONFIG_USART3_RS485 is not set
-#CONFIG_USART3_RXDMA=y
-## CONFIG_UART4_RS485 is not set
-#CONFIG_UART4_RXDMA=y
-## CONFIG_UART5_RXDMA is not set
-## CONFIG_USART6_RS485 is not set
-## CONFIG_USART6_RXDMA is not set
-## CONFIG_USART7_RXDMA is not set
-#CONFIG_USART8_RXDMA=y
-#CONFIG_STM32_USART_SINGLEWIRE=y
-
-
-
-
 #
 # SPI Configuration
 #
@@ -323,25 +329,7 @@ CONFIG_STM32_I2CTIMEOTICKS=500
 #
 # SDIO Configuration
 #
-
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-#CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
-CONFIG_MTD=y
-
-#
-# STM32 SDIO-based MMC/SD driver
-#
-CONFIG_SDIO_DMA=y
-# CONFIG_SDIO_DMAPRIO is not set
-# CONFIG_SDIO_WIDTH_D1_ONLY is not set
-CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
-CONFIG_MMCSD_MMCSUPPORT=n
-CONFIG_MMCSD_HAVECARDDETECT=n
+CONFIG_SDIO_PRI=128
 
 #
 # USB Host Configuration
@@ -393,15 +381,14 @@ CONFIG_BOOT_RUNFROMFLASH=y
 #
 # Board Selection
 #
-CONFIG_ARCH_BOARD_PX4FMU_V2=y
-# CONFIG_ARCH_BOARD_CUSTOM is not set
-CONFIG_ARCH_BOARD="px4fmu-v2"
+CONFIG_ARCH_BOARD_CUSTOM=y
+CONFIG_ARCH_BOARD=""
 
 #
 # Common Board Options
 #
-CONFIG_NSH_MMCSDSLOTNO=0
 CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
@@ -497,7 +484,16 @@ CONFIG_WATCHDOG=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_LCD is not set
-# CONFIG_MMCSD is not set
+CONFIG_MMCSD=y
+CONFIG_MMCSD_NSLOTS=1
+# CONFIG_MMCSD_READONLY is not set
+CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
+# CONFIG_MMCSD_MMCSUPPORT is not set
+# CONFIG_MMCSD_HAVECARDDETECT is not set
+# CONFIG_MMCSD_SPI is not set
+CONFIG_MMCSD_SDIO=y
+# CONFIG_SDIO_MUXBUS is not set
+# CONFIG_SDIO_BLOCKSETUP is not set
 CONFIG_MTD=y
 
 #
@@ -523,7 +519,7 @@ CONFIG_PIPES=y
 # CONFIG_POWER is not set
 # CONFIG_SENSORS is not set
 CONFIG_SERIAL=y
-CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
 # CONFIG_16550_UART is not set
 CONFIG_ARCH_HAVE_UART4=y
@@ -536,6 +532,7 @@ CONFIG_ARCH_HAVE_USART6=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
+# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 # CONFIG_USART1_SERIAL_CONSOLE is not set
 # CONFIG_USART2_SERIAL_CONSOLE is not set
 # CONFIG_USART3_SERIAL_CONSOLE is not set
@@ -640,7 +637,6 @@ CONFIG_USBDEV=y
 # CONFIG_USBDEV_SELFPOWERED is not set
 CONFIG_USBDEV_BUSPOWERED=y
 CONFIG_USBDEV_MAXPOWER=500
-# CONFIG_USBDEV_REMOTEWAKEUP is not set
 # CONFIG_USBDEV_DMA is not set
 # CONFIG_USBDEV_TRACE is not set
 
@@ -650,7 +646,7 @@ CONFIG_USBDEV_MAXPOWER=500
 # CONFIG_USBDEV_COMPOSITE is not set
 # CONFIG_PL2303 is not set
 CONFIG_CDCACM=y
-CONFIG_CDCACM_CONSOLE=n
+# CONFIG_CDCACM_CONSOLE is not set
 CONFIG_CDCACM_EP0MAXPACKET=64
 CONFIG_CDCACM_EPINTIN=1
 CONFIG_CDCACM_EPINTIN_FSSIZE=64
@@ -702,7 +698,7 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 CONFIG_FS_FATTIME=y
-# CONFIG_FAT_DMAMEMORY is not set
+CONFIG_FAT_DMAMEMORY=y
 CONFIG_FS_NXFFS=y
 CONFIG_NXFFS_PREALLOCATED=y
 CONFIG_NXFFS_ERASEDSTATE=0xff
@@ -716,10 +712,8 @@ CONFIG_FS_BINFS=y
 #
 # System Logging
 #
-CONFIG_SYSLOG_ENABLE=y
-CONFIG_SYSLOG=y
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS6"
+# CONFIG_SYSLOG_ENABLE is not set
+# CONFIG_SYSLOG is not set
 
 #
 # Graphics Support
@@ -733,8 +727,9 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS6"
 # CONFIG_MM_SMALL is not set
 CONFIG_MM_REGIONS=2
 CONFIG_GRAN=y
-CONFIG_GRAN_SINGLE=y
-CONFIG_GRAN_INTR=y
+# CONFIG_GRAN_SINGLE is not set
+# CONFIG_GRAN_INTR is not set
+# CONFIG_DEBUG_GRAN is not set
 
 #
 # Audio Support
@@ -1002,6 +997,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
+# CONFIG_NSH_USBDEV_TRACE is not set
 # CONFIG_NSH_CONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
@@ -1031,6 +1027,7 @@ CONFIG_NSH_ARCHINIT=y
 #
 # FLASH Erase-all Command
 #
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
 
 #
 # readline()