summaryrefslogtreecommitdiff
path: root/nuttx/configs/stm3220g-eval
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-07-12 16:11:43 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-07-12 16:11:43 +0000
commitf6e415d0f9b52eba04a54e57893c0e3a99a6ad5f (patch)
tree0edc95b97d72ab0e52e0721919ec0822a1a9022f /nuttx/configs/stm3220g-eval
parent7769a6798482804a666bcd734b511795e53b33ff (diff)
downloadpx4-nuttx-f6e415d0f9b52eba04a54e57893c0e3a99a6ad5f.tar.gz
px4-nuttx-f6e415d0f9b52eba04a54e57893c0e3a99a6ad5f.tar.bz2
px4-nuttx-f6e415d0f9b52eba04a54e57893c0e3a99a6ad5f.zip
Get the STM3220G-EVAL nsh2 configuration to compile
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4936 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm3220g-eval')
-rw-r--r--nuttx/configs/stm3220g-eval/README.txt4
-rw-r--r--nuttx/configs/stm3220g-eval/include/board.h12
-rw-r--r--nuttx/configs/stm3220g-eval/nsh2/defconfig1
3 files changed, 15 insertions, 2 deletions
diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt
index bc85f7ff0..665034254 100644
--- a/nuttx/configs/stm3220g-eval/README.txt
+++ b/nuttx/configs/stm3220g-eval/README.txt
@@ -888,7 +888,9 @@ Where <subdir> is one of the following:
Since RS-232 and SDIO use the same pins (one controlled by JP22), RS232
and SDIO cannot be used concurrently.
- 3. This configuration requires that jumper JP22 be set to enable SDIO operation.
+ 3. This configuration requires that jumper JP22 be set to enable SDIO
+ operation. To enable MicroSD Card, which shares same I/Os with RS-232,
+ JP22 is not fitted.
4. In order to use SDIO without overruns, DMA must be used.
diff --git a/nuttx/configs/stm3220g-eval/include/board.h b/nuttx/configs/stm3220g-eval/include/board.h
index f4fd918f1..bd0a059f7 100644
--- a/nuttx/configs/stm3220g-eval/include/board.h
+++ b/nuttx/configs/stm3220g-eval/include/board.h
@@ -265,6 +265,7 @@
* - PC11 is MicroSDCard_D3 & RS232/IrDA_RX (JP22 open)
* - PC10 is MicroSDCard_D2 & RSS232/IrDA_TX
*/
+
#ifdef CONFIG_STM32_USART3
# define GPIO_USART3_RX GPIO_USART3_RX_2
# define GPIO_USART3_TX GPIO_USART3_TX_2
@@ -422,6 +423,17 @@
#define GPIO_I2C1_SCL GPIO_I2C1_SCL_1
#define GPIO_I2C1_SDA GPIO_I2C1_SDA_2
+/* DMA Channl/Stream Selections *****************************************************/
+/* Stream selections are arbitrary for now but might become important in the future
+ * is we set aside more DMA channels/streams.
+ *
+ * SDIO DMA
+ * DMAMAP_SDIO_1 = Channel 4, Stream 3
+ * DMAMAP_SDIO_2 = Channel 4, Stream 6
+ */
+
+#define DMAMAP_SDIO DMAMAP_SDIO_1
+
/************************************************************************************
* Public Data
************************************************************************************/
diff --git a/nuttx/configs/stm3220g-eval/nsh2/defconfig b/nuttx/configs/stm3220g-eval/nsh2/defconfig
index 7f5a7fd87..6ea3f18a0 100644
--- a/nuttx/configs/stm3220g-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3220g-eval/nsh2/defconfig
@@ -812,7 +812,6 @@ CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_MMCSUPPORT=n
CONFIG_MMCSD_HAVECARDDETECT=n
-
#
# TCP/IP and UDP support via uIP
#