summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-09-18 13:52:37 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-09-18 13:52:37 -0600
commit3158f651f89d303d6ce1c1951e5c7cf10df53a58 (patch)
tree2e45177c348316a26521ad7b3e6ff4b12d94601b
parent9a6c0f87c3ea60b575c398dc1f03b0f9c242a117 (diff)
downloadnuttx-3158f651f89d303d6ce1c1951e5c7cf10df53a58.tar.gz
nuttx-3158f651f89d303d6ce1c1951e5c7cf10df53a58.tar.bz2
nuttx-3158f651f89d303d6ce1c1951e5c7cf10df53a58.zip
Ran make oldconfig on the SAMA5 NSH configuration
-rw-r--r--nuttx/configs/sama5d3x-ek/nsh/defconfig8
1 files changed, 3 insertions, 5 deletions
diff --git a/nuttx/configs/sama5d3x-ek/nsh/defconfig b/nuttx/configs/sama5d3x-ek/nsh/defconfig
index d3b30de71..67e9e2357 100644
--- a/nuttx/configs/sama5d3x-ek/nsh/defconfig
+++ b/nuttx/configs/sama5d3x-ek/nsh/defconfig
@@ -88,6 +88,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
# CONFIG_ARCH_CORTEXM3 is not set
# CONFIG_ARCH_CORTEXM4 is not set
CONFIG_ARCH_CORTEXA5=y
+# CONFIG_ARCH_CORTEXA8 is not set
CONFIG_ARCH_FAMILY="armv7-a"
CONFIG_ARCH_CHIP="sama5"
CONFIG_ARCH_HAVE_FPU=y
@@ -148,7 +149,6 @@ CONFIG_SAMA5_USART1=y
# CONFIG_SAMA5_UHPHS is not set
# CONFIG_SAMA5_UDPHS is not set
# CONFIG_SAMA5_GMAC is not set
-# CONFIG_SAMA5_EMAC is not set
# CONFIG_SAMA5_LCDC is not set
# CONFIG_SAMA5_ISI is not set
# CONFIG_SAMA5_SSC0 is not set
@@ -163,10 +163,8 @@ CONFIG_SAMA5_USART1=y
# CONFIG_SAMA5_FUSE is not set
# CONFIG_SAMA5_MPDDRC is not set
# CONFIG_SAMA5_PIO_IRQ is not set
-
-#
-# SPI device driver options
-#
+CONFIG_SAMA5_HAVE_GMAC=y
+# CONFIG_SAMA5_HAVE_EMAC is not set
#
# External Memory Configuration