diff --git a/configs/sam4e-ek/include/board.h b/configs/sam4e-ek/include/board.h
index 68e74a3f50..9bc48258cb 100644
--- a/configs/sam4e-ek/include/board.h
+++ b/configs/sam4e-ek/include/board.h
@@ -286,7 +286,7 @@ extern "C" {
  * Name: sam_boardinitialize
  *
  * Description:
- *   All SAM3U architectures must provide the following entry point.  This entry point
+ *   All SAM4E architectures must provide the following entry point.  This entry point
  *   is called early in the initialization -- after all memory has been configured
  *   and mapped but before any devices have been initialized.
  *
@@ -294,11 +294,6 @@ extern "C" {
 
 void sam_boardinitialize(void);
 
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
 /************************************************************************************
  * Name:  sam_ledinit, sam_setled, and sam_setleds
  *
@@ -332,5 +327,10 @@ void sam_lcdclear(uint16_t color);
 void sam_lcdclear(uint32_t color);
 #endif
 
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif  /* __ARCH_SAM4E_EK_INCLUDE_BOARD_H */
diff --git a/configs/samv71-xult/include/board.h b/configs/samv71-xult/include/board.h
new file mode 100644
index 0000000000..1273487a5b
--- /dev/null
+++ b/configs/samv71-xult/include/board.h
@@ -0,0 +1,61 @@
+/************************************************************************************
+ * configs/samv71-xult/include/board.h
+ *
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+#ifndef __CONFIGS_SAMV71_XULT_INCLUDE_BOARD_H
+#define __CONFIGS_SAMV71_XULT_INCLUDE_BOARD_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+#endif /* __CONFIGS_SAMV71_XULT_INCLUDE_BOARD_H */
diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig
index 3faefef34d..83698f0b8e 100644
--- a/configs/samv71-xult/nsh/defconfig
+++ b/configs/samv71-xult/nsh/defconfig
@@ -283,11 +283,10 @@ CONFIG_ARCH_BOARD="samv71-xult"
 # Common Board Options
 #
 CONFIG_ARCH_HAVE_LEDS=y
-CONFIG_ARCH_LEDS=y
+# CONFIG_ARCH_LEDS is not set
 CONFIG_ARCH_HAVE_BUTTONS=y
-CONFIG_ARCH_BUTTONS=y
+# CONFIG_ARCH_BUTTONS is not set
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
-# CONFIG_ARCH_IRQBUTTONS is not set
 CONFIG_NSH_MMCSDMINOR=0
 
 #
diff --git a/configs/samv71-xult/nsh/setenv.sh b/configs/samv71-xult/nsh/setenv.sh
index 57f2f36093..1174f12bc2 100755
--- a/configs/samv71-xult/nsh/setenv.sh
+++ b/configs/samv71-xult/nsh/setenv.sh
@@ -51,7 +51,7 @@ fi
 # toolchain under Windows.  You will also have to edit this if you install
 # this toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Atmel/Atmel Toolchain/ARM GCC/Native/4.7.3.99/arm-gnu-toolchain/bin"
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/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"
 
 # This is the Cygwin path to the location where I installed the CodeSourcery
@@ -59,9 +59,13 @@ fi
 # the CodeSourcery toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
 
+# This is the path to the location where I installed the devkitARM toolchain
+# You an get this free toolchain from http://devkitpro.org/ or http://sourceforge.net/projects/devkitpro/
+# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/devkitARM/bin"
+
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+# export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"