summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-10-11 13:03:07 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-10-11 13:03:07 -0600
commit1a639251dbf599c80357c0c4661be5d0068cc0b3 (patch)
tree996022ed64eaa5eb2c06d8c8eb017dc6fe62feed
parent39fbe13843fe8d2594c24bb191b9a2ca18c7ca5c (diff)
downloadpx4-nuttx-1a639251dbf599c80357c0c4661be5d0068cc0b3.tar.gz
px4-nuttx-1a639251dbf599c80357c0c4661be5d0068cc0b3.tar.bz2
px4-nuttx-1a639251dbf599c80357c0c4661be5d0068cc0b3.zip
Enable TCP write buffering in one SAM4E-EK configuration
-rw-r--r--nuttx/configs/sam4e-ek/README.txt6
-rw-r--r--nuttx/configs/sam4e-ek/nsh/defconfig20
2 files changed, 21 insertions, 5 deletions
diff --git a/nuttx/configs/sam4e-ek/README.txt b/nuttx/configs/sam4e-ek/README.txt
index d68e53b7c..edde6027c 100644
--- a/nuttx/configs/sam4e-ek/README.txt
+++ b/nuttx/configs/sam4e-ek/README.txt
@@ -1628,5 +1628,7 @@ Configurations
$ cd ~/nuttx-git/nuttx
$ make
- STATUS: 2014-8-20. I have seen the demo work well but it is not
- thoroughly exercised.
+ STATUS:
+ 2014-08-20. I have seen the demo work well but it is not thoroughly
+ exercised. I suspect some touchscreen issues.
+ 2014-10-11. Today's build crashes in nxwm_main on startup.
diff --git a/nuttx/configs/sam4e-ek/nsh/defconfig b/nuttx/configs/sam4e-ek/nsh/defconfig
index 500528b80..09f96bf7e 100644
--- a/nuttx/configs/sam4e-ek/nsh/defconfig
+++ b/nuttx/configs/sam4e-ek/nsh/defconfig
@@ -12,6 +12,10 @@ CONFIG_HOST_LINUX=y
# CONFIG_HOST_OSX is not set
# CONFIG_HOST_WINDOWS is not set
# CONFIG_HOST_OTHER is not set
+# CONFIG_WINDOWS_NATIVE is not set
+# CONFIG_WINDOWS_CYGWIN is not set
+# CONFIG_WINDOWS_MSYS is not set
+# CONFIG_WINDOWS_OTHER is not set
#
# Build Configuration
@@ -105,10 +109,16 @@ CONFIG_ARCH_CHIP="sam34"
#
# ARMV7M Configuration Options
#
+# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
CONFIG_ARCH_HAVE_EXTNAND=y
CONFIG_ARCH_HAVE_EXTNOR=y
CONFIG_ARCH_HAVE_EXTSRAM0=y
@@ -360,6 +370,7 @@ CONFIG_PREALLOC_TIMERS=4
#
# Tasks and Scheduling
#
+# CONFIG_INIT_NONE is not set
CONFIG_INIT_ENTRYPOINT=y
# CONFIG_INIT_FILEPATH is not set
CONFIG_USER_ENTRYPOINT="nsh_main"
@@ -634,10 +645,10 @@ CONFIG_NET_TCP=y
CONFIG_NET_TCP_CONNS=16
CONFIG_NET_MAX_LISTENPORTS=16
CONFIG_NET_TCP_READAHEAD=y
-# CONFIG_NET_TCP_WRITE_BUFFERS is not set
+CONFIG_NET_TCP_WRITE_BUFFERS=y
+CONFIG_NET_TCP_NWRBCHAINS=8
CONFIG_NET_TCP_RECVDELAY=0
CONFIG_NET_TCPBACKLOG=y
-# CONFIG_NET_TCP_SPLIT is not set
# CONFIG_NET_SENDFILE is not set
#
@@ -677,6 +688,7 @@ CONFIG_NET_IOB=y
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_BUFSIZE=196
CONFIG_IOB_NCHAINS=8
+CONFIG_IOB_THROTTLE=8
# CONFIG_NET_ARCH_INCR32 is not set
# CONFIG_NET_ARCH_CHKSUM is not set
# CONFIG_NET_STATISTICS is not set
@@ -704,6 +716,8 @@ CONFIG_NET_ETHERNET=y
# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
CONFIG_FS_READABLE=y
CONFIG_FS_WRITABLE=y
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
# CONFIG_FS_RAMMAP is not set
CONFIG_FS_FAT=y
CONFIG_FAT_LCNAMES=y
@@ -721,7 +735,6 @@ CONFIG_FAT_MAXFNAME=32
#
# System Logging
#
-
# CONFIG_SYSLOG is not set
#
@@ -896,6 +909,7 @@ CONFIG_NETUTILS_TFTPC=y
CONFIG_NETUTILS_NETLIB=y
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
+CONFIG_WEBCLIENT_TIMEOUT=10
# CONFIG_NETUTILS_WEBSERVER is not set
# CONFIG_NETUTILS_NTPCLIENT is not set
# CONFIG_NETUTILS_DISCOVER is not set