mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 08:36:24 +08:00
Fix I2C/FSMC conflict for STM32; Fix STM32 clock setup
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3942 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
@@ -360,6 +360,12 @@ STM3210E-EVAL-specific Configuration Options
|
|||||||
CONFIG_STM32_USART1
|
CONFIG_STM32_USART1
|
||||||
CONFIG_STM32_ADC3
|
CONFIG_STM32_ADC3
|
||||||
|
|
||||||
|
Timer and I2C devices may need to the following to force power to be applied
|
||||||
|
unconditionally at power up. (Otherwise, the device is powered when it is
|
||||||
|
initialized).
|
||||||
|
|
||||||
|
CONFIG_STM32_FORCEPOWER
|
||||||
|
|
||||||
Alternate pin mappings (should not be used with the STM3210E-EVAL board):
|
Alternate pin mappings (should not be used with the STM3210E-EVAL board):
|
||||||
|
|
||||||
CONFIG_STM32_TIM1_FULL_REMAP
|
CONFIG_STM32_TIM1_FULL_REMAP
|
||||||
|
|||||||
@@ -127,6 +127,11 @@ CONFIG_STM32_TIM8=n
|
|||||||
CONFIG_STM32_USART1=y
|
CONFIG_STM32_USART1=y
|
||||||
CONFIG_STM32_ADC3=n
|
CONFIG_STM32_ADC3=n
|
||||||
|
|
||||||
|
#
|
||||||
|
# Timer and I2C devices may need to the following to force power to be applied:
|
||||||
|
#
|
||||||
|
#CONFIG_STM32_FORCEPOWER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# STM32F103Z specific serial device driver settings
|
# STM32F103Z specific serial device driver settings
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -141,6 +141,11 @@ CONFIG_STM32_TIM8=n
|
|||||||
CONFIG_STM32_USART1=y
|
CONFIG_STM32_USART1=y
|
||||||
CONFIG_STM32_ADC3=n
|
CONFIG_STM32_ADC3=n
|
||||||
|
|
||||||
|
#
|
||||||
|
# Timer and I2C devices may need to the following to force power to be applied:
|
||||||
|
#
|
||||||
|
#CONFIG_STM32_FORCEPOWER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# STM32F103Z specific serial device driver settings
|
# STM32F103Z specific serial device driver settings
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -137,6 +137,11 @@ CONFIG_STM32_TIM8=n
|
|||||||
CONFIG_STM32_USART1=y
|
CONFIG_STM32_USART1=y
|
||||||
CONFIG_STM32_ADC3=n
|
CONFIG_STM32_ADC3=n
|
||||||
|
|
||||||
|
#
|
||||||
|
# Timer and I2C devices may need to the following to force power to be applied:
|
||||||
|
#
|
||||||
|
#CONFIG_STM32_FORCEPOWER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# STM32F103Z specific serial device driver settings
|
# STM32F103Z specific serial device driver settings
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -137,6 +137,11 @@ CONFIG_STM32_TIM8=n
|
|||||||
CONFIG_STM32_USART1=y
|
CONFIG_STM32_USART1=y
|
||||||
CONFIG_STM32_ADC3=n
|
CONFIG_STM32_ADC3=n
|
||||||
|
|
||||||
|
#
|
||||||
|
# Timer and I2C devices may need to the following to force power to be applied:
|
||||||
|
#
|
||||||
|
#CONFIG_STM32_FORCEPOWER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# STM32F103Z specific serial device driver settings
|
# STM32F103Z specific serial device driver settings
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -137,6 +137,11 @@ CONFIG_STM32_TIM8=n
|
|||||||
CONFIG_STM32_USART1=y
|
CONFIG_STM32_USART1=y
|
||||||
CONFIG_STM32_ADC3=n
|
CONFIG_STM32_ADC3=n
|
||||||
|
|
||||||
|
#
|
||||||
|
# Timer and I2C devices may need to the following to force power to be applied:
|
||||||
|
#
|
||||||
|
#CONFIG_STM32_FORCEPOWER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# STM32F103Z specific serial device driver settings
|
# STM32F103Z specific serial device driver settings
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -137,6 +137,11 @@ CONFIG_STM32_TIM8=n
|
|||||||
CONFIG_STM32_USART1=y
|
CONFIG_STM32_USART1=y
|
||||||
CONFIG_STM32_ADC3=n
|
CONFIG_STM32_ADC3=n
|
||||||
|
|
||||||
|
#
|
||||||
|
# Timer and I2C devices may need to the following to force power to be applied:
|
||||||
|
#
|
||||||
|
#CONFIG_STM32_FORCEPOWER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# STM32F103Z specific serial device driver settings
|
# STM32F103Z specific serial device driver settings
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -137,6 +137,11 @@ CONFIG_STM32_TIM8=n
|
|||||||
CONFIG_STM32_USART1=y
|
CONFIG_STM32_USART1=y
|
||||||
CONFIG_STM32_ADC3=n
|
CONFIG_STM32_ADC3=n
|
||||||
|
|
||||||
|
#
|
||||||
|
# Timer and I2C devices may need to the following to force power to be applied:
|
||||||
|
#
|
||||||
|
#CONFIG_STM32_FORCEPOWER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# STM32F103Z specific serial device driver settings
|
# STM32F103Z specific serial device driver settings
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -139,6 +139,11 @@ CONFIG_STM32_TIM8=n
|
|||||||
CONFIG_STM32_USART1=y
|
CONFIG_STM32_USART1=y
|
||||||
CONFIG_STM32_ADC3=n
|
CONFIG_STM32_ADC3=n
|
||||||
|
|
||||||
|
#
|
||||||
|
# Timer and I2C devices may need to the following to force power to be applied:
|
||||||
|
#
|
||||||
|
#CONFIG_STM32_FORCEPOWER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# STM32F103Z specific serial device driver settings
|
# STM32F103Z specific serial device driver settings
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -88,7 +88,7 @@
|
|||||||
* *JP7 will switch to PD6
|
* *JP7 will switch to PD6
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* GPIO configurations unique to SRAM */
|
/* GPIO configurations unique to the LCD */
|
||||||
|
|
||||||
static const uint16_t g_lcdconfig[] =
|
static const uint16_t g_lcdconfig[] =
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -139,6 +139,11 @@ CONFIG_STM32_TIM8=n
|
|||||||
CONFIG_STM32_USART1=y
|
CONFIG_STM32_USART1=y
|
||||||
CONFIG_STM32_ADC3=n
|
CONFIG_STM32_ADC3=n
|
||||||
|
|
||||||
|
#
|
||||||
|
# Timer and I2C devices may need to the following to force power to be applied:
|
||||||
|
#
|
||||||
|
#CONFIG_STM32_FORCEPOWER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# STM32F103Z specific serial device driver settings
|
# STM32F103Z specific serial device driver settings
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -137,6 +137,11 @@ CONFIG_STM32_TIM8=n
|
|||||||
CONFIG_STM32_USART1=y
|
CONFIG_STM32_USART1=y
|
||||||
CONFIG_STM32_ADC3=n
|
CONFIG_STM32_ADC3=n
|
||||||
|
|
||||||
|
#
|
||||||
|
# Timer and I2C devices may need to the following to force power to be applied:
|
||||||
|
#
|
||||||
|
#CONFIG_STM32_FORCEPOWER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# STM32F103Z specific serial device driver settings
|
# STM32F103Z specific serial device driver settings
|
||||||
#
|
#
|
||||||
|
|||||||
Reference in New Issue
Block a user