summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-12-29 07:01:36 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-12-29 07:01:36 -0600
commit8d4e470a77a1f538ad1fa7edd1b85bcc901aa664 (patch)
tree1f782d6db166a6ea2cb8f6d89a701c061193db74
parent69f8f1abc09249ebcb34ce8f092d0c2ad3ea92dc (diff)
downloadnuttx-8d4e470a77a1f538ad1fa7edd1b85bcc901aa664.tar.gz
nuttx-8d4e470a77a1f538ad1fa7edd1b85bcc901aa664.tar.bz2
nuttx-8d4e470a77a1f538ad1fa7edd1b85bcc901aa664.zip
STM32F429i-Disco USBMC configuration: SPI1 should not be enabled. It is not supported
-rw-r--r--nuttx/configs/stm32f429i-disco/src/stm32_spi.c3
-rw-r--r--nuttx/configs/stm32f429i-disco/usbmsc/defconfig9
2 files changed, 3 insertions, 9 deletions
diff --git a/nuttx/configs/stm32f429i-disco/src/stm32_spi.c b/nuttx/configs/stm32f429i-disco/src/stm32_spi.c
index 5eb95de85..2a640df93 100644
--- a/nuttx/configs/stm32f429i-disco/src/stm32_spi.c
+++ b/nuttx/configs/stm32f429i-disco/src/stm32_spi.c
@@ -311,6 +311,7 @@ int stm32_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
* Valid SPI device structure reference on success; a NULL on failure
*
******************************************************************************/
+
#ifdef CONFIG_STM32_SPI5
FAR struct spi_dev_s *stm32_spi5initialize(void)
{
@@ -322,4 +323,4 @@ FAR struct spi_dev_s *stm32_spi5initialize(void)
return g_spidev5;
}
#endif
-#endif /* CONFIG_STM32_SPI1 || CONFIG_STM32_SPI2 */
+#endif /* CONFIG_STM32_SPI1 || ... CONFIG_STM32_SPI5 */
diff --git a/nuttx/configs/stm32f429i-disco/usbmsc/defconfig b/nuttx/configs/stm32f429i-disco/usbmsc/defconfig
index 5f0347971..d06bc9cc2 100644
--- a/nuttx/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/nuttx/configs/stm32f429i-disco/usbmsc/defconfig
@@ -292,7 +292,7 @@ CONFIG_STM32_OTGHS=y
CONFIG_STM32_PWR=y
# CONFIG_STM32_RNG is not set
# CONFIG_STM32_SDIO is not set
-CONFIG_STM32_SPI1=y
+# CONFIG_STM32_SPI1 is not set
# CONFIG_STM32_SPI2 is not set
# CONFIG_STM32_SPI3 is not set
# CONFIG_STM32_SPI4 is not set
@@ -322,7 +322,6 @@ CONFIG_STM32_USART1=y
# CONFIG_STM32_UART8 is not set
# CONFIG_STM32_IWDG is not set
# CONFIG_STM32_WWDG is not set
-CONFIG_STM32_SPI=y
#
# Alternate Pin Mapping
@@ -348,12 +347,6 @@ CONFIG_STM32_USART=y
# CONFIG_STM32_USART_SINGLEWIRE is not set
#
-# SPI Configuration
-#
-# CONFIG_STM32_SPI_INTERRUPTS is not set
-# CONFIG_STM32_SPI_DMA is not set
-
-#
# USB FS Host Configuration
#