SAMV7-XULT: Switch back to the CodeSourcery tools

3 files changed, 9 insertions, 12 deletions

diff --git a/nuttx/configs/samv71-xult/README.txt b/nuttx/configs/samv71-xult/README.txt
index 72c1e42ad..fc564b284 100644
--- a/nuttx/configs/samv71-xult/README.txt
+++ b/nuttx/configs/samv71-xult/README.txt
@@ -234,19 +234,16 @@ NOTES:
      output on USART3 (i.e., for the Arduino serial shield).
 
   3. All of these configurations are set up to build under Windows using the
-     devkitARM toolchain (unless stated otherwise in the description of
+     CodeSourcery toolchain (unless stated otherwise in the description of
      the configuration).  That build selection can easily be reconfigured
      using 'make menuconfig'.  Here are the relevant current settings:
 
      Build Setup:
-       CONFIG_HOST_WINDOWS=y               : Window environment
-       CONFIG_WINDOWS_CYGWIN=y             : Cywin under Windows
+       CONFIG_HOST_WINDOWS=y                   : Window environment
+       CONFIG_WINDOWS_CYGWIN=y                 : Cywin under Windows
 
      System Type -> Toolchain:
-       CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y : devkitARM toolchain
-
-    You an get the free devkitARM toolchain from http://devkitpro.org/ or
-    http://sourceforge.net/projects/devkitpro/
+       CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : devkitARM toolchain
 
 Configuration sub-directories
 -----------------------------
diff --git a/nuttx/configs/samv71-xult/nsh/defconfig b/nuttx/configs/samv71-xult/nsh/defconfig
index de0f8a754..55eabdab8 100644
--- a/nuttx/configs/samv71-xult/nsh/defconfig
+++ b/nuttx/configs/samv71-xult/nsh/defconfig
@@ -129,8 +129,8 @@ CONFIG_ARMV7M_HAVE_DTCM=y
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
-CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y
+CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
+# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
@@ -511,7 +511,6 @@ CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 # CONFIG_SERIAL_TERMIOS is not set
-# CONFIG_UART0_SERIAL_CONSOLE is not set
 CONFIG_UART3_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -754,6 +753,7 @@ CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 CONFIG_WEBCLIENT_TIMEOUT=10
+# CONFIG_NETUTILS_PPPD is not set
 
 #
 # FreeModBus
diff --git a/nuttx/configs/samv71-xult/nsh/setenv.sh b/nuttx/configs/samv71-xult/nsh/setenv.sh
index c040f5952..d27fec489 100755
--- a/nuttx/configs/samv71-xult/nsh/setenv.sh
+++ b/nuttx/configs/samv71-xult/nsh/setenv.sh
@@ -57,11 +57,11 @@ 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"
+export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/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"
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/devkitARM/bin"
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.