diff --git a/configs/moxa/nsh/defconfig b/configs/moxa/nsh/defconfig
index 794c89c5317..f65ab6cc855 100644
--- a/configs/moxa/nsh/defconfig
+++ b/configs/moxa/nsh/defconfig
@@ -37,6 +37,7 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
@@ -94,6 +95,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
 CONFIG_ARCH_CHIP_MOXART=y
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
@@ -104,10 +106,17 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="moxart"
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
 # ARM Configuration Options
@@ -277,6 +286,7 @@ CONFIG_BOARD_INITIALIZE=y
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -293,9 +303,10 @@ CONFIG_SIG_SIGWORK=17
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -347,7 +358,13 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
 # CONFIG_LCD is not set
+
+#
+# LED Support
+#
+# CONFIG_PCA9635PW is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
@@ -736,10 +753,10 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NXLINES is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -764,6 +781,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
 
 #
 # Graphics Support
@@ -803,6 +822,7 @@ CONFIG_NETUTILS_NETLIB=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -864,6 +884,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_SH is not set
 CONFIG_NSH_DISABLE_SHUTDOWN=y
 # CONFIG_NSH_DISABLE_SLEEP is not set
+CONFIG_NSH_DISABLE_TIME=y
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
 # CONFIG_NSH_DISABLE_UNAME is not set
@@ -922,9 +943,14 @@ CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
 CONFIG_NSH_TELNETD_CLIENTPRIO=100
 CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
 CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_LOGIN=y
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 CONFIG_NSH_TELNET_LOGIN=y
+CONFIG_NSH_LOGIN_FIXED=y
+# CONFIG_NSH_LOGIN_PLATFORM is not set
 CONFIG_NSH_LOGIN_USERNAME="admin"
 CONFIG_NSH_LOGIN_PASSWORD="nuttx"
+CONFIG_NSH_LOGIN_FAILDELAY=0
 CONFIG_NSH_LOGIN_FAILCOUNT=3
 
 #
@@ -944,7 +970,6 @@ CONFIG_NSH_LOGIN_FAILCOUNT=3
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_NETDB is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 362659e12a1..eae2ddb2790 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -12,10 +12,6 @@ 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
@@ -573,6 +569,7 @@ CONFIG_EXAMPLES_NSH=y
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
 CONFIG_FSUTILS_PASSWD=y
 CONFIG_FSUTILS_PASSWD_PATH="/etc/passwd"
 CONFIG_FSUTILS_PASSWD_READONLY=y
@@ -724,6 +721,10 @@ CONFIG_NSH_CONSOLE=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_LOGIN=y
 CONFIG_NSH_CONSOLE_LOGIN=y
+# CONFIG_NSH_LOGIN_FIXED is not set
+# CONFIG_NSH_LOGIN_PLATFORM is not set
+CONFIG_NSH_LOGIN_PASSWD=y
+CONFIG_NSH_LOGIN_FAILDELAY=0
 CONFIG_NSH_LOGIN_FAILCOUNT=3
 
 #
@@ -743,7 +744,6 @@ CONFIG_NSH_LOGIN_FAILCOUNT=3
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index f76e22e9b94..fbabb82e79a 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -37,6 +37,7 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
@@ -92,7 +93,7 @@ CONFIG_ARCH="sim"
 #
 CONFIG_HOST_X86_64=y
 # CONFIG_HOST_X86 is not set
-CONFIG_SIM_M32=y
+# CONFIG_SIM_M32 is not set
 CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_SIM_X8664_MICROSOFT is not set
 # CONFIG_SIM_WALLTIME is not set
@@ -537,7 +538,6 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -557,6 +557,7 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
 
 #
 # Graphics Support
@@ -606,7 +607,6 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set