diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
index 7ac6e62cd5..c869f8b1d0 100644
--- a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
@@ -6,6 +6,12 @@
 # modifications.
 #
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
+CONFIG_ADBD_FILE_SERVICE=y
+CONFIG_ADBD_SHELL_SERVICE=y
+CONFIG_ADBD_SHELL_SERVICE_PATH="/system/bin/sh"
+CONFIG_ADBD_SOCKET_SERVICE=y
+CONFIG_ADBD_STACKSIZE=3072
+CONFIG_ADBD_TCP_SERVER=y
 CONFIG_ALLOW_BSD_COMPONENTS=y
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD="sabre-6quad"
@@ -18,11 +24,12 @@ CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_IRQBUTTONS=y
 CONFIG_ARCH_LOWVECTORS=y
 CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARM_SEMIHOSTING_HOSTFS=y
+CONFIG_BOARDCTL_APP_SYMTAB=y
 CONFIG_BOARD_LOOPSPERMSEC=99369
 CONFIG_BOOT_RUNFROMSDRAM=y
 CONFIG_BUILTIN=y
 CONFIG_CODECS_HASH_MD5=y
-CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_ZERO=y
 CONFIG_ELF=y
@@ -34,6 +41,8 @@ CONFIG_EXAMPLES_TCPBLASTER_SERVER=y
 CONFIG_EXAMPLES_TCPBLASTER_SERVERIP=0x2b1f4d32
 CONFIG_EXAMPLES_TCPBLASTER_TARGET2=y
 CONFIG_EXAMPLES_UDPBLASTER=y
+CONFIG_EXECFUNCS_HAVE_SYMTAB=y
+CONFIG_FS_HOSTFS=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
@@ -41,11 +50,19 @@ CONFIG_IMX6_ENET=y
 CONFIG_IMX6_UART1=y
 CONFIG_IMX_DDR_SIZE=1073741824
 CONFIG_IMX_ENET_NTXBUFFERS=1
-CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_FILE=y
+CONFIG_INIT_FILEPATH="/system/bin/nsh"
+CONFIG_INIT_MOUNT=y
+CONFIG_INIT_MOUNT_DATA="fs=../apps"
+CONFIG_INIT_MOUNT_FLAGS=0x1
+CONFIG_INIT_MOUNT_FSTYPE="hostfs"
+CONFIG_INIT_MOUNT_SOURCE=""
+CONFIG_INIT_MOUNT_TARGET="/system"
 CONFIG_INIT_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_ENVPATH=y
-CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBUV=y
+CONFIG_LIBUV_THREAD_STACKSIZE=3072
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDB_DNSCLIENT_ENTRIES=4
@@ -66,6 +83,8 @@ CONFIG_NET_ICMP_SOCKET=y
 CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
+CONFIG_NET_TCPBACKLOG=y
+CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
 CONFIG_NFS=y
@@ -73,7 +92,8 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_PATH_INITIAL="/mnt/nfs/bin"
+CONFIG_PATH_INITIAL="/system/bin"
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=3072
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=1073741824
 CONFIG_RAM_START=0x10000000
@@ -88,15 +108,14 @@ CONFIG_STACK_COLORATION=y
 CONFIG_START_DAY=23
 CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2020
-CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSLOG_TIMESTAMP=y
+CONFIG_SYSTEM_ADBD=y
 CONFIG_SYSTEM_DHCPC_RENEW=y
-CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_NSH_SYMTAB=y
-CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab"
-CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols"
+CONFIG_SYSTEM_NSH=m
 CONFIG_SYSTEM_PING=y
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=3072
 CONFIG_TESTING_GETPRIME=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y
+CONFIG_TLS_TASK_NELEM=4
 CONFIG_UART1_SERIAL_CONSOLE=y