sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrections for SD card on Shenzhou board

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5183 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-09-24 18:57:38 +00:00
parent 6a4a4e96e4
commit aa9ba473ba
6 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configs/shenzhou/README.txt
View File

@ -2,8 +2,17 @@ README
======
This README discusses issues unique to NuttX configurations for the Shenzhou
development board from www.armjishu.com featuring the STMicro STM32F107VCT
MCU. On-board features:
IV development board from www.armjishu.com featuring the STMicro STM32F107VCT
MCU. As of this writing, there are five models of the Shenzhou board:
1. Shenzhou I (STM32F103RB)
2. Shenzhou II (STM32F103VC)
3. Shenzhou III (STM32F103ZE)
4. Shenzhou IV (STM32F107VC)
5. Shenzhou king ((STM32F103ZG, core board + IO expansion board)).
Support is currently provided for the Shenzhou IV only. Features of the
Shenzhou IV board include:
- STM32F107VCT
- 10/100M PHY (DM9161AEP)

10
configs/shenzhou/nsh/defconfig
View File

@ -233,7 +233,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
CONFIG_ARCH_HAVE_IRQBUTTONS=y
CONFIG_NSH_MMCSDMINOR=0
CONFIG_NSH_MMCSDSLOTNO=0
CONFIG_NSH_MMCSDSPIPORTNO=0
CONFIG_NSH_MMCSDSPIPORTNO=1
#
# Board-Specific Options
@ -315,7 +315,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
CONFIG_SPI=y
# CONFIG_SPI_OWNBUS is not set
CONFIG_SPI_EXCHANGE=y
CONFIG_SPI_CMDDATA=y
# CONFIG_SPI_CMDDATA is not set
CONFIG_RTC=y
# CONFIG_RTC_DATETIME is not set
# CONFIG_RTC_HIRES is not set
@ -388,7 +388,7 @@ CONFIG_NET_BUFSIZE=562
CONFIG_NET_TCP=y
CONFIG_NET_TCP_CONNS=40
CONFIG_NET_MAX_LISTENPORTS=40
# CONFIG_NET_TCP_READAHEAD_BUFSIZE=562
CONFIG_NET_TCP_READAHEAD_BUFSIZE=562
CONFIG_NET_NTCP_READAHEAD_BUFFERS=16
CONFIG_NET_TCP_RECVDELAY=0
CONFIG_NET_TCPBACKLOG=y
@ -401,7 +401,7 @@ CONFIG_NET_ICMP_PING=y
# CONFIG_NET_PINGADDRCONF is not set
# CONFIG_NET_IGMP is not set
CONFIG_NET_STATISTICS=y
# CONFIG_NET_RECEIVE_WINDOW=562
CONFIG_NET_RECEIVE_WINDOW=562
CONFIG_NET_ARPTAB_SIZE=16
# CONFIG_NET_ARP_IPIN is not set
@ -877,7 +877,7 @@ CONFIG_NSH_NESTDEPTH=3
# CONFIG_NSH_DISABLEBG is not set
CONFIG_NSH_CONSOLE=y
# CONFIG_NSH_CONDEV is not set
# CONFIG_NSH_ARCHINIT is not set
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_TELNET=y
CONFIG_NSH_TELNETD_PORT=23
CONFIG_NSH_TELNETD_DAEMONPRIO=100

2
configs/shenzhou/src/shenzhou-internal.h
View File

@ -230,7 +230,7 @@
* PN NAME SIGNAL NOTES
* -- ---- -------------- -------------------------------------------------------------------
* 53 PB14 SD_CD Active low: Pulled high
* 58 PD11 SD_CS
* 58 PD11 SD_CS Active low: Pulled high
*/
#define GPIO_SD_CD (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_EXTI|GPIO_PORTB|GPIO_PIN14)

2
configs/shenzhou/src/up_mmcsd.c
View File

@ -67,7 +67,7 @@
/* Can't support MMC/SD features if mountpoints are disabled */
#ifndef CONFIG_DISABLE_MOUNTPOINT
#ifdef CONFIG_DISABLE_MOUNTPOINT
# undef HAVE_MMCSD
#endif

4
configs/shenzhou/src/up_nsh.c
View File

@ -116,7 +116,7 @@
/* Can't support W25 features if mountpoints are disabled */
#if defined(CONFIG_DISABLE_MOUNTPOINT)
#ifdef CONFIG_DISABLE_MOUNTPOINT
# undef HAVE_W25
#endif
@ -194,7 +194,7 @@ int nsh_archinitialize(void)
/* Initialize the SPI-based MMC/SD slot */
#ifdef HAVE_MMCSD
ret = stm32_sdinitialze(CONFIG_NSH_MMCSDMINOR);
ret = stm32_sdinitialize(CONFIG_NSH_MMCSDMINOR);
if (ret < 0)
{
message("nsh_archinitialize: Failed to initialize MMC/SD slot %d: %d\n",

19
configs/shenzhou/src/up_spi.c
View File

@ -60,18 +60,18 @@
/* Enables debug output from this file (needs CONFIG_DEBUG too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_SPI
#endif
#ifdef SPI_DEBUG
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
# ifdef SPI_VERBOSE
# ifdef CONFIG_DEBUG_VERBOSE
# define spivdbg lldbg
# else
# define spivdbg(x...)
# endif
#else
# undef SPI_VERBOSE
# define spidbg(x...)
# define spivdbg(x...)
#endif
@ -103,15 +103,16 @@ void weak_function stm32_spiinitialize(void)
/* SPI1 connects to the SD CARD and to the SPI FLASH */
#ifdef CONFIG_STM32_SPI1
stm32_configgpio(GPIO_SD_CS);
stm32_configgpio(GPIO_FLASH_CS);
stm32_configgpio(GPIO_SD_CS); /* SD card chip select */
stm32_configgpio(GPIO_SD_CD); /* SD card detect */
stm32_configgpio(GPIO_FLASH_CS); /* FLASH chip select */
#endif
/* SPI3 connects to TFT LCD and the RF24L01 2.4G wireless module */
#ifdef CONFIG_STM32_SPI3
stm32_configgpio(GPIO_LCD_CS);
stm32_configgpio(GPIO_WIRELESS_CS);
stm32_configgpio(GPIO_LCD_CS); /* LCD chip select */
stm32_configgpio(GPIO_WIRELESS_CS); /* Wireless chip select */
#endif
}