From 11719aa69e37addcdd96215953844966c32149d7 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 10 Aug 2013 18:01:23 -0600
Subject: SAMA5: Fix HSMCI race condition.  Now memory card interface is
 functional with DMA

---
 nuttx/configs/sam3u-ek/nsh/defconfig | 45 +++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 14 deletions(-)

(limited to 'nuttx/configs/sam3u-ek/nsh')

diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig
index 289c3417b..43b8295d9 100644
--- a/nuttx/configs/sam3u-ek/nsh/defconfig
+++ b/nuttx/configs/sam3u-ek/nsh/defconfig
@@ -73,10 +73,17 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_LPC31XX is not set
 # CONFIG_ARCH_CHIP_LPC43XX is not set
 # CONFIG_ARCH_CHIP_NUC1XX is not set
+# CONFIG_ARCH_CHIP_SAMA5 is not set
 CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_ARM7TDMI is not set
+# CONFIG_ARCH_ARM926EJS is not set
+# CONFIG_ARCH_ARM920T is not set
+# CONFIG_ARCH_CORTEXM0 is not set
 CONFIG_ARCH_CORTEXM3=y
+# CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXA5 is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="sam34"
 # CONFIG_ARMV7M_USEBASEPRI is not set
@@ -93,6 +100,10 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 # CONFIG_GPIO_IRQ is not set
+CONFIG_ARCH_HAVE_EXTNAND=y
+CONFIG_ARCH_HAVE_EXTNOR=y
+CONFIG_ARCH_HAVE_EXTSRAM0=y
+CONFIG_ARCH_HAVE_EXTSRAM1=y
 
 #
 # AT91SAM3/4 Configuration Options
@@ -162,26 +173,18 @@ CONFIG_SAM34_UART0=y
 # CONFIG_SAM34_WDT is not set
 # CONFIG_SAM34_HSMCI is not set
 
-#
-# AT91SAM3/4 USART Configuration
-#
-
-#
-# AT91SAM3/4 GPIO Interrupt Configuration
-#
-
 #
 # External Memory Configuration
 #
-CONFIG_ARCH_HAVE_EXTNAND=y
-CONFIG_ARCH_HAVE_EXTNOR=y
-CONFIG_ARCH_HAVE_EXTSRAM0=y
-CONFIG_ARCH_HAVE_EXTSRAM1=y
 # CONFIG_SAM34_EXTNAND is not set
 # CONFIG_SAM34_EXTNOR is not set
 # CONFIG_SAM34_EXTSRAM0 is not set
 # CONFIG_SAM34_EXTSRAM1 is not set
 
+#
+# AT91SAM3/4 GPIO Interrupt Configuration
+#
+
 #
 # Architecture Options
 #
@@ -204,8 +207,6 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
 #
 CONFIG_BOARD_LOOPSPERMSEC=8720
 # CONFIG_ARCH_CALIBRATION is not set
-CONFIG_RAM_START=0x20000000
-CONFIG_RAM_SIZE=32768
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 
@@ -218,6 +219,12 @@ CONFIG_BOOT_RUNFROMFLASH=y
 # CONFIG_BOOT_RUNFROMSDRAM is not set
 # CONFIG_BOOT_COPYTORAM is not set
 
+#
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_SIZE=32768
+
 #
 # Board Selection
 #
@@ -332,6 +339,10 @@ CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
 CONFIG_ARCH_HAVE_UART0=y
+
+#
+# USART Configuration
+#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_UART0_SERIAL_CONSOLE=y
@@ -577,6 +588,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
+# CONFIG_NSH_DISABLE_CMP is not set
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
@@ -693,3 +705,8 @@ CONFIG_READLINE_ECHO=y
 #
 # USB Monitor
 #
+
+#
+# Zmodem Commands
+#
+# CONFIG_SYSTEM_ZMODEM is not set
-- 
cgit v1.2.3