summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-04-08 14:12:17 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-04-08 14:12:17 -0600
commit40660045e49618c642d409e4fd929277113ee762 (patch)
tree1026ad2abf23811e6d3e81cd3856b5dd344dc3a4
parent5a0874108c6dd02b943a954c6ce9bebf1549d7f4 (diff)
downloadpx4-nuttx-40660045e49618c642d409e4fd929277113ee762.tar.gz
px4-nuttx-40660045e49618c642d409e4fd929277113ee762.tar.bz2
px4-nuttx-40660045e49618c642d409e4fd929277113ee762.zip
Refresh some configurations
-rw-r--r--nuttx/configs/sam4e-ek/nsh/defconfig128
-rw-r--r--nuttx/configs/sama5d4-ek/nsh/defconfig131
-rw-r--r--nuttx/configs/samv71-xult/nsh/defconfig105
3 files changed, 47 insertions, 317 deletions
diff --git a/nuttx/configs/sam4e-ek/nsh/defconfig b/nuttx/configs/sam4e-ek/nsh/defconfig
index 45daac75c..04659c06c 100644
--- a/nuttx/configs/sam4e-ek/nsh/defconfig
+++ b/nuttx/configs/sam4e-ek/nsh/defconfig
@@ -103,12 +103,20 @@ CONFIG_ARCH_CORTEXM4=y
CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="sam34"
# CONFIG_ARMV7M_USEBASEPRI is not set
+CONFIG_ARCH_HAVE_CMNVECTOR=y
+# CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
# CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
# CONFIG_ARMV7M_MPU is not set
#
# ARMV7M Configuration Options
#
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
@@ -339,6 +347,11 @@ CONFIG_NSH_MMCSDMINOR=0
CONFIG_SAM4EEK_120MHZ=y
CONFIG_SAM4EEK_AT25_BLOCKMOUNT=y
CONFIG_SAM4EEK_AT25_FTL=y
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
#
# RTOS Features
@@ -470,6 +483,10 @@ CONFIG_SPI_EXCHANGE=y
# CONFIG_SPI_CALLBACK is not set
# CONFIG_SPI_BITBANG is not set
# CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
# CONFIG_TIMER is not set
# CONFIG_RTC is not set
# CONFIG_WATCHDOG is not set
@@ -533,10 +550,13 @@ CONFIG_ARCH_PHY_INTERRUPT=y
# CONFIG_ETH0_PHY_AM79C874 is not set
# CONFIG_ETH0_PHY_KS8721 is not set
CONFIG_ETH0_PHY_KSZ8051=y
+# CONFIG_ETH0_PHY_KSZ8061 is not set
# CONFIG_ETH0_PHY_KSZ8081 is not set
# CONFIG_ETH0_PHY_KSZ90x1 is not set
# CONFIG_ETH0_PHY_DP83848C is not set
# CONFIG_ETH0_PHY_LAN8720 is not set
+# CONFIG_ETH0_PHY_LAN8740 is not set
+# CONFIG_ETH0_PHY_LAN8740A is not set
# CONFIG_ETH0_PHY_DM9161 is not set
# CONFIG_PIPES is not set
# CONFIG_PM is not set
@@ -643,6 +663,7 @@ CONFIG_NET_GUARDSIZE=2
#
# CONFIG_NET_MULTILINK is not set
CONFIG_NET_ETHERNET=y
+# CONFIG_NET_TUN is not set
#
# Network Device Operations
@@ -834,6 +855,7 @@ CONFIG_LIBC_TMPDIR="/tmp"
CONFIG_LIBC_MAX_TMPFILE=32
CONFIG_ARCH_LOWPUTC=y
# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_ARCH_ROMGETC is not set
# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
@@ -958,6 +980,7 @@ CONFIG_WEBCLIENT_TIMEOUT=10
# CONFIG_NETUTILS_NTPCLIENT is not set
# CONFIG_NETUTILS_DISCOVER is not set
# CONFIG_NETUTILS_XMLRPC is not set
+# CONFIG_NETUTILS_PPPD is not set
#
# FreeModBus
@@ -1050,7 +1073,6 @@ CONFIG_NSH_FILEIOSIZE=512
#
CONFIG_NSH_CONSOLE=y
CONFIG_NSH_ARCHINIT=y
-CONFIG_LIB_BOARDCTL=y
#
# Networking Configuration
@@ -1097,124 +1119,20 @@ CONFIG_NSH_IOBUFFER_SIZE=512
#
# System Libraries and NSH Add-Ons
#
-
-#
-# Custom Free Memory Command
-#
# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
# CONFIG_SYSTEM_CLE is not set
-
-#
-# CU Minimal Terminal
-#
# CONFIG_SYSTEM_CUTERM is not set
-
-#
-# FLASH Program Installation
-#
# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
# CONFIG_SYSTEM_FLASH_ERASEALL is not set
-
-#
-# Intel HEX to binary conversion
-#
# CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
# CONFIG_SYSTEM_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-
-#
-# RAM test
-#
# CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
CONFIG_SYSTEM_READLINE=y
CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
# CONFIG_SYSTEM_RAMTRON is not set
-
-#
-# SD Card
-#
# CONFIG_SYSTEM_SDCARD is not set
-
-#
-# Sudoku
-#
# CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
# CONFIG_SYSTEM_SYSINFO is not set
-
-#
-# Temperature
-#
-
-#
-# VI Work-Alike Editor
-#
# CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/nuttx/configs/sama5d4-ek/nsh/defconfig b/nuttx/configs/sama5d4-ek/nsh/defconfig
index 82c1de894..713ab6489 100644
--- a/nuttx/configs/sama5d4-ek/nsh/defconfig
+++ b/nuttx/configs/sama5d4-ek/nsh/defconfig
@@ -92,6 +92,7 @@ CONFIG_ARCH="arm"
CONFIG_ARCH_CHIP_SAMA5=y
# CONFIG_ARCH_CHIP_SAMD is not set
# CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
# CONFIG_ARCH_CHIP_STM32 is not set
# CONFIG_ARCH_CHIP_STR71X is not set
# CONFIG_ARCH_ARM7TDMI is not set
@@ -100,11 +101,13 @@ CONFIG_ARCH_CHIP_SAMA5=y
# CONFIG_ARCH_CORTEXM0 is not set
# CONFIG_ARCH_CORTEXM3 is not set
# CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
CONFIG_ARCH_CORTEXA5=y
# CONFIG_ARCH_CORTEXA8 is not set
CONFIG_ARCH_FAMILY="armv7-a"
CONFIG_ARCH_CHIP="sama5"
CONFIG_ARCH_HAVE_FPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
CONFIG_ARCH_FPU=y
CONFIG_ARCH_HAVE_LOWVECTORS=y
CONFIG_ARCH_LOWVECTORS=y
@@ -463,6 +466,11 @@ CONFIG_SAMA5D4EK_MXT_DEVMINOR=0
CONFIG_SAMA5D4EK_WM8904_I2CFREQUENCY=400000
CONFIG_SAMA5D4EK_WM8904_SRCMAIN=y
# CONFIG_SAMA5D4EK_WM8904_SRCSCK is not set
+CONFIG_LIB_BOARDCTL=y
+CONFIG_BOARDCTL_TSCTEST=y
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
#
# RTOS Features
@@ -596,11 +604,17 @@ CONFIG_I2C_WRITEREAD=y
CONFIG_I2C_RESET=y
# CONFIG_SPI is not set
CONFIG_I2S=y
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
CONFIG_RTC=y
CONFIG_RTC_DATETIME=y
# CONFIG_RTC_ALARM is not set
+# CONFIG_RTC_DRIVER is not set
# CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
+# CONFIG_TIMERS_CS2100CP is not set
# CONFIG_ANALOG is not set
CONFIG_AUDIO_DEVICES=y
# CONFIG_AUDIO_I2SCHAR is not set
@@ -669,10 +683,13 @@ CONFIG_ARCH_PHY_INTERRUPT=y
# CONFIG_ETH0_PHY_AM79C874 is not set
# CONFIG_ETH0_PHY_KS8721 is not set
# CONFIG_ETH0_PHY_KSZ8051 is not set
+# CONFIG_ETH0_PHY_KSZ8061 is not set
CONFIG_ETH0_PHY_KSZ8081=y
# CONFIG_ETH0_PHY_KSZ90x1 is not set
# CONFIG_ETH0_PHY_DP83848C is not set
# CONFIG_ETH0_PHY_LAN8720 is not set
+# CONFIG_ETH0_PHY_LAN8740 is not set
+# CONFIG_ETH0_PHY_LAN8740A is not set
# CONFIG_ETH0_PHY_DM9161 is not set
# CONFIG_PIPES is not set
# CONFIG_PM is not set
@@ -800,6 +817,7 @@ CONFIG_NET_GUARDSIZE=2
#
# CONFIG_NET_MULTILINK is not set
CONFIG_NET_ETHERNET=y
+# CONFIG_NET_TUN is not set
#
# Network Device Operations
@@ -1117,6 +1135,7 @@ CONFIG_LIBC_TMPDIR="/tmp"
CONFIG_LIBC_MAX_TMPFILE=32
CONFIG_ARCH_LOWPUTC=y
# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_ARCH_ROMGETC is not set
# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
@@ -1222,8 +1241,6 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
# CONFIG_EXAMPLES_THTTPD is not set
# CONFIG_EXAMPLES_TIFF is not set
CONFIG_EXAMPLES_TOUCHSCREEN=y
-CONFIG_LIB_BOARDCTL=y
-CONFIG_BOARDCTL_TSCTEST=y
CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
# CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE is not set
@@ -1279,6 +1296,7 @@ CONFIG_WEBCLIENT_TIMEOUT=10
# CONFIG_NETUTILS_NTPCLIENT is not set
# CONFIG_NETUTILS_DISCOVER is not set
# CONFIG_NETUTILS_XMLRPC is not set
+# CONFIG_NETUTILS_PPPD is not set
#
# FreeModBus
@@ -1312,6 +1330,7 @@ CONFIG_NSH_BUILTIN_APPS=y
# CONFIG_NSH_DISABLE_CD is not set
# CONFIG_NSH_DISABLE_CP is not set
# CONFIG_NSH_DISABLE_CMP is not set
+# CONFIG_NSH_DISABLE_DATE is not set
# CONFIG_NSH_DISABLE_DD is not set
# CONFIG_NSH_DISABLE_DF is not set
# CONFIG_NSH_DISABLE_DELROUTE is not set
@@ -1333,6 +1352,7 @@ CONFIG_NSH_BUILTIN_APPS=y
# CONFIG_NSH_DISABLE_MKRD is not set
# CONFIG_NSH_DISABLE_MH is not set
# CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
# CONFIG_NSH_DISABLE_MW is not set
# CONFIG_NSH_DISABLE_PS is not set
# CONFIG_NSH_DISABLE_PING is not set
@@ -1385,7 +1405,6 @@ CONFIG_NSH_FATMOUNTPT="/tmp"
CONFIG_NSH_CONSOLE=y
# CONFIG_NSH_USBKBD is not set
CONFIG_NSH_ARCHINIT=y
-CONFIG_LIB_BOARDCTL=y
#
# Networking Configuration
@@ -1435,39 +1454,11 @@ CONFIG_NSH_IOBUFFER_SIZE=512
#
# System Libraries and NSH Add-Ons
#
-
-#
-# Custom Free Memory Command
-#
# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
# CONFIG_SYSTEM_CLE is not set
-
-#
-# CU Minimal Terminal
-#
# CONFIG_SYSTEM_CUTERM is not set
-
-#
-# FLASH Program Installation
-#
# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
# CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
CONFIG_SYSTEM_I2CTOOL=y
CONFIG_I2CTOOL_MINBUS=0
CONFIG_I2CTOOL_MAXBUS=0
@@ -1475,15 +1466,7 @@ CONFIG_I2CTOOL_MINADDR=0x03
CONFIG_I2CTOOL_MAXADDR=0x77
CONFIG_I2CTOOL_MAXREGADDR=0xff
CONFIG_I2CTOOL_DEFFREQ=100000
-
-#
-# INI File Parser
-#
# CONFIG_SYSTEM_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
CONFIG_SYSTEM_NXPLAYER=y
CONFIG_NXPLAYER_PLAYTHREAD_STACKSIZE=1500
CONFIG_NXPLAYER_COMMAND_LINE=y
@@ -1496,81 +1479,13 @@ CONFIG_NXPLAYER_INCLUDE_MEDIADIR=y
CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/mnt/sdcard"
CONFIG_NXPLAYER_RECURSIVE_MEDIA_SEARCH=y
CONFIG_NXPLAYER_INCLUDE_SYSTEM_RESET=y
-
-#
-# RAM test
-#
# CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
CONFIG_SYSTEM_READLINE=y
CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
# CONFIG_SYSTEM_RAMTRON is not set
-
-#
-# SD Card
-#
# CONFIG_SYSTEM_SDCARD is not set
-
-#
-# Sudoku
-#
# CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
# CONFIG_SYSTEM_SYSINFO is not set
-
-#
-# Temperature
-#
-
-#
-# VI Work-Alike Editor
-#
# CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/nuttx/configs/samv71-xult/nsh/defconfig b/nuttx/configs/samv71-xult/nsh/defconfig
index 1540e2976..09366652c 100644
--- a/nuttx/configs/samv71-xult/nsh/defconfig
+++ b/nuttx/configs/samv71-xult/nsh/defconfig
@@ -708,6 +708,7 @@ CONFIG_LIBC_TMPDIR="/tmp"
CONFIG_LIBC_MAX_TMPFILE=32
CONFIG_ARCH_LOWPUTC=y
# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_ARCH_ROMGETC is not set
# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
@@ -931,40 +932,12 @@ CONFIG_NSH_ARCHINIT=y
#
# System Libraries and NSH Add-Ons
#
-
-#
-# Custom Free Memory Command
-#
# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
# CONFIG_SYSTEM_CLE is not set
-
-#
-# CU Minimal Terminal
-#
# CONFIG_SYSTEM_CUTERM is not set
-
-#
-# FLASH Program Installation
-#
# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
# CONFIG_SYSTEM_FLASH_ERASEALL is not set
-
-#
-# Intel HEX to binary conversion
-#
# CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
CONFIG_SYSTEM_I2CTOOL=y
CONFIG_I2CTOOL_MINBUS=0
CONFIG_I2CTOOL_MAXBUS=0
@@ -972,90 +945,14 @@ CONFIG_I2CTOOL_MINADDR=0x03
CONFIG_I2CTOOL_MAXADDR=0x77
CONFIG_I2CTOOL_MAXREGADDR=0xff
CONFIG_I2CTOOL_DEFFREQ=400000
-
-#
-# INI File Parser
-#
# CONFIG_SYSTEM_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-
-#
-# RAM test
-#
CONFIG_SYSTEM_RAMTEST=y
-
-#
-# readline()
-#
CONFIG_SYSTEM_READLINE=y
CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
# CONFIG_SYSTEM_RAMTRON is not set
-
-#
-# SD Card
-#
# CONFIG_SYSTEM_SDCARD is not set
-
-#
-# Sudoku
-#
# CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
# CONFIG_SYSTEM_SYSINFO is not set
-
-#
-# Temperature
-#
-
-#
-# VI Work-Alike Editor
-#
# CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
# CONFIG_SYSTEM_ZMODEM is not set