diff --git a/ChangeLog b/ChangeLog
index d71a05a1e9721eb17856738041c9dd904a516b1b..8c75a32f4c2ffb0b6464fd9ee246221c17cb6402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6684,3 +6684,7 @@
 	  An asynchronous, "external" clock may now be used to drive the CPU
 	  load calculations for more accurate load measurements when needed
 	  (2014-2-27).
+	* configs/*/defconfig:  If CONFIG_NSH_LIBRARY=y then set CONFIG_NSH_READLINE=y
+	  otherwise the CLE will be selected by default the next time that
+	  make menuconfig is used (2014-2-28).
+ 
diff --git a/configs/16z/nsh/defconfig b/configs/16z/nsh/defconfig
index 919b8379b634d9da3e05f53e34c8ff468263b83e..5649cd4ebdb58edd35e566810f4ede4ac6f8a21b 100644
--- a/configs/16z/nsh/defconfig
+++ b/configs/16z/nsh/defconfig
@@ -506,6 +506,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index 8521661f137da6e389f7f409f98a1c47d25b69ab..226750c196c132e1a94f695ecd555e1c5a7acec4 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -575,6 +575,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index ee2d21ac0804971bc55b50ffd9892e882c4fdc0b..7f31561e534656bb3460977f3d6b0161a956eafb 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -612,6 +612,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/compal_e86/nsh_highram/defconfig b/configs/compal_e86/nsh_highram/defconfig
index 63a072e6212704b51536a9b99896f6cb33c01bf8..39e2bbaed9a9dd1377a1880695a833869a6efb2a 100644
--- a/configs/compal_e86/nsh_highram/defconfig
+++ b/configs/compal_e86/nsh_highram/defconfig
@@ -506,6 +506,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 02c23eee04c23c979384dfa326b2968dbed73e02..725f9797b98b9060f8f609ad5698223f78c6a18a 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -542,6 +542,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 391c0f4296132a97795d38e2ae4f2b337e7085b0..2fc1c35503210bb3e0e4536bc65d8fa0431a47d8 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -571,6 +571,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index e7fd821f84ec5a6dcc8b903eb11952aeb51d75a7..5f79746225c29e025b0c18390572e6677b62376b 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -915,6 +915,8 @@ CONFIG_NETUTILS_WEBCLIENT=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/freedom-kl25z/minnsh/defconfig b/configs/freedom-kl25z/minnsh/defconfig
index 701ba25f627217f826f8bf8fa4f3ec0d93923179..32b3d0383862ef36f7206d5731c62b4fbfb56024 100644
--- a/configs/freedom-kl25z/minnsh/defconfig
+++ b/configs/freedom-kl25z/minnsh/defconfig
@@ -550,6 +550,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 # CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index 4abc4610d9e41a43f199e173f53e67c9d72d9358..096b6068d7ac5622581315013c728e9a01c3d6fd 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -538,6 +538,8 @@ CONFIG_EXAMPLES_PWM_DURATION=5
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index 34971c5d7ae3d13c0a4952fbd2cc61e41e9b84e9..db0255c0090caa04d45bc5eddc32318a69cfcbfb 100644
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -599,6 +599,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index fbb71db0e69f5acc2b5c6021c2d6b4a3d3dad714..61375ea9aaa0e0229358e203ee329936e1e55e06 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -782,6 +782,8 @@ CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/hymini-stm32v/ostest/defconfig b/configs/hymini-stm32v/ostest/defconfig
index 64758832944e4967ed29a526d2dd99832cce6f55..09946567ccbf54c0090284de58d630c01cd51c34 100644
--- a/configs/hymini-stm32v/ostest/defconfig
+++ b/configs/hymini-stm32v/ostest/defconfig
@@ -582,6 +582,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index 70b8ccd61782cce4f4b1a46bfb6301c149bea0ff..da6c5ff0e19f690d84159ae058b339893e8c1863 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -631,6 +631,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index 587e3e6458a88160ca3b89d618e4459e4fc55fac..50f8877b2b1ac483a876ccceff8380acffc8f897 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -546,6 +546,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 587e3e6458a88160ca3b89d618e4459e4fc55fac..50f8877b2b1ac483a876ccceff8380acffc8f897 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -546,6 +546,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index d05ec9712981316e3776346dc9e304210ada2690..5a4ee46b657ad2d29f39dbd36484d65cad3cc043 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -501,6 +501,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index 09e259f0e81b7fefeb68346ee6889697e5b80446..bf67b84f9298bd058147767054952b924d86c73f 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -688,6 +688,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig
index 3bdaaad5b4e6eb765aec62296c4832430feded36..697f33b15d8c8557f07f74644984d82543fedcd9 100644
--- a/configs/maple/nx/defconfig
+++ b/configs/maple/nx/defconfig
@@ -855,6 +855,8 @@ CONFIG_EXAMPLES_NXHELLO_DEFAULT_FONT=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig
index c4548f54b5332561b331f87e5a40efeda4c11de6..0a4364083e7376a1b2a5759157cfff29424846f9 100644
--- a/configs/maple/usbnsh/defconfig
+++ b/configs/maple/usbnsh/defconfig
@@ -714,6 +714,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 9701bef0af3738ae2000ba79a822cd1b6def7c77..72b5de33a2f46a395c11588de5db0e3e639b9aa9 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -495,6 +495,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index e2d1da8e25d2a1c4f4ab5a978c888381a880b9bd..0ba04928168f65474f591eda7f77a2011851300f 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -1022,6 +1022,8 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index 07d249d8c06406834f1f3008676e09815111ca03..b9e9d5de885a510f3bfd7bafadd0e6bf4b6e70dd 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -738,6 +738,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig
index 390faa3564bcf3e29cb72cc9174054bf63dfe49e..330e9628bfe3808d5f53cedfc2feec4016d7cdb8 100644
--- a/configs/mikroe-stm32f4/nsh/defconfig
+++ b/configs/mikroe-stm32f4/nsh/defconfig
@@ -665,6 +665,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index 807ad75529a49c4ea5caf0bec3b7c97729f16274..3e13610438550e7405ad29c9ef72d04ceacd7dd9 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -663,6 +663,8 @@ CONFIG_EXAMPLES_NX_BPP=16
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index 25b5e79380e34bcaaac07ff56f12039b1276e9c4..6487e83b0607d41ce4cfa683a674bafa0f5115f1 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -665,6 +665,8 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index 2e952fa72beaf83c943be4e128b51be516f6d317..a04d4d409c4e0ca81e8f21c0422cb50fda7ca42e 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -675,6 +675,8 @@ CONFIG_EXAMPLES_NXTEXT_DEFAULT_FONT=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index fc1e119ea57074ec15dc6e84bdc8e8948d94de77..abcf45204a390e62eb8183862a925ea5fc44617c 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -713,6 +713,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index e950accdf4e6b91cdaa45c2508ef47119d76c8cd..2540a10911511b16e95c7de5b2911865427f8d07 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -519,6 +519,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig
index 3fde4e9e152ffa4e1b394cfd1df34fd172ab1d02..96dc078baf974f1147714c856294abe75d9c6b1e 100644
--- a/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/configs/olimex-lpc-h3131/nsh/defconfig
@@ -544,6 +544,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index ca2d073c21403e6ffd970df93e9b6846b1d97ab3..e0bcc80a285d6c1c5c33168c9a3ca79bc70d2490 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -698,6 +698,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index 47aecb0eaf7d94945fc9061c1ca1bc587b7ed056..e32f2a7fd3ddde8eedb17eca42db1154519899b1 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -652,6 +652,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index 4fae497c4a1547b1b1541d57c58a7687b3c4564c..98d80eaeaf1c118d96cded169c0da6f0b18b4bda 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -748,6 +748,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index 07b2b0f07726a0d02e02ee312434cf554a5240fb..58586f60d582e127b55da31b7df3d86ba592b871 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -809,6 +809,8 @@ CONFIG_NETUTILS_UIPLIB=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index b45a93a61632b482e3c464a31e9c422cafd973ee..9898513a36d1ed0584d96706eae3f3407dc6668f 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -611,6 +611,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index 631b5e5bc1afab0fb528695b6761b60782acfcfc..2054d25f8d8d1463e6e7b0325b7775ae4f6347c2 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -566,6 +566,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index f9539e3b26fc80fd439332deda41f40fbb47f3a4..4725c04aa71273d36669509f0c830c992c54840d 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -611,6 +611,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig
index 3e685c4fbea741758bd8c3fcb214a66cc909ac9d..58a2b26670a3fd7ecc73677b680a379950e135d1 100644
--- a/configs/pcduino-a10/nsh/defconfig
+++ b/configs/pcduino-a10/nsh/defconfig
@@ -611,6 +611,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig
index b6f7fd47b0d9aff701dcabce289f4261fa482791..a083000eec056cbdaccf4b38918a9aa9203c5844 100644
--- a/configs/pirelli_dpl10/nsh_highram/defconfig
+++ b/configs/pirelli_dpl10/nsh_highram/defconfig
@@ -480,6 +480,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/px4fmu-v2_upstream/nsh/defconfig b/configs/px4fmu-v2_upstream/nsh/defconfig
index 909ab48df0b396ef3f2f198eb97ce695c5b7af82..5988bc9ede98921a8b169cbfbf80ce7e882b2ad3 100644
--- a/configs/px4fmu-v2_upstream/nsh/defconfig
+++ b/configs/px4fmu-v2_upstream/nsh/defconfig
@@ -953,6 +953,8 @@ CONFIG_EXAMPLES_USBTERM=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index 865f020752ad94461eebb7eb3c60071c435e1716..1bf5e02f170cf413251a045eb58d616f3ddf369f 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -582,6 +582,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 8acd63b0716aef1710150e253bad9796a2e7d966..42c107d6986f71f303366f9d6f5da9a7226eeaae 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -580,6 +580,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index eab2923394fb71305879b7e2571ff14a453db2a4..991c78f47630b2a5b10e22cca2c937c24c4cc3a1 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -747,6 +747,8 @@ CONFIG_CXX_NEWLONG=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index 862221b76042fa333cfe661b88259a78587e9f64..72b32f514d243432d6ec581131293b661902bfc8 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -596,6 +596,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index dafb4c94ea52f44bc44d794edae1d6dc16440210..4602707f10fb7b3560b652bb396a47e29e202562 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -570,6 +570,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index c034cbce88f54c9b1f69e3f504355cac9bf98e3f..4df0741e8132caf44369e07798f0c717ae3026e8 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -746,6 +746,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index 616aa1d5816f0eb8bb43b3866a5fa2c66fc3be43..8a74d37dd5bcecf11655f89c45d377f826619d22 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -622,6 +622,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index 9f42b8ecadf9cd94f3717b3138d34067bc9db252..3c014d9e19209c487395291a35f678f416f1fc7c 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -781,6 +781,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 # CONFIG_NSH_BUILTIN_APPS is not set
 
 #
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index 4b3875ad92d56120d1f455d7358f486697cd1429..feaeace67a5f7dfa01f8c66750488b95347214e8 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -612,6 +612,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index 989258945b5027cf7823358d7559547860e0d281..f150a85ba6c89ec40e187015bb1c8372c59bc80c 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -950,6 +950,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index 6bb52749f00d684ea5c2766dd9623e1c1057ed44..53dafff2c276d23b2b6c3f68a03caf9f04fafaf4 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -835,6 +835,8 @@ CONFIG_NETUTILS_WEBCLIENT=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_BUILTIN=y
 CONFIG_NSH_BUILTIN_APPS=y
 
diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig
index 170ad93fa90b4fb1d44a36a5c6f24c2ef1d7ffe8..fb785f3e7c946a4325918fd6653b549f0f75a475 100644
--- a/configs/spark/nsh/defconfig
+++ b/configs/spark/nsh/defconfig
@@ -778,6 +778,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index fa72d00b72bf0cc76e79543e9b9b3cc9feebc0e9..7b4c553ca528965ab5e90af22080f78566c4c1f1 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/defconfig
@@ -743,6 +743,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig
index 2283459ecf073d4e3e1b411f3f74a94977f09247..042ba32e49c5d4385bba0dd57286b92e1787ec74 100644
--- a/configs/spark/usbnsh/defconfig
+++ b/configs/spark/usbnsh/defconfig
@@ -693,6 +693,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig
index 3d177e1d74074c44307d25fd2967b00181097d7a..bf8c3453f6d58c5f720ca7074c0f8d2c669272d0 100644
--- a/configs/spark/usbserial/defconfig
+++ b/configs/spark/usbserial/defconfig
@@ -752,6 +752,8 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index a369d08b28a4bef52d37f73713e8e5a065f1a10d..0d54bf267150dff04e1a7d4866405e4e77dba571 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -968,6 +968,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index 0954ef979f3def7a29abf2139e54be0646767b86..5883859fbf155a589b16e3cdc67baac6b1848f01 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -963,6 +963,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig
index 870a3e305e287cdef469e593fb15e9458ccc6712..4d9d0d1fe88de9891c725bfce7a2ed3799c5fc60 100644
--- a/configs/stm32_tiny/nsh/defconfig
+++ b/configs/stm32_tiny/nsh/defconfig
@@ -634,6 +634,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index e2a939b6eabdfc3c2af790e3222accb11cb32e0a..be211c5d202a3919d2d2a5fc87f856f0e31d32c6 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -611,6 +611,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/stm32f100rc_generic/nsh/defconfig b/configs/stm32f100rc_generic/nsh/defconfig
index 2209f268e808caeb6af86f692e3f2228dcb3cc5c..b6fb579b1c088ca323a8cf184575a484972afd82 100644
--- a/configs/stm32f100rc_generic/nsh/defconfig
+++ b/configs/stm32f100rc_generic/nsh/defconfig
@@ -526,6 +526,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index 30fbace2b682dea127dc51d7f5ad05e0ef206bc4..ddfc981b73345f36e793a7ae9b9e461e65afb4b3 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -700,6 +700,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index 74d13be3d5347ea932da2a7d29e896e3d4fcdef9..82450d3cf4257e9b6256be4e866c5b8478984bab 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -688,6 +688,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index a64db362c13708b28600cc67c10416a864fb22a5..5eab39004ade6d649c583d43b56cd53e96f03027 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -800,6 +800,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig
index 4efa436bc5e53f20dbece6ecf3df29842ca46489..1f84f72911a63a4e2ab2fac42a9b5a2d27b54bcb 100644
--- a/configs/stm32f429i-disco/nsh/defconfig
+++ b/configs/stm32f429i-disco/nsh/defconfig
@@ -732,6 +732,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index 7b843557b81dc8ddc6da7327616ad590f66fb47d..61afe3c3debd73019a399ed902cb3b4671f657ca 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -753,6 +753,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index c34006e3fe9ee8499060fea747f5cd676d400a0f..b75ff0b86acf74d52c09e22de27f04e29b00ab62 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -781,6 +781,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index e7b9886f915af3177e3ff08badbff618d8a9ed3d..ca9f4da086c9627241797dee987ccc0072ead813 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -704,6 +704,8 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index c625c2417d6e81e7a284edc5a04aa81102314fa1..45a9903a7a067b4cef47ae88a009da394bea1c3c 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -635,6 +635,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index fbdcc6e13d15255ef07e3725870a0c1959103402..1190523297bff3bff80f057e0d1986bb4b2204ac 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -604,6 +604,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig
index 198eb9d2c9ac6fc0d1fc89d25f7d5e15d0e55ca0..2c7587987eabbb9dde25548ea0331b7380cc52f6 100644
--- a/configs/stm32vldiscovery/nsh/defconfig
+++ b/configs/stm32vldiscovery/nsh/defconfig
@@ -528,6 +528,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index d370d15332c4d413a4d56f48aed152d1c0bd4ac6..d8b3fed9c6671dd3c0832f4fc8edf77e92a592e3 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -613,6 +613,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index 9be29b6b275aa35941da4a7be7492bc983d629ab..24c6e06ab4c9fc27cb60221ae41c7837b36396ee 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -662,6 +662,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index ed53d56f6d1ecbe84ec838211ba6c74a1dec21b2..3d8fbbe00481f857fe93e48b4fa40deecd7017dc 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -536,6 +536,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index 8cebb53f0709aa0611e58cf756dc2d8eff60fc57..1a18591a30d6ddba8caee364a1ff103fc374ffa5 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -801,8 +801,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
-# CONFIG_NSH_READLINE is not set
-CONFIG_NSH_CLE=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
@@ -977,8 +977,7 @@ CONFIG_READLINE_ECHO=y
 #
 # EMACS-like Command Line Editor
 #
-CONFIG_SYSTEM_CLE=y
-CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
+# CONFIG_SYSTEM_CLE is not set
 
 #
 # VI Work-Alike Editor
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index bd00df15659228a75f91a7f1e3728e43a60d7a49..bd1e66fad96071a6226bb2a19552d51c20204c3f 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -689,6 +689,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index bdf7eae9984166999bcba44e816e1b992b92703f..c508c98f7c2b5fb0ff231f164509bcba8b77476f 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -402,6 +402,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index d743c613bef496ea5d6be94a4aa802df70a80add..431708c572ef6c15f1f408d6db1c5b3143d20ab5 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -522,6 +522,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index 3634dc45c004aee691ea9c7de18020a4771c6d62..5348590c5d0edc12458d21f6bc215cc9342abe3d 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -402,6 +402,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index 687a39264a0ffefd9e809046acc2d108161df35f..3d4b9381a786de8e12a7acf5e9aaee380ed78557 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -670,6 +670,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index bd0a7e6d66d7cbdb78b292014e196714ca63b09a..f3faa52284b79367e85b699cab734911a2115ac1 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -712,6 +712,8 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index 242ba951aabe8d55f8765087505cd9dff0b371f2..d81bfad74518b4e2e04a3aa9bf23ca7444bf6fab 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -472,6 +472,8 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
 
 #
 # Disable Individual commands