diff options
| author | David Sidrane <david_s5@nscdg.com> | 2014-12-26 15:22:56 -1000 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-04-07 07:12:02 -1000 |
| commit | 46419135c119c4d26c2936bdfb1ca788aa7f0972 (patch) | |
| tree | c376f45dc26931e52051ad20bb8d09ba18c19a1f /nuttx-configs | |
| parent | c9ca0fd09eb335d3cfe36a062aba63b13059df96 (diff) | |
| download | px4-firmware-46419135c119c4d26c2936bdfb1ca788aa7f0972.tar.gz px4-firmware-46419135c119c4d26c2936bdfb1ca788aa7f0972.tar.bz2 px4-firmware-46419135c119c4d26c2936bdfb1ca788aa7f0972.zip | |
Update configs with latest upstream setting
Diffstat (limited to 'nuttx-configs')
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 7 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 3 | ||||
| -rwxr-xr-x | nuttx-configs/px4io-v1/nsh/defconfig | 1 |
3 files changed, 4 insertions, 7 deletions
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index 7d052e272..648e6f74a 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -256,10 +256,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 @@ -291,6 +287,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 # @@ -501,6 +498,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 diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index def311885..106b7503c 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -280,9 +280,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 diff --git a/nuttx-configs/px4io-v1/nsh/defconfig b/nuttx-configs/px4io-v1/nsh/defconfig index a03166478..29d45fbe9 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 |