diff --git a/configs/Kconfig b/configs/Kconfig
index 5542e772fe..7e6d63a5f6 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -462,6 +462,13 @@ config ARCH_BOARD_MICROPENDOUS3
 		be populated with either an AVR AT90USB646, 647, 1286, or 1287 MCU.
 		Support is configured for the AT90USB647.
 
+config ARCH_BOARD_MISOC
+	bool "Qemu LM32 demo"
+	depends on ARCH_CHIP_LM32
+	---help---
+		This configuration is port to NuttX running on a Qemu LM32 system.
+		You can find the Qemu setup at https://bitbucket.org/key2/qemu
+
 config ARCH_BOARD_MOTEINO_MEGA
 	bool "LowPowerLab MoteinoMEGA"
 	depends on ARCH_CHIP_ATMEGA1284P
@@ -1686,6 +1693,7 @@ config ARCH_BOARD
 	default "mcu123-lpc214x"           if ARCH_BOARD_MCU123_LPC214X
 	default "micropendous3"            if ARCH_BOARD_MICROPENDOUS3
 	default "mirtoo"                   if ARCH_BOARD_MIRTOO
+	default "misoc"                    if ARCH_BOARD_MISOC
 	default "moteino-mega"             if ARCH_BOARD_MOTEINO_MEGA
 	default "ne64badge"                if ARCH_BOARD_NE64BADGE
 	default "nrf52-pca10040"           if ARCH_BOARD_NRF52_PCA10040
@@ -1975,6 +1983,9 @@ endif
 if ARCH_BOARD_MIRTOO
 source "configs/mirtoo/Kconfig"
 endif
+if ARCH_BOARD_MISOC
+source "configs/misoc/Kconfig"
+endif
 if ARCH_BOARD_MOTEINO_MEGA
 source "configs/moteino-mega/Kconfig"
 endif
diff --git a/configs/README.txt b/configs/README.txt
index cb9aec6b9d..b462f10cc0 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -369,6 +369,10 @@ configs/mikroe-stm32f4
   This is the port of NuttX to the MikroElektronika Mikromedia for STM32F4
   development board.  Contributed by Ken Petit.
 
+configs/misoc
+  This directory holds the port to NuttX running on a Qemu LM32 system.
+  You can find the Qemu setup at https://bitbucket.org/key2/qemu
+
 configs/mcu123-lpc214x
   This port is for the NXP LPC2148 as provided on the mcu123.com
   lpc214x development board. This OS is also built with the arm-nuttx-elf
diff --git a/configs/misoc/hello/defconfig b/configs/misoc/hello/defconfig
index 44cc768f1f..5607edbdf8 100644
--- a/configs/misoc/hello/defconfig
+++ b/configs/misoc/hello/defconfig
@@ -1,32 +1,31 @@
 # CONFIG_NSH_TELNET is not set
 # CONFIG_STANDARD_SERIAL is not set
-CONFIG_ARCH_BOARD_CUSTOM_DIR="/configs/misoc/"
-CONFIG_ARCH_BOARD_CUSTOM_NAME="misoc"
+CONFIG_ARCH="misoc"
+CONFIG_ARCH_BOARD="misoc"
+CONFIG_ARCH_BOARD_MISOC=y
 CONFIG_ARCH_CHIP_LM32=y
 CONFIG_ARCH_MISOC=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH="misoc"
 CONFIG_BOARD_LOOPSPERMSEC=800
 CONFIG_BUILTIN=y
-CONFIG_DEBUG_FEATURES=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 CONFIG_ENDIAN_BIG=y
 CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_NETTEST=y
 CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80101
 CONFIG_EXAMPLES_NETTEST_INIT=y
 CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80132
 CONFIG_EXAMPLES_NETTEST_NOMAC=y
 CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y
-CONFIG_EXAMPLES_NETTEST=y
 CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_TCPECHO=y
+CONFIG_EXAMPLES_TELNETD=y
 CONFIG_EXAMPLES_TELNETD_DRIPADDR=0xc0a80101
 CONFIG_EXAMPLES_TELNETD_IPADDR=0xc0a80132
 CONFIG_EXAMPLES_TELNETD_NOMAC=y
-CONFIG_EXAMPLES_TELNETD=y
 CONFIG_HAVE_CXX=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_IOB_NBUFFERS=24
@@ -34,22 +33,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MISOC_ETHERNET=y
 CONFIG_MISOC_UART1=y
-CONFIG_NET_ARP_IPIN=y
-CONFIG_NET_ARP_SEND=y
-CONFIG_NET_BROADCAST=y
-CONFIG_NET_ETH_MTU=1400
-CONFIG_NET_ETH_TCP_RECVWNDO=742
-CONFIG_NET_GUARDSIZE=648
-CONFIG_NET_HOSTNAME="nuttx"
-CONFIG_NET_ICMP_SOCKET=y
-CONFIG_NET_ICMP=y
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_TCP_WRITE_BUFFERS=y
-CONFIG_NET_TCP=y
-CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NET_UDP=y
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x08080808
@@ -57,12 +40,27 @@ CONFIG_NETUTILS_DHCPC=y
 CONFIG_NETUTILS_DISCOVER=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_WEBCLIENT=y
+CONFIG_NET_ARP_IPIN=y
+CONFIG_NET_ARP_SEND=y
+CONFIG_NET_BROADCAST=y
+CONFIG_NET_ETH_MTU=1400
+CONFIG_NET_ETH_TCP_RECVWNDO=742
+CONFIG_NET_GUARDSIZE=648
+CONFIG_NET_HOSTNAME="nuttx"
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_SOCKET=y
+CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_SOCKOPTS=y
+CONFIG_NET_TCP=y
+CONFIG_NET_TCP_CONNS=40
+CONFIG_NET_TCP_WRITE_BUFFERS=y
+CONFIG_NET_UDP=y
+CONFIG_NET_UDP_CHECKSUMS=y
 CONFIG_NFILE_DESCRIPTORS=4
 CONFIG_NFILE_STREAMS=4
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DRIPADDR=0xc0a80101
 CONFIG_NSH_IPADDR=0xc0a80132
-CONFIG_NSH_NETINIT_DEBUG=y
 CONFIG_NSH_NETINIT_THREAD=y
 CONFIG_NSH_NOMAC=y
 CONFIG_PREALLOC_TIMERS=4
@@ -77,8 +75,8 @@ CONFIG_SDCLONE_DISABLE=y
 CONFIG_START_DAY=16
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2011
+CONFIG_SYSTEM_PING=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=1
-CONFIG_SYSTEM_PING=y
diff --git a/configs/misoc/nsh/defconfig b/configs/misoc/nsh/defconfig
index 36300a82f7..d7b5fdc07b 100644
--- a/configs/misoc/nsh/defconfig
+++ b/configs/misoc/nsh/defconfig
@@ -1,13 +1,12 @@
 # CONFIG_LIBC_LONG_LONG is not set
 # CONFIG_STANDARD_SERIAL is not set
-CONFIG_ARCH_BOARD_CUSTOM_DIR="/configs/misoc/"
-CONFIG_ARCH_BOARD_CUSTOM_NAME="misoc"
+CONFIG_ARCH="misoc"
+CONFIG_ARCH_BOARD="misoc"
+CONFIG_ARCH_BOARD_MISOC=y
 CONFIG_ARCH_CHIP_LM32=y
 CONFIG_ARCH_MISOC=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH="misoc"
 CONFIG_BOARD_LOOPSPERMSEC=800
-CONFIG_DEBUG_FEATURES=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DISABLE_ENVIRON=y
 CONFIG_DISABLE_MOUNTPOINT=y
@@ -39,6 +38,6 @@ CONFIG_START_YEAR=2011
 CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_USERMAIN_STACKSIZE=1024
+CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0