diff --git a/configs/cc3200-launchpad/nsh/defconfig b/configs/cc3200-launchpad/nsh/defconfig
index adf395bda8..a6f14f20c1 100644
--- a/configs/cc3200-launchpad/nsh/defconfig
+++ b/configs/cc3200-launchpad/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -153,8 +153,10 @@ CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y
 # CONFIG_ARCH_DMA is not set
 CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_CUSTOM_STACK is not set
-# CONFIG_ADDRENV is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
@@ -239,7 +241,8 @@ CONFIG_START_YEAR=2014
 CONFIG_START_MONTH=8
 CONFIG_START_DAY=24
 CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=2
+CONFIG_PREALLOC_WDOGS=8
+CONFIG_WDOG_INTRESERVE=2
 CONFIG_PREALLOC_TIMERS=2
 
 #
diff --git a/configs/cc3200-launchpad/nsh/setenv.sh b/configs/cc3200-launchpad/nsh/setenv.sh
index 538f526ab5..92934b4762 100644
--- a/configs/cc3200-launchpad/nsh/setenv.sh
+++ b/configs/cc3200-launchpad/nsh/setenv.sh
@@ -52,6 +52,7 @@ fi
 # the CodeSourcery toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
 
 # These are the Cygwin paths to the locations where I installed the Atollic
 # toolchain under windows.  You will also have to edit this if you install
diff --git a/configs/cc3200-launchpad/src/cc3200_boot.c b/configs/cc3200-launchpad/src/cc3200_boot.c
index 98ef5d1e73..3c2b857761 100644
--- a/configs/cc3200-launchpad/src/cc3200_boot.c
+++ b/configs/cc3200-launchpad/src/cc3200_boot.c
@@ -47,10 +47,9 @@
 #include <stdio.h>
 
 #include <arch/board/board.h>
+#include <arch/board/cc3200_utils.h>
 #include <apps/nsh.h>
 
-#include <cc3200_utils.h>
-
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
diff --git a/configs/cc3200-launchpad/src/cc3200_serial.c b/configs/cc3200-launchpad/src/cc3200_serial.c
index 5a17077549..20a43daa71 100644
--- a/configs/cc3200-launchpad/src/cc3200_serial.c
+++ b/configs/cc3200-launchpad/src/cc3200_serial.c
@@ -40,8 +40,11 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <nuttx/arch.h>
-#include <cc3200_utils.h>
+
+#include <arch/board/cc3200_utils.h>
+
 #include "chip/cc3200_memorymap.h"
 #include "up_internal.h"