You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2022/11/07 06:24:34 UTC
[incubator-nuttx] branch master updated: boards: Update telnetd related config after apps/nshlib change
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 4e43fef5cd boards: Update telnetd related config after apps/nshlib change
4e43fef5cd is described below
commit 4e43fef5cd54006087022afedf4eb5bb6f7e7bf4
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Oct 18 02:18:52 2022 +0800
boards: Update telnetd related config after apps/nshlib change
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
Documentation/applications/nsh/commands.rst | 4 ++--
Documentation/applications/nsh/config.rst | 23 +++++++++++-----------
.../arm/cxd56xx/spresense/configs/rndis/defconfig | 2 --
.../cxd56xx/spresense/configs/rndis_smp/defconfig | 2 --
.../arm/imx6/sabre-6quad/configs/netknsh/defconfig | 4 ----
.../imx6/sabre-6quad/configs/netknsh_smp/defconfig | 4 ----
.../lc823450/lc823450-xgevk/configs/bt/defconfig | 1 -
.../lc823450-xgevk/configs/rndis/defconfig | 1 -
.../arm/phy62xx/phy6222/configs/phy_sbp/defconfig | 1 -
boards/arm/samv7/same70-xplained/README.txt | 4 ++--
.../samv7/same70-xplained/configs/pysim/defconfig | 4 ++--
boards/arm/samv7/samv71-xult/README.txt | 4 ++--
.../samv71-xult/configs/mrf24j40-starhub/defconfig | 1 -
boards/arm/stm32/shenzhou/configs/nxwm/defconfig | 4 ++--
.../stm32f334-disco/configs/buckboost/defconfig | 1 -
.../stm32/stm32f4discovery/configs/rndis/defconfig | 1 -
.../stm32h7/nucleo-h743zi2/configs/jumbo/defconfig | 4 ++--
boards/arm/tiva/dk-tm4c129x/README.txt | 4 ++--
boards/arm/tiva/tm4c1294-launchpad/README.txt | 4 ++--
boards/arm/tiva/tm4c129e-launchpad/README.txt | 4 ++--
.../risc-v/mpfs/icicle/configs/opensbi/defconfig | 1 -
boards/sparc/bm3803/xx3803/configs/nsh/defconfig | 1 -
.../esp32/esp32-devkitc/configs/wapi_smp/defconfig | 1 -
23 files changed, 29 insertions(+), 51 deletions(-)
diff --git a/Documentation/applications/nsh/commands.rst b/Documentation/applications/nsh/commands.rst
index 6df8414012..60537e36ae 100644
--- a/Documentation/applications/nsh/commands.rst
+++ b/Documentation/applications/nsh/commands.rst
@@ -1547,8 +1547,8 @@ The Telnet daemon may be started either programmatically by calling
``nsh_telnetstart()`` or it may be started from the NSH command line
using this ``telnetd`` command.
-Normally this command would be suppressed with
-``CONFIG_NSH_DISABLE_TELNETD`` because the Telnet daemon is
+Normally this command would be suppressed without
+``CONFIG_SYSTEM_TELNETD`` because the Telnet daemon is
automatically started in ``nsh_main.c``. The exception is when
``CONFIG_NSH_NETLOCAL`` is selected. In that case, the network is not
enabled at initialization but rather must be enabled from the NSH
diff --git a/Documentation/applications/nsh/config.rst b/Documentation/applications/nsh/config.rst
index 8195ede4bf..5470f3adaf 100644
--- a/Documentation/applications/nsh/config.rst
+++ b/Documentation/applications/nsh/config.rst
@@ -128,7 +128,8 @@ Command Depends on Configuration Can Be Disabl
:ref:`cmdsleep` . ``CONFIG_NSH_DISABLE_SLEEP``
``cmdsource`` ``CONFIG_FILE_STREAM`` && ``CONFIG_NSH_DISABLE_SOURCE``
! ``CONFIG_NSH_DISABLESCRIPT``
-:ref:`cmdtelnetd` ``CONFIG_NSH_TELNET`` ``CONFIG_NSH_DISABLE_TELNETD``
+:ref:`cmdtelnetd` ``CONFIG_NSH_TELNET`` &&
+ ``CONFIG_SYSTEM_TELNETD``
:ref:`cmdtest` ! ``CONFIG_NSH_DISABLESCRIPT`` ``CONFIG_NSH_DISABLE_TEST``
:ref:`cmdtime` . ``CONFIG_NSH_DISABLE_TIME``
:ref:`cmdtruncate` ! ``CONFIG_DISABLE_MOUNTPOINT`` ``CONFIG_NSH_DISABLE_TRUNCATE``
@@ -402,15 +403,15 @@ CMD w/o ``CONFIG_NSH_VARS`` w/``CONFIG_NSH_VARS``
If Telnet is selected for the NSH console, then we must configure the
resources used by the Telnet daemon and by the Telnet clients.
-====================================== ================================
-Configuration Description
-====================================== ================================
-``CONFIG_NSH_TELNETD_PORT`` The telnet daemon will listen on this TCP port number for connections. Default: 23
-``CONFIG_NSH_TELNETD_DAEMONPRIO`` Priority of the Telnet daemon. Default: ``SCHED_PRIORITY_DEFAULT``
-``CONFIG_NSH_TELNETD_DAEMONSTACKSIZE`` Stack size allocated for the Telnet daemon. Default: 2048
-``CONFIG_NSH_TELNETD_CLIENTPRIO`` Priority of the Telnet client. Default: ``SCHED_PRIORITY_DEFAULT``
-``CONFIG_NSH_TELNETD_CLIENTSTACKSIZE`` Stack size allocated for the Telnet client. Default: 2048
-====================================== ================================
+=========================================== ================================
+Configuration Description
+=========================================== ================================
+``CONFIG_SYSTEM_TELNETD_PORT`` The telnet daemon will listen on this TCP port number for connections. Default: 23
+``CONFIG_SYSTEM_TELNETD_PRIORITY`` Priority of the Telnet daemon. Default: ``SCHED_PRIORITY_DEFAULT``
+``CONFIG_SYSTEM_TELNETD_STACKSIZE`` Stack size allocated for the Telnet daemon. Default: 2048
+``CONFIG_SYSTEM_TELNETD_SESSION_PRIORITY`` Priority of the Telnet client. Default: ``SCHED_PRIORITY_DEFAULT``
+``CONFIG_SYSTEM_TELNETD_SESSION_STACKSIZE`` Stack size allocated for the Telnet client. Default: 2048
+=========================================== ================================
One or both of ``CONFIG_NSH_CONSOLE`` and ``CONFIG_NSH_TELNET`` must be
defined. If ``CONFIG_NSH_TELNET`` is selected, then there some other
@@ -422,8 +423,6 @@ Configuration Description
``CONFIG_NET=y`` Of course, networking must be enabled.
``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
- TELNET commands/responses
``CONFIG_NSH_DHCPC`` Obtain the IP address via DHCP.
``CONFIG_NSH_IPADDR`` If ``CONFIG_NSH_DHCPC`` is NOT set, then the static IP address must be
provided.
diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
index 23fa269d76..8c8477d09a 100644
--- a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
@@ -108,13 +108,11 @@ CONFIG_NET_UDP=y
CONFIG_NFS=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_DISABLE_TELNETD=y
CONFIG_NSH_FILE_APPS=y
CONFIG_NSH_READLINE=y
CONFIG_NSH_SYMTAB=y
CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab"
CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols"
-CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072
CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT=y
CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE=3072
CONFIG_NXPLAYER_PLAYTHREAD_STACKSIZE=3072
diff --git a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
index ee6e95872a..bd96607839 100644
--- a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
@@ -109,13 +109,11 @@ CONFIG_NET_UDP=y
CONFIG_NFS=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_DISABLE_TELNETD=y
CONFIG_NSH_FILE_APPS=y
CONFIG_NSH_READLINE=y
CONFIG_NSH_SYMTAB=y
CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab"
CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols"
-CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072
CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT=y
CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE=3072
CONFIG_NXPLAYER_PLAYTHREAD_STACKSIZE=3072
diff --git a/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig
index fb8683fffe..2ba467f6f8 100644
--- a/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig
@@ -81,8 +81,6 @@ CONFIG_NETUTILS_CODECS=y
CONFIG_NETUTILS_IPERF=y
CONFIG_NETUTILS_IPERFTEST_DEVNAME="eth0"
CONFIG_NETUTILS_TELNETD=y
-CONFIG_NETUTILS_TELNETD_PATH="/system/bin/telnetd"
-CONFIG_NETUTILS_TELNETD_SHELL_PATH="/system/bin/sh"
CONFIG_NETUTILS_TFTPC=y
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NET_BROADCAST=y
@@ -98,7 +96,6 @@ CONFIG_NET_UDP=y
CONFIG_NET_UDP_CHECKSUMS=y
CONFIG_NFS=y
CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_DISABLE_TELNETD=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_FILE_APPS=y
CONFIG_NSH_READLINE=y
@@ -126,7 +123,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NSH_PROGNAME="init"
CONFIG_SYSTEM_PING=y
-CONFIG_SYSTEM_TELNETD=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TLS_TASK_NELEM=4
CONFIG_UART1_SERIAL_CONSOLE=y
diff --git a/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig
index 264d6f3e1e..58bce0a311 100644
--- a/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig
@@ -81,8 +81,6 @@ CONFIG_NETUTILS_CODECS=y
CONFIG_NETUTILS_IPERF=y
CONFIG_NETUTILS_IPERFTEST_DEVNAME="eth0"
CONFIG_NETUTILS_TELNETD=y
-CONFIG_NETUTILS_TELNETD_PATH="/system/bin/telnetd"
-CONFIG_NETUTILS_TELNETD_SHELL_PATH="/system/bin/sh"
CONFIG_NETUTILS_TFTPC=y
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NET_BROADCAST=y
@@ -98,7 +96,6 @@ CONFIG_NET_UDP=y
CONFIG_NET_UDP_CHECKSUMS=y
CONFIG_NFS=y
CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_DISABLE_TELNETD=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_FILE_APPS=y
CONFIG_NSH_READLINE=y
@@ -127,7 +124,6 @@ CONFIG_SYSTEM_DHCPC_RENEW=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NSH_PROGNAME="init"
CONFIG_SYSTEM_PING=y
-CONFIG_SYSTEM_TELNETD=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_SMP=y
CONFIG_TLS_TASK_NELEM=4
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
index a8a596325b..a91c18d3d5 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
@@ -103,7 +103,6 @@ CONFIG_NSH_DISABLE_LOSETUP=y
CONFIG_NSH_DISABLE_MKRD=y
CONFIG_NSH_DISABLE_PUT=y
CONFIG_NSH_DISABLE_SOURCE=y
-CONFIG_NSH_DISABLE_TELNETD=y
CONFIG_NSH_DISABLE_XD=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=128
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
index 089ab06a3d..055bf7d2bb 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
@@ -128,7 +128,6 @@ CONFIG_NSH_READLINE=y
CONFIG_NSH_SYMTAB=y
CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab"
CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols"
-CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072
CONFIG_NX=y
CONFIG_NXFONT_MONO5X8=y
CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/mnt/sd1"
diff --git a/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig b/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig
index b5738831e8..0388873094 100644
--- a/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig
+++ b/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig
@@ -29,7 +29,6 @@
# CONFIG_NSH_DISABLE_SET is not set
# CONFIG_NSH_DISABLE_SLEEP is not set
# CONFIG_NSH_DISABLE_SOURCE is not set
-# CONFIG_NSH_DISABLE_TELNETD is not set
# CONFIG_NSH_DISABLE_TEST is not set
# CONFIG_NSH_DISABLE_UNSET is not set
# CONFIG_NSH_DISABLE_USLEEP is not set
diff --git a/boards/arm/samv7/same70-xplained/README.txt b/boards/arm/samv7/same70-xplained/README.txt
index e0fcd8fe85..b92c9cb3df 100644
--- a/boards/arm/samv7/same70-xplained/README.txt
+++ b/boards/arm/samv7/same70-xplained/README.txt
@@ -1420,8 +1420,8 @@ Configuration sub-directories
CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048
- CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
- CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
+ CONFIG_SYSTEM_TELNETD_STACKSIZE=2048
+ CONFIG_SYSTEM_TELNETD_SESSION_STACKSIZE=2048
3. NSH built-in applications are supported. There are, however, no
enabled built-in applications.
diff --git a/boards/arm/samv7/same70-xplained/configs/pysim/defconfig b/boards/arm/samv7/same70-xplained/configs/pysim/defconfig
index 064f6dfa30..a473775f23 100644
--- a/boards/arm/samv7/same70-xplained/configs/pysim/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/pysim/defconfig
@@ -99,8 +99,6 @@ CONFIG_NSH_FILE_APPS=y
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
CONFIG_NSH_ROMFSETC=y
-CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
-CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048
CONFIG_PREALLOC_TIMERS=4
CONFIG_PSEUDOTERM=y
@@ -154,5 +152,7 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NSH_STACKSIZE=2048
CONFIG_SYSTEM_PING=y
CONFIG_SYSTEM_PING_STACKSIZE=2048
+CONFIG_SYSTEM_TELNETD_SESSION_STACKSIZE=2048
+CONFIG_SYSTEM_TELNETD_STACKSIZE=2048
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USEC_PER_TICK=1000
diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt
index 1d7fe61344..5ba6d6ae58 100644
--- a/boards/arm/samv7/samv71-xult/README.txt
+++ b/boards/arm/samv7/samv71-xult/README.txt
@@ -2083,8 +2083,8 @@ Configuration sub-directories
CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048
- CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
- CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
+ CONFIG_SYSTEM_TELNETD_STACKSIZE=2048
+ CONFIG_SYSTEM_TELNETD_SESSION_STACKSIZE=2048
3. NSH built-in applications are supported. There are, however, not
enabled built-in applications.
diff --git a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
index ae6f2e58c4..ff629eaa75 100644
--- a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
@@ -89,7 +89,6 @@ CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_DISABLE_GET=y
CONFIG_NSH_DISABLE_PUT=y
-CONFIG_NSH_DISABLE_TELNETD=y
CONFIG_NSH_DISABLE_WGET=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/shenzhou/configs/nxwm/defconfig b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig
index 19a134aa92..3e8478d9a0 100644
--- a/boards/arm/stm32/shenzhou/configs/nxwm/defconfig
+++ b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig
@@ -61,8 +61,6 @@ CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LIBRARY=y
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=1596
-CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=1596
CONFIG_NX=y
CONFIG_NXFONT_SANS22X29B=y
CONFIG_NXFONT_SANS23X27=y
@@ -122,6 +120,8 @@ CONFIG_STM32_SPI3_REMAP=y
CONFIG_STM32_USART2=y
CONFIG_STM32_USART2_REMAP=y
CONFIG_SYSTEM_PING=y
+CONFIG_SYSTEM_TELNETD_STACKSIZE=1596
+CONFIG_SYSTEM_TELNETD_SESSION_STACKSIZE=1596
CONFIG_TASK_NAME_SIZE=0
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_SERIAL_CONSOLE=y
diff --git a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
index 155c44ff93..e4d3249d96 100644
--- a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
+++ b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
@@ -73,7 +73,6 @@ CONFIG_NSH_DISABLE_RMDIR=y
CONFIG_NSH_DISABLE_SET=y
CONFIG_NSH_DISABLE_SLEEP=y
CONFIG_NSH_DISABLE_SOURCE=y
-CONFIG_NSH_DISABLE_TELNETD=y
CONFIG_NSH_DISABLE_TEST=y
CONFIG_NSH_DISABLE_TIME=y
CONFIG_NSH_DISABLE_UMOUNT=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig
index eb1dd7a26b..d959afcfd8 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig
@@ -71,7 +71,6 @@ CONFIG_NSH_READLINE=y
CONFIG_NSH_SYMTAB=y
CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab"
CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols"
-CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072
CONFIG_PATH_INITIAL="/mnt/nfs/bin"
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=114688
diff --git a/boards/arm/stm32h7/nucleo-h743zi2/configs/jumbo/defconfig b/boards/arm/stm32h7/nucleo-h743zi2/configs/jumbo/defconfig
index 8d9bc6da35..1d8ea9a314 100644
--- a/boards/arm/stm32h7/nucleo-h743zi2/configs/jumbo/defconfig
+++ b/boards/arm/stm32h7/nucleo-h743zi2/configs/jumbo/defconfig
@@ -76,8 +76,6 @@ CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_MAXARGUMENTS=12
CONFIG_NSH_READLINE=y
-CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
-CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048
CONFIG_PREALLOC_TIMERS=4
CONFIG_PTHREAD_STACK_DEFAULT=2048
@@ -122,6 +120,8 @@ CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NSH_STACKSIZE=2048
CONFIG_SYSTEM_PING=y
CONFIG_SYSTEM_PING_STACKSIZE=2048
+CONFIG_SYSTEM_TELNETD_SESSION_STACKSIZE=2048
+CONFIG_SYSTEM_TELNETD_STACKSIZE=2048
CONFIG_TASK_NAME_SIZE=16
CONFIG_TESTING_FSTEST=y
CONFIG_TESTING_FSTEST_STACKSIZE=2048
diff --git a/boards/arm/tiva/dk-tm4c129x/README.txt b/boards/arm/tiva/dk-tm4c129x/README.txt
index 93fa3f60da..3541f1cd7f 100644
--- a/boards/arm/tiva/dk-tm4c129x/README.txt
+++ b/boards/arm/tiva/dk-tm4c129x/README.txt
@@ -685,8 +685,8 @@ Where <subdir> is one of the following:
CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048
- CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
- CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
+ CONFIG_SYSTEM_TELNETD_STACKSIZE=2048
+ CONFIG_SYSTEM_TELNETD_SESSION_STACKSIZE=2048
4. This configuration has the network enabled by default. See the
paragraph "Using the network with NSH" above).
diff --git a/boards/arm/tiva/tm4c1294-launchpad/README.txt b/boards/arm/tiva/tm4c1294-launchpad/README.txt
index ae8f46d231..c3edaaccb3 100644
--- a/boards/arm/tiva/tm4c1294-launchpad/README.txt
+++ b/boards/arm/tiva/tm4c1294-launchpad/README.txt
@@ -64,8 +64,8 @@ Where <subdir> is one of the following:
CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048
- CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
- CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
+ CONFIG_SYSTEM_TELNETD_STACKSIZE=2048
+ CONFIG_SYSTEM_TELNETD_SESSION_STACKSIZE=2048
4. This configuration has the network enabled by default. See the
paragraph "Using the network with NSH" in the DK-TM4C129X README).
diff --git a/boards/arm/tiva/tm4c129e-launchpad/README.txt b/boards/arm/tiva/tm4c129e-launchpad/README.txt
index 515005cc9f..6e08153998 100644
--- a/boards/arm/tiva/tm4c129e-launchpad/README.txt
+++ b/boards/arm/tiva/tm4c129e-launchpad/README.txt
@@ -209,8 +209,8 @@ Where <subdir> is one of the following:
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048
CONFIG_BUILTIN_PROXY_STACKSIZE=1024
- CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
- CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
+ CONFIG_SYSTEM_TELNETD_STACKSIZE=2048
+ CONFIG_SYSTEM_TELNETD_SESSION_STACKSIZE=2048
4. This configuration has the network enabled by default. See the paragraph
"Using the network with NSH" in the DK-TM4C129X README).
diff --git a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig
index 9ad03ce50d..bc0bd9ba45 100644
--- a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig
@@ -89,7 +89,6 @@ CONFIG_NSH_DISABLE_RMDIR=y
CONFIG_NSH_DISABLE_SET=y
CONFIG_NSH_DISABLE_SLEEP=y
CONFIG_NSH_DISABLE_SOURCE=y
-CONFIG_NSH_DISABLE_TELNETD=y
CONFIG_NSH_DISABLE_TEST=y
CONFIG_NSH_DISABLE_TIME=y
CONFIG_NSH_DISABLE_UMOUNT=y
diff --git a/boards/sparc/bm3803/xx3803/configs/nsh/defconfig b/boards/sparc/bm3803/xx3803/configs/nsh/defconfig
index f176c18d3e..6a4736070c 100644
--- a/boards/sparc/bm3803/xx3803/configs/nsh/defconfig
+++ b/boards/sparc/bm3803/xx3803/configs/nsh/defconfig
@@ -87,7 +87,6 @@ CONFIG_NSH_DISABLE_RMDIR=y
CONFIG_NSH_DISABLE_SEMICOLON=y
CONFIG_NSH_DISABLE_SET=y
CONFIG_NSH_DISABLE_SOURCE=y
-CONFIG_NSH_DISABLE_TELNETD=y
CONFIG_NSH_DISABLE_TEST=y
CONFIG_NSH_DISABLE_TRUNCATE=y
CONFIG_NSH_DISABLE_UMOUNT=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
index 1710eb4354..a05a58b769 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
@@ -76,7 +76,6 @@ CONFIG_NSH_CODECS_BUFSIZE=2048
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=300
CONFIG_NSH_READLINE=y
-CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072
CONFIG_NSH_WGET_BUFF_SIZE=2048
CONFIG_PREALLOC_TIMERS=4
CONFIG_PTHREAD_MUTEX_TYPES=y