diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-07 22:30:35 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-07 22:30:35 +0000 |
| commit | f1e1db08d53f02b5fd39d8ab4e33cd9e853a4d6c (patch) | |
| tree | c38659b576da3bf3e1d35fb46e6be88f3b4ce1da /nuttx/arch/arm | |
| parent | 2337df100fd9bfc4825c1822b4edfe63553dc379 (diff) | |
| download | px4-nuttx-f1e1db08d53f02b5fd39d8ab4e33cd9e853a4d6c.tar.gz px4-nuttx-f1e1db08d53f02b5fd39d8ab4e33cd9e853a4d6c.tar.bz2 px4-nuttx-f1e1db08d53f02b5fd39d8ab4e33cd9e853a4d6c.zip | |
More info for the Shenzhou board configuration
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5109 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/Kconfig | 28 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_eth.c | 2 |
2 files changed, 22 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig index db785fd62..661f6d8f4 100644 --- a/nuttx/arch/arm/src/stm32/Kconfig +++ b/nuttx/arch/arm/src/stm32/Kconfig @@ -1562,13 +1562,32 @@ config STM32_MII ---help--- Support Ethernet MII interface. +choice + prompt "MII clock configuration" + default STM32_MII_MCO if STM32_STM32F10XX + default STM32_MII_MCO1 if STM32_STM32F20XX || STM32_STM32F40XX + depends on STM32_MII + +config STM32_MII_MCO + bool "Use MC0 as MII clock" + depends on STM32_STM32F10XX + ---help--- + Use MCO to clock the MII interface. Default: Use MC0 + +config STM32_MII_MCO1 + bool "Use MC01 as MII clock" + depends on (STM32_STM32F20XX || STM32_STM32F40XX) + ---help--- + Use MCO1 to clock the MII interface. Default: Use MC01 + config STM32_MII_MCO2 bool "Use MC02 as MII clock" - default n - depends on STM32_MII + depends on (STM32_STM32F20XX || STM32_STM32F40XX) ---help--- Use MCO2 to clock the MII interface. Default: Use MC01 +endchoice + config STM32_AUTONEG bool "Use autonegtiation" default y @@ -1643,11 +1662,6 @@ config STM32_RMII default y if !STM32_MII depends on STM32_ETHMAC -config STM32_MII_MCO1 - bool - default y if !STM32_MII_MCO2 - depends on STM32_MII - menu "USB Host Configuration" config STM32_OTGFS_RXFIFO_SIZE diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c index 57d4cc2d3..fb6dc69fd 100644 --- a/nuttx/arch/arm/src/stm32/stm32_eth.c +++ b/nuttx/arch/arm/src/stm32/stm32_eth.c @@ -2659,7 +2659,7 @@ static inline void stm32_ethgpioconfig(FAR struct stm32_ethmac_s *priv) /* Setup MCO pin for alternative usage */ -#if defined(CONFIG_STM32_RMII_MCO) +#if defined(CONFIG_STM32_MII_MCO) stm32_configgpio(GPIO_MCO); stm32_mcoconfig(BOARD_CFGR_MCO_SOURCE); #endif |