From 3c0354aba686437efea7d0b7bc4fc8fc3475e9ef Mon Sep 17 00:00:00 2001 From: Jiuzhu Dong Date: Mon, 22 Feb 2021 17:50:41 +0800 Subject: [PATCH] net/socket: delete config CONFIG_NSOCKET_DESCRIPTORS N/A Change-Id: I7d10ec460c351e4fbcdc19b3a8284dcb77073722 Signed-off-by: Jiuzhu Dong --- Documentation/applications/nsh/config.rst | 2 -- .../arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig | 3 +-- .../lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig | 3 +-- .../arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig | 3 +-- .../olimex-lpc1766stk/configs/slip-httpd/defconfig | 3 +-- .../olimex-lpc1766stk/configs/thttpd-binfs/defconfig | 3 +-- .../olimex-lpc1766stk/configs/thttpd-nxflat/defconfig | 3 +-- boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig | 3 +-- boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig | 3 +-- boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig | 3 +-- boards/arm/stm32/cloudctrl/configs/nsh/defconfig | 3 +-- boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig | 3 +-- boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig | 3 +-- boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig | 3 +-- boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig | 3 +-- boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig | 3 +-- boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig | 3 +-- boards/arm/stm32/shenzhou/configs/nsh/defconfig | 3 +-- boards/arm/stm32/shenzhou/configs/nxwm/defconfig | 3 +-- boards/arm/stm32/shenzhou/configs/thttpd/defconfig | 3 +-- boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig | 3 +-- boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig | 3 +-- boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig | 3 +-- boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig | 3 +-- boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig | 3 +-- boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig | 3 +-- boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig | 3 +-- boards/arm/stm32/stm3240g-eval/configs/discover/defconfig | 3 +-- boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig | 3 +-- boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig | 3 +-- boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig | 3 +-- boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig | 3 +-- boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig | 3 +-- boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig | 3 +-- boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig | 3 +-- boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig | 3 +-- boards/arm/stm32/viewtool-stm32f107/README.txt | 1 - boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig | 3 +-- .../arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig | 3 +-- boards/arm/str71x/olimex-strp711/configs/nettest/defconfig | 3 +-- boards/arm/tiva/eagle100/configs/httpd/defconfig | 3 +-- boards/arm/tiva/eagle100/configs/thttpd/defconfig | 3 +-- boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig | 3 +-- boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig | 3 +-- boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig | 3 +-- boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig | 3 +-- boards/sim/sim/sim/configs/tcpblaster/defconfig | 3 +-- boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig | 3 +-- 48 files changed, 46 insertions(+), 95 deletions(-) diff --git a/Documentation/applications/nsh/config.rst b/Documentation/applications/nsh/config.rst index fd46ce6af2..55b39c2bfc 100644 --- a/Documentation/applications/nsh/config.rst +++ b/Documentation/applications/nsh/config.rst @@ -420,7 +420,6 @@ configuration settings that apply: Configuration Description ====================================== ================================ ``CONFIG_NET=y`` Of course, networking must be enabled. -``CONFIG_NSOCKET_DESCRIPTORS`` And, of course, you must allocate some socket descriptors. ``CONFIG_NET_TCP=y`` TCP/IP support is required for telnet (as well as various other TCP-related configuration settings). ``CONFIG_NSH_IOBUFFER_SIZE`` Determines the size of the I/O buffer to use for sending/ receiving @@ -443,7 +442,6 @@ required. These include: Configuration Description ============================================== ============================================================ ``CONFIG_NET=y`` Of course, networking must be enabled. -``CONFIG_NSOCKET_DESCRIPTORS`` And, of course, you must allocate some socket descriptors. ``CONFIG_NET_UDP=y`` UDP support is required for DHCP (as well as various other UDP-related configuration settings). ``CONFIG_NET_BROADCAST=y`` UDP broadcast support is needed. diff --git a/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig index fc205aaae9..82ac6fc501 100644 --- a/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig +++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig @@ -49,8 +49,7 @@ CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=12 CONFIG_NET_TCP_WRITE_BUFFERS=y -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=12 +CONFIG_NFILE_DESCRIPTORS=20 CONFIG_NUNGET_CHARS=0 CONFIG_PIPES=y CONFIG_RAM_SIZE=32768 diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig index 407a2c180f..87207ae8c6 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig @@ -37,8 +37,7 @@ CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=16 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y CONFIG_PIPES=y diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig index ccde7ee9da..d4463fc4b9 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig @@ -50,7 +50,7 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_GET=y @@ -59,7 +59,6 @@ CONFIG_NSH_DISABLE_WGET=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NXFLAT=y CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig index f847a07aa3..955972a01f 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig @@ -36,8 +36,7 @@ CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=16 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y CONFIG_PIPES=y diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig index 475dcd42ff..f5f82ea333 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig @@ -41,8 +41,7 @@ CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=16 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NUNGET_CHARS=0 CONFIG_PIPES=y CONFIG_RAM_SIZE=32768 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig index d5af94140b..cd81cda103 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig @@ -38,8 +38,7 @@ CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=16 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y CONFIG_PIPES=y diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig index 680195f4fb..2b6926ea3d 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig @@ -36,8 +36,7 @@ CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=16 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y CONFIG_RAM_SIZE=32768 diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig index 5d897a1911..7fdc53325d 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig @@ -41,8 +41,7 @@ CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=16 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y CONFIG_PIPES=y diff --git a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig index 4b14f21f3f..d9557dcbd9 100644 --- a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig +++ b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig @@ -62,13 +62,12 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x10000000 diff --git a/boards/arm/stm32/cloudctrl/configs/nsh/defconfig b/boards/arm/stm32/cloudctrl/configs/nsh/defconfig index eaec2988ba..3185b96390 100644 --- a/boards/arm/stm32/cloudctrl/configs/nsh/defconfig +++ b/boards/arm/stm32/cloudctrl/configs/nsh/defconfig @@ -43,14 +43,13 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig b/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig index 70279a47b8..a410090d80 100644 --- a/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig +++ b/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig @@ -50,13 +50,12 @@ CONFIG_NET_TCP=y CONFIG_NET_TCP_CONNS=16 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig index bacdf589c9..c30dd2c64b 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig @@ -42,8 +42,7 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig index f20a3bcdd7..4519aaba93 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig @@ -45,9 +45,8 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig index 724d488e4b..d4437a8087 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig @@ -48,8 +48,7 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig index d716df7044..77a7ead28a 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig @@ -44,8 +44,7 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig index 23a7cde9e0..c3cf1ac339 100644 --- a/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig @@ -40,10 +40,9 @@ CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_TCP=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/shenzhou/configs/nsh/defconfig b/boards/arm/stm32/shenzhou/configs/nsh/defconfig index 9bb03b7a06..e0eedf94c9 100644 --- a/boards/arm/stm32/shenzhou/configs/nsh/defconfig +++ b/boards/arm/stm32/shenzhou/configs/nsh/defconfig @@ -42,14 +42,13 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/shenzhou/configs/nxwm/defconfig b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig index 424644cc0a..6637f75314 100644 --- a/boards/arm/stm32/shenzhou/configs/nxwm/defconfig +++ b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig @@ -54,7 +54,7 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=12 +CONFIG_NFILE_DESCRIPTORS=28 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LIBRARY=y @@ -62,7 +62,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=1596 CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=1596 -CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NX=y CONFIG_NXFONT_SANS22X29B=y CONFIG_NXFONT_SANS23X27=y diff --git a/boards/arm/stm32/shenzhou/configs/thttpd/defconfig b/boards/arm/stm32/shenzhou/configs/thttpd/defconfig index b02a56b979..a5dbb9441a 100644 --- a/boards/arm/stm32/shenzhou/configs/thttpd/defconfig +++ b/boards/arm/stm32/shenzhou/configs/thttpd/defconfig @@ -49,13 +49,12 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NXFLAT=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 diff --git a/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig b/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig index 27f7bce09b..9bc0dbb33b 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig @@ -35,8 +35,7 @@ CONFIG_NET_ICMP=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NUNGET_CHARS=0 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig index e803fa0a13..d42b46311b 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig @@ -34,8 +34,7 @@ CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCP_CONNS=40 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NUNGET_CHARS=0 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig index a7e2088935..230bb8f572 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig @@ -45,10 +45,9 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig index 249dae954a..cc62c36f3e 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig @@ -55,13 +55,12 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAMLOG=y CONFIG_RAMLOG_SYSLOG=y diff --git a/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig index c3aaf5fd6a..1b950f590a 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig @@ -54,12 +54,11 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=12 +CONFIG_NFILE_DESCRIPTORS=22 CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_NX=y CONFIG_NXFONT_SANS22X29B=y CONFIG_NXFONT_SANS23X27=y diff --git a/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig index 8f8237ae61..b6cfd0b82a 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig @@ -37,8 +37,7 @@ CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCP_CONNS=40 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NUNGET_CHARS=0 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig b/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig index a75c0194dd..9930da5d93 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig @@ -36,8 +36,7 @@ CONFIG_NET_ICMP=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NUNGET_CHARS=0 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig b/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig index 89b115b941..a6ee50d509 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig @@ -44,8 +44,7 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig index 25c89ee0b1..c778bf15bf 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig @@ -36,8 +36,7 @@ CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCP_CONNS=40 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NUNGET_CHARS=0 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig index fcb50b7e29..ff8d0d3da5 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig @@ -49,12 +49,11 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig index 066104752a..15dde9f106 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig @@ -56,13 +56,12 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAMLOG=y CONFIG_RAMLOG_SYSLOG=y diff --git a/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig index 9f5812fcbc..1c1c286b40 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig @@ -58,13 +58,12 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=12 +CONFIG_NFILE_DESCRIPTORS=22 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y CONFIG_NXTERM=y diff --git a/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig index b48e596b6d..2eef508827 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig @@ -54,12 +54,11 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=12 +CONFIG_NFILE_DESCRIPTORS=22 CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_NX=y CONFIG_NXFONT_SANS22X29B=y CONFIG_NXFONT_SANS23X27=y diff --git a/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig index 05c629bc20..63b2093fe0 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig @@ -38,8 +38,7 @@ CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCP_CONNS=40 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NUNGET_CHARS=0 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig index 2805840688..3b4f56977c 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig @@ -45,12 +45,11 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig b/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig index 36aa2e1226..0c1440fcfd 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig @@ -43,8 +43,7 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/viewtool-stm32f107/README.txt b/boards/arm/stm32/viewtool-stm32f107/README.txt index fca2f73e9f..6a443813e8 100644 --- a/boards/arm/stm32/viewtool-stm32f107/README.txt +++ b/boards/arm/stm32/viewtool-stm32f107/README.txt @@ -370,7 +370,6 @@ ViewTool DP83848 Ethernet Module CONFIG_NSH_NOMAC=y Networking (recommended/typical) - CONFIG_NSOCKET_DESCRIPTORS=10 : Socket-related CONFIG_NET_SOCKOPTS=y CONFIG_NET_ETH_PKTSIZE=650 : Maximum packet size diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig index ff503e8a1a..fa92fea26b 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig @@ -47,11 +47,10 @@ CONFIG_NET_TCP=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_TCP_WRITE_BUFFERS=y CONFIG_NET_UDP=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig index eb3706ea6b..f322cec888 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig @@ -41,11 +41,10 @@ CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_TCP_WRITE_BUFFERS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig index 456b5b59b9..6b17f70c80 100644 --- a/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig +++ b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig @@ -31,8 +31,7 @@ CONFIG_NET_MAX_LISTENPORTS=8 CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=16 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/tiva/eagle100/configs/httpd/defconfig b/boards/arm/tiva/eagle100/configs/httpd/defconfig index 258d3c3c87..54726dbf76 100644 --- a/boards/arm/tiva/eagle100/configs/httpd/defconfig +++ b/boards/arm/tiva/eagle100/configs/httpd/defconfig @@ -31,8 +31,7 @@ CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=16 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NUNGET_CHARS=0 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/tiva/eagle100/configs/thttpd/defconfig b/boards/arm/tiva/eagle100/configs/thttpd/defconfig index b7669fefdd..1a5d6b069b 100644 --- a/boards/arm/tiva/eagle100/configs/thttpd/defconfig +++ b/boards/arm/tiva/eagle100/configs/thttpd/defconfig @@ -31,8 +31,7 @@ CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=16 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y CONFIG_PIPES=y diff --git a/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig b/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig index ade9380319..dcc6db95f2 100644 --- a/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig +++ b/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig @@ -36,13 +36,12 @@ CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=48 CONFIG_NFS=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=40 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=98304 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig index dd385ee759..3584630933 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig @@ -41,8 +41,7 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=16 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 diff --git a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig index 495fe07479..3542fcfdfd 100644 --- a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig +++ b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig @@ -48,13 +48,12 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PIC32MX_DEBUGGER=2 CONFIG_PIC32MX_ETHERNET=y CONFIG_PIC32MX_ETH_NRXDESC=7 diff --git a/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig b/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig index 42ef345b15..78a8452fa9 100644 --- a/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig +++ b/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig @@ -50,7 +50,7 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_IFUPDOWN=y @@ -58,7 +58,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_READLINE=y -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PIC32MX_DEBUGGER=2 CONFIG_PIC32MX_ETHERNET=y CONFIG_PIC32MX_ETH_NRXDESC=7 diff --git a/boards/sim/sim/sim/configs/tcpblaster/defconfig b/boards/sim/sim/sim/configs/tcpblaster/defconfig index 89910cabf4..d8ca875000 100644 --- a/boards/sim/sim/sim/configs/tcpblaster/defconfig +++ b/boards/sim/sim/sim/configs/tcpblaster/defconfig @@ -80,13 +80,12 @@ CONFIG_NET_TUN_PKTSIZE=1500 CONFIG_NET_UDP=y CONFIG_NET_UDP_BINDTODEVICE=y CONFIG_NET_UDP_WRITE_BUFFERS=y -CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_DESCRIPTORS=18 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILE_APPS=y CONFIG_NSH_READLINE=y CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=4096 -CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 CONFIG_PSEUDOFS_SOFTLINKS=y diff --git a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig index 448c3e2341..992316e9a2 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig @@ -35,8 +35,7 @@ CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NSOCKET_DESCRIPTORS=16 +CONFIG_NFILE_DESCRIPTORS=24 CONFIG_NUNGET_CHARS=0 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200