summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-01-28 12:47:03 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-01-28 12:47:03 -0600
commit6615beabb799e4496daf19b1fd9a7af2325fdda2 (patch)
treeb31b592db45e176b509379ca3d40e370c499b0c9
parent36edcb9d6fa78ed11b71814ef999973759453c37 (diff)
downloadnuttx-6615beabb799e4496daf19b1fd9a7af2325fdda2.tar.gz
nuttx-6615beabb799e4496daf19b1fd9a7af2325fdda2.tar.bz2
nuttx-6615beabb799e4496daf19b1fd9a7af2325fdda2.zip
Refresh configurations
-rw-r--r--nuttx/configs/dk-tm4c129x/ipv6/defconfig5
-rw-r--r--nuttx/configs/dk-tm4c129x/nsh/defconfig4
2 files changed, 5 insertions, 4 deletions
diff --git a/nuttx/configs/dk-tm4c129x/ipv6/defconfig b/nuttx/configs/dk-tm4c129x/ipv6/defconfig
index a33a285ac..5e374f2d0 100644
--- a/nuttx/configs/dk-tm4c129x/ipv6/defconfig
+++ b/nuttx/configs/dk-tm4c129x/ipv6/defconfig
@@ -46,8 +46,9 @@ CONFIG_RAW_BINARY=y
# Debug Options
#
# CONFIG_DEBUG is not set
-CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
# CONFIG_DEBUG_SYMBOLS is not set
CONFIG_ARCH_HAVE_CUSTOMOPT=y
# CONFIG_DEBUG_NOOPT is not set
@@ -235,8 +236,6 @@ CONFIG_TIVA_I2C_TIMEOTICKS=500
# Tiva Ethernet Configuration
#
CONFIG_TIVA_PHY_INTERNAL=y
-# CONFIG_TIVA_PHY_MII is not set
-# CONFIG_TIVA_PHY_RMII is not set
CONFIG_TIVA_AUTONEG=y
CONFIG_TIVA_PHY_INTERRUPTS=y
CONFIG_TIVA_EMAC_NRXDESC=8
diff --git a/nuttx/configs/dk-tm4c129x/nsh/defconfig b/nuttx/configs/dk-tm4c129x/nsh/defconfig
index 0fa4f5e91..571a9ade4 100644
--- a/nuttx/configs/dk-tm4c129x/nsh/defconfig
+++ b/nuttx/configs/dk-tm4c129x/nsh/defconfig
@@ -46,8 +46,9 @@ CONFIG_RAW_BINARY=y
# Debug Options
#
# CONFIG_DEBUG is not set
-CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
# CONFIG_DEBUG_SYMBOLS is not set
CONFIG_ARCH_HAVE_CUSTOMOPT=y
# CONFIG_DEBUG_NOOPT is not set
@@ -583,6 +584,7 @@ CONFIG_NETDEV_PHY_IOCTL=y
# Internet Protocol Selection
#
CONFIG_NET_IPv4=y
+# CONFIG_NET_IPv6 is not set
#
# Socket Support