summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-06-02 13:08:39 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-06-02 13:08:39 +0200
commitc2688999fc33e82553a90d14fee079b5dc7efea0 (patch)
tree36c4ae83c9ebb4e0709001404089c7288996eec5 /nuttx
parent1ecb373d35e2a6f2956e1f1f09112ed2dd0eda86 (diff)
downloadpx4-nuttx-c2688999fc33e82553a90d14fee079b5dc7efea0.tar.gz
px4-nuttx-c2688999fc33e82553a90d14fee079b5dc7efea0.tar.bz2
px4-nuttx-c2688999fc33e82553a90d14fee079b5dc7efea0.zip
Updated defconfig, now 100% vetted vs. old config AND KConfig clean
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/configs/px4fmu-v1/Kconfig6
-rw-r--r--nuttx/configs/px4fmu-v1/nsh/defconfig110
2 files changed, 64 insertions, 52 deletions
diff --git a/nuttx/configs/px4fmu-v1/Kconfig b/nuttx/configs/px4fmu-v1/Kconfig
index b54c8980b..edbafa06f 100644
--- a/nuttx/configs/px4fmu-v1/Kconfig
+++ b/nuttx/configs/px4fmu-v1/Kconfig
@@ -5,16 +5,16 @@
if ARCH_BOARD_PX4FMU_V1
-config CONFIG_HRT_TIMER
+config HRT_TIMER
bool "High resolution timer support"
default y
---help---
Enable high resolution timer for PPM capture and system clocks.
-config CONFIG_HRT_PPM
+config HRT_PPM
bool "PPM input capture"
default y
- depends on CONFIG_HRT_TIMER
+ depends on HRT_TIMER
---help---
Enable PPM input capture via HRT (for CPPM / PPM sum RC inputs)
diff --git a/nuttx/configs/px4fmu-v1/nsh/defconfig b/nuttx/configs/px4fmu-v1/nsh/defconfig
index 11fc24d41..63628d47e 100644
--- a/nuttx/configs/px4fmu-v1/nsh/defconfig
+++ b/nuttx/configs/px4fmu-v1/nsh/defconfig
@@ -5,12 +5,6 @@
CONFIG_NUTTX_NEWCONFIG=y
#
-# XXX Needs menu
-#
-CONFIG_HRT_TIMER=y
-CONFIG_HRT_PPM=y
-
-#
# Build Setup
#
# CONFIG_EXPERIMENTAL is not set
@@ -185,7 +179,7 @@ CONFIG_STM32_STM32F40XX=y
CONFIG_STM32_ADC1=y
# CONFIG_STM32_ADC2 is not set
# CONFIG_STM32_ADC3 is not set
-# CONFIG_STM32_BKPSRAM is not set
+CONFIG_STM32_BKPSRAM=y
# CONFIG_STM32_CAN1 is not set
# CONFIG_STM32_CAN2 is not set
CONFIG_STM32_CCMDATARAM=y
@@ -219,9 +213,9 @@ CONFIG_STM32_TIM5=y
CONFIG_STM32_TIM6=y
CONFIG_STM32_TIM7=y
# CONFIG_STM32_TIM8 is not set
-# CONFIG_STM32_TIM9 is not set
-# CONFIG_STM32_TIM10 is not set
-# CONFIG_STM32_TIM11 is not set
+CONFIG_STM32_TIM9=y
+CONFIG_STM32_TIM10=y
+CONFIG_STM32_TIM11=y
CONFIG_STM32_TIM12=y
CONFIG_STM32_TIM13=y
CONFIG_STM32_TIM14=y
@@ -232,7 +226,7 @@ CONFIG_STM32_USART2=y
CONFIG_STM32_UART5=y
CONFIG_STM32_USART6=y
# CONFIG_STM32_IWDG is not set
-# CONFIG_STM32_WWDG is not set
+CONFIG_STM32_WWDG=y
CONFIG_STM32_ADC=y
CONFIG_STM32_SPI=y
CONFIG_STM32_I2C=y
@@ -242,15 +236,18 @@ CONFIG_STM32_I2C=y
#
CONFIG_STM32_FLASH_PREFETCH=y
# CONFIG_STM32_JTAG_DISABLE is not set
-# CONFIG_STM32_JTAG_FULL_ENABLE is not set
+CONFIG_STM32_JTAG_FULL_ENABLE=y
# CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set
-CONFIG_STM32_JTAG_SW_ENABLE=y
-# CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
+# CONFIG_STM32_JTAG_SW_ENABLE is not set
+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 is not set
# CONFIG_STM32_TIM4_PWM is not set
# CONFIG_STM32_TIM5_PWM is not set
+# CONFIG_STM32_TIM9_PWM is not set
+# CONFIG_STM32_TIM10_PWM is not set
+# CONFIG_STM32_TIM11_PWM is not set
# CONFIG_STM32_TIM12_PWM is not set
# CONFIG_STM32_TIM13_PWM is not set
# CONFIG_STM32_TIM14_PWM is not set
@@ -262,7 +259,7 @@ CONFIG_STM32_USART=y
# U[S]ART Configuration
#
# CONFIG_USART1_RS485 is not set
-# CONFIG_USART1_RXDMA is not set
+CONFIG_USART1_RXDMA=y
# CONFIG_USART2_RS485 is not set
CONFIG_USART2_RXDMA=y
# CONFIG_USART3_RXDMA is not set
@@ -279,14 +276,14 @@ CONFIG_STM32_USART_SINGLEWIRE=y
# SPI Configuration
#
# CONFIG_STM32_SPI_INTERRUPTS is not set
-CONFIG_STM32_SPI_DMA=n
+# CONFIG_STM32_SPI_DMA is not set
#
# I2C Configuration
#
# CONFIG_STM32_I2C_DYNTIMEO is not set
CONFIG_STM32_I2CTIMEOSEC=0
-CONFIG_STM32_I2CTIMEOMS=500
+CONFIG_STM32_I2CTIMEOMS=10
CONFIG_STM32_I2CTIMEOTICKS=500
# CONFIG_STM32_I2C_DUTY16_9 is not set
@@ -324,7 +321,7 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
CONFIG_BOARD_LOOPSPERMSEC=16717
# CONFIG_ARCH_CALIBRATION is not set
CONFIG_DRAM_START=0x20000000
-CONFIG_DRAM_SIZE=114688
+CONFIG_DRAM_SIZE=196608
CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
CONFIG_ARCH_INTERRUPTSTACK=0
@@ -356,27 +353,29 @@ CONFIG_NSH_MMCSDSPIPORTNO=3
#
# Board-Specific Options
#
+CONFIG_HRT_TIMER=y
+CONFIG_HRT_PPM=y
#
# RTOS Features
#
# CONFIG_BOARD_INITIALIZE is not set
CONFIG_MSEC_PER_TICK=1
-CONFIG_RR_INTERVAL=5
+CONFIG_RR_INTERVAL=0
CONFIG_SCHED_INSTRUMENTATION=y
CONFIG_TASK_NAME_SIZE=24
# CONFIG_SCHED_HAVE_PARENT is not set
# CONFIG_JULIAN_TIME is not set
-CONFIG_START_YEAR=2011
-CONFIG_START_MONTH=12
-CONFIG_START_DAY=6
+CONFIG_START_YEAR=1970
+CONFIG_START_MONTH=1
+CONFIG_START_DAY=1
# CONFIG_DEV_CONSOLE is not set
# CONFIG_MUTEX_TYPES is not set
CONFIG_PRIORITY_INHERITANCE=y
-CONFIG_SEM_PREALLOCHOLDERS=16
-CONFIG_SEM_NNESTPRIO=16
+CONFIG_SEM_PREALLOCHOLDERS=0
+CONFIG_SEM_NNESTPRIO=8
# CONFIG_FDCLONE_DISABLE is not set
-# CONFIG_FDCLONE_STDIO is not set
+CONFIG_FDCLONE_STDIO=y
CONFIG_SDCLONE_DISABLE=y
CONFIG_SCHED_WAITPID=y
# CONFIG_SCHED_STARTHOOK is not set
@@ -399,7 +398,7 @@ CONFIG_SIG_SIGUSR1=1
CONFIG_SIG_SIGUSR2=2
CONFIG_SIG_SIGALARM=3
CONFIG_SIG_SIGCONDTIMEDOUT=16
-CONFIG_SIG_SIGWORK=17
+CONFIG_SIG_SIGWORK=4
#
# Sizes of configurable things (0 disables)
@@ -447,7 +446,7 @@ CONFIG_SPI=y
CONFIG_SPI_EXCHANGE=y
# CONFIG_SPI_CMDDATA is not set
# CONFIG_RTC is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
# CONFIG_ANALOG is not set
# CONFIG_AUDIO_DEVICES is not set
# CONFIG_BCH is not set
@@ -487,8 +486,8 @@ CONFIG_NO_SERIAL_CONSOLE=y
#
# USART1 Configuration
#
-CONFIG_USART1_RXBUFSIZE=256
-CONFIG_USART1_TXBUFSIZE=256
+CONFIG_USART1_RXBUFSIZE=512
+CONFIG_USART1_TXBUFSIZE=512
CONFIG_USART1_BAUD=57600
CONFIG_USART1_BITS=8
CONFIG_USART1_PARITY=0
@@ -497,9 +496,9 @@ CONFIG_USART1_2STOP=0
#
# USART2 Configuration
#
-CONFIG_USART2_RXBUFSIZE=256
-CONFIG_USART2_TXBUFSIZE=256
-CONFIG_USART2_BAUD=115200
+CONFIG_USART2_RXBUFSIZE=512
+CONFIG_USART2_TXBUFSIZE=512
+CONFIG_USART2_BAUD=57600
CONFIG_USART2_BITS=8
CONFIG_USART2_PARITY=0
CONFIG_USART2_2STOP=0
@@ -507,9 +506,9 @@ CONFIG_USART2_2STOP=0
#
# UART5 Configuration
#
-CONFIG_UART5_RXBUFSIZE=256
-CONFIG_UART5_TXBUFSIZE=256
-CONFIG_UART5_BAUD=115200
+CONFIG_UART5_RXBUFSIZE=512
+CONFIG_UART5_TXBUFSIZE=512
+CONFIG_UART5_BAUD=57600
CONFIG_UART5_BITS=8
CONFIG_UART5_PARITY=0
CONFIG_UART5_2STOP=0
@@ -517,9 +516,9 @@ CONFIG_UART5_2STOP=0
#
# USART6 Configuration
#
-CONFIG_USART6_RXBUFSIZE=256
-CONFIG_USART6_TXBUFSIZE=256
-CONFIG_USART6_BAUD=115200
+CONFIG_USART6_RXBUFSIZE=512
+CONFIG_USART6_TXBUFSIZE=512
+CONFIG_USART6_BAUD=57600
CONFIG_USART6_BITS=8
CONFIG_USART6_PARITY=0
CONFIG_USART6_2STOP=0
@@ -558,9 +557,9 @@ CONFIG_CDCACM_NRDREQS=4
CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_CDCACM_VENDORID=0x26ac
-CONFIG_CDCACM_PRODUCTID=0x10
+CONFIG_CDCACM_PRODUCTID=0x0010
CONFIG_CDCACM_VENDORSTR="3D Robotics"
-CONFIG_CDCACM_PRODUCTSTR="PX4FMU v1.x"
+CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v1.x"
# CONFIG_USBMSC is not set
# CONFIG_USBHOST is not set
# CONFIG_WIRELESS is not set
@@ -598,7 +597,7 @@ CONFIG_FS_NXFFS=y
CONFIG_NXFFS_PREALLOCATED=y
CONFIG_NXFFS_ERASEDSTATE=0xff
CONFIG_NXFFS_PACKTHRESHOLD=32
-CONFIG_NXFFS_MAXNAMLEN=255
+CONFIG_NXFFS_MAXNAMLEN=32
CONFIG_NXFFS_TAILTHRESHOLD=2048
CONFIG_FS_ROMFS=y
# CONFIG_FS_SMARTFS is not set
@@ -650,7 +649,7 @@ CONFIG_BUILTIN=y
#
# Standard C Library Options
#
-CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_BUFFER_SIZE=256
CONFIG_STDIO_LINEBUFFER=y
CONFIG_NUNGET_CHARS=2
CONFIG_LIB_HOMEDIR="/"
@@ -670,7 +669,19 @@ CONFIG_LIBC_STRERROR=y
CONFIG_ARCH_LOWPUTC=y
CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_ARCH_ROMGETC is not set
-# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_OPTIMIZED_FUNCTIONS=y
+CONFIG_ARCH_MEMCPY=y
+# CONFIG_ARCH_MEMCMP is not set
+# CONFIG_ARCH_MEMMOVE is not set
+# CONFIG_ARCH_MEMSET is not set
+# CONFIG_MEMSET_OPTSPEED is not set
+# CONFIG_ARCH_STRCHR is not set
+# CONFIG_ARCH_STRCMP is not set
+# CONFIG_ARCH_STRCPY is not set
+# CONFIG_ARCH_STRNCPY is not set
+# CONFIG_ARCH_STRLEN is not set
+# CONFIG_ARCH_STRNLEN is not set
+# CONFIG_ARCH_BZERO is not set
#
# Non-standard Library Support
@@ -678,7 +689,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
CONFIG_SCHED_WORKQUEUE=y
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=50000
+CONFIG_SCHED_WORKPERIOD=5000
CONFIG_SCHED_WORKSTACKSIZE=2048
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_LPWORKPRIORITY=50
@@ -857,22 +868,23 @@ CONFIG_NSH_BUILTIN_APPS=y
# CONFIG_NSH_CMDOPT_DF_H is not set
CONFIG_NSH_CODECS_BUFSIZE=128
CONFIG_NSH_FILEIOSIZE=512
-# CONFIG_NSH_STRERROR is not set
-CONFIG_NSH_LINELEN=64
-CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_STRERROR=y
+CONFIG_NSH_LINELEN=128
+CONFIG_NSH_MAXARGUMENTS=12
+CONFIG_NSH_NESTDEPTH=8
# CONFIG_NSH_DISABLESCRIPT is not set
# CONFIG_NSH_DISABLEBG is not set
CONFIG_NSH_ROMFSETC=y
-CONFIG_NSH_ARCHROMFS=y
# CONFIG_NSH_ROMFSRC is not set
CONFIG_NSH_ROMFSMOUNTPT="/etc"
CONFIG_NSH_INITSCRIPT="init.d/rcS"
CONFIG_NSH_ROMFSDEVNO=0
CONFIG_NSH_ROMFSSECTSIZE=128
+CONFIG_NSH_ARCHROMFS=y
CONFIG_NSH_FATDEVNO=1
CONFIG_NSH_FATSECTSIZE=512
CONFIG_NSH_FATNSECTORS=1024
-CONFIG_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FATMOUNTPT="/tmp"
CONFIG_NSH_CONSOLE=y
# CONFIG_NSH_USBCONSOLE is not set