diff options
| author | David Sidrane <david_s5@nscdg.com> | 2014-12-26 15:22:56 -1000 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2014-12-26 15:22:56 -1000 |
| commit | 8158e531013ad24248d9d01d7f4de0bebb11e99f (patch) | |
| tree | 065b39b584bb3d729652c4dd2b0be67fb1d91e05 /nuttx-configs | |
| parent | 91633bc30c0ad850535346d7107f8277765d9b66 (diff) | |
| download | px4-firmware-8158e531013ad24248d9d01d7f4de0bebb11e99f.tar.gz px4-firmware-8158e531013ad24248d9d01d7f4de0bebb11e99f.tar.bz2 px4-firmware-8158e531013ad24248d9d01d7f4de0bebb11e99f.zip | |
Update configs with latest upstream setting
Diffstat (limited to 'nuttx-configs')
| -rw-r--r-- | nuttx-configs/aerocore/nsh/defconfig | 3 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 8 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 7 | ||||
| -rwxr-xr-x | nuttx-configs/px4io-v1/nsh/defconfig | 1 |
4 files changed, 10 insertions, 9 deletions
diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig index 615c8273b..e44e19a36 100644 --- a/nuttx-configs/aerocore/nsh/defconfig +++ b/nuttx-configs/aerocore/nsh/defconfig @@ -292,6 +292,7 @@ CONFIG_STM32_USART_SINGLEWIRE=y # CONFIG_STM32_I2C_DYNTIMEO is not set CONFIG_STM32_I2CTIMEOSEC=0 CONFIG_STM32_I2CTIMEOMS=10 +CONFIG_STM32_I2CTIMEOTICKS=10 # CONFIG_STM32_I2C_DUTY16_9 is not set # @@ -465,6 +466,8 @@ CONFIG_MTD_BYTE_WRITE=y # CONFIG_MTD_M25P is not set # CONFIG_MTD_SMART is not set CONFIG_MTD_RAMTRON=y +CONFIG_RAMTRON_WRITEWAIT=y +CONFIG_RAMTRON_SETSPEED=y CONFIG_RAMTRON_FUJITSU=y # CONFIG_MTD_SST25 is not set # CONFIG_MTD_SST39FV is not set diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index f1d41301a..960c0e85d 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -304,10 +304,6 @@ CONFIG_STM32_DMACAPABLE=y # CONFIG_STM32_TIM4_ADC is not set # CONFIG_STM32_TIM5_ADC is not set CONFIG_STM32_USART=y -CONFIG_STM32_FLOWCONTROL_BROKEN=y -CONFIG_SERIAL_IFLOWCONTROL_DEASSERT_WATERMARK=16 -CONFIG_SERIAL_IFLOWCONTROL_ASSERT_WATERMARK=32 - # # U[S]ART Configuration @@ -339,6 +335,7 @@ CONFIG_STM32_USART_SINGLEWIRE=y # CONFIG_STM32_I2C_DYNTIMEO is not set CONFIG_STM32_I2CTIMEOSEC=0 CONFIG_STM32_I2CTIMEOMS=10 +CONFIG_STM32_I2CTIMEOTICKS=10 # CONFIG_STM32_I2C_DUTY16_9 is not set # @@ -548,6 +545,8 @@ CONFIG_MTD_BYTE_WRITE=y # CONFIG_MTD_M25P is not set # CONFIG_MTD_SMART is not set # CONFIG_MTD_RAMTRON is not set +CONFIG_RAMTRON_WRITEWAIT=y +CONFIG_RAMTRON_SETSPEED=y # CONFIG_MTD_SST25 is not set # CONFIG_MTD_SST39FV is not set # CONFIG_MTD_W25 is not set @@ -750,7 +749,6 @@ CONFIG_STDIO_BUFFER_SIZE=180 CONFIG_STDIO_LINEBUFFER=y CONFIG_NUNGET_CHARS=2 CONFIG_LIB_HOMEDIR="/" -CONFIG_LIBM=y # CONFIG_NOPRINTF_FIELDWIDTH is not set CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIB_RAND_ORDER=1 diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index 3e44d8601..cc06d0f82 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -338,9 +338,6 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set # CONFIG_STM32_CCMEXCLUDE is not set CONFIG_STM32_DMACAPABLE=y -CONFIG_STM32_FLOWCONTROL_BROKEN=y -CONFIG_SERIAL_IFLOWCONTROL_DEASSERT_WATERMARK=16 -CONFIG_SERIAL_IFLOWCONTROL_ASSERT_WATERMARK=32 # CONFIG_STM32_TIM1_PWM is not set # CONFIG_STM32_TIM3_PWM is not set # CONFIG_STM32_TIM4_PWM is not set @@ -385,6 +382,7 @@ CONFIG_STM32_USART_SINGLEWIRE=y # CONFIG_STM32_I2C_DYNTIMEO is not set CONFIG_STM32_I2CTIMEOSEC=0 CONFIG_STM32_I2CTIMEOMS=10 +CONFIG_STM32_I2CTIMEOTICKS=10 # CONFIG_STM32_I2C_DUTY16_9 is not set # @@ -660,6 +658,8 @@ CONFIG_MTD_BYTE_WRITE=y # CONFIG_MTD_M25P is not set # CONFIG_MTD_SMART is not set CONFIG_MTD_RAMTRON=y +CONFIG_RAMTRON_WRITEWAIT=y +CONFIG_RAMTRON_SETSPEED=y # CONFIG_MTD_SST25 is not set # CONFIG_MTD_SST25XX is not set # CONFIG_MTD_SST39FV is not set @@ -951,7 +951,6 @@ CONFIG_STDIO_BUFFER_SIZE=32 CONFIG_STDIO_LINEBUFFER=y CONFIG_NUNGET_CHARS=2 CONFIG_LIB_HOMEDIR="/" -CONFIG_LIBM=y # CONFIG_NOPRINTF_FIELDWIDTH is not set CONFIG_LIBC_FLOATINGPOINT=y # CONFIG_LIBC_IOCTL_VARIADIC is not set diff --git a/nuttx-configs/px4io-v1/nsh/defconfig b/nuttx-configs/px4io-v1/nsh/defconfig index 17729ebf4..afe7373ad 100755 --- a/nuttx-configs/px4io-v1/nsh/defconfig +++ b/nuttx-configs/px4io-v1/nsh/defconfig @@ -136,6 +136,7 @@ CONFIG_STM32_I2C1=y CONFIG_STM32_I2C2=n CONFIG_STM32_I2CTIMEOSEC=0 CONFIG_STM32_I2CTIMEOMS=1 +CONFIG_STM32_I2CTIMEOTICKS=1 CONFIG_STM32_BKP=n CONFIG_STM32_PWR=n CONFIG_STM32_DAC=n |