Add support for the Atollic 'Lite' toolchain in all STM32 F4 configurations

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4417 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 22 insertions, 4 deletions

diff --git a/nuttx/configs/stm3240g-eval/nsh/Make.defs b/nuttx/configs/stm3240g-eval/nsh/Make.defs
index cd612aa3e..ad84f4038 100644
--- a/nuttx/configs/stm3240g-eval/nsh/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nsh/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3240g-eval/nsh/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,30 +40,42 @@ include ${TOPDIR}/.config
 ifeq ($(CONFIG_STM32_CODESOURCERYW),y)
   # CodeSourcery under Windows
   CROSSDEV = arm-none-eabi-
+  ARCROSSDEV = arm-none-eabi-
   WINTOOL = y
   ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
 endif
 ifeq ($(CONFIG_STM32_CODESOURCERYL),y)
   # CodeSourcery under Linux
   CROSSDEV = arm-none-eabi-
+  ARCROSSDEV = arm-none-eabi-
   ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -O2
 endif
+ifeq ($(CONFIG_STM32_ATOLLIC),y)
+  # Atollic toolchain under Windows
+  CROSSDEV = arm-atollic-eabi-
+  ARCROSSDEV =
+  WINTOOL = y
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+endif
 ifeq ($(CONFIG_STM32_DEVKITARM),y)
   # devkitARM under Windows
   CROSSDEV = arm-eabi-
+  ARCROSSDEV = arm-eabi-
   WINTOOL = y
   ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
 endif
 ifeq ($(CONFIG_STM32_RAISONANCE),y)
   # Raisonance RIDE7 under Windows
   CROSSDEV = arm-none-eabi-
+  ARCROSSDEV = arm-none-eabi-
   WINTOOL = y
   ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
   CROSSDEV = arm-elf-
+  ARCROSSDEV = arm-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -91,8 +103,8 @@ CC = $(CROSSDEV)gcc
 CXX = $(CROSSDEV)g++
 CPP = $(CROSSDEV)gcc -E
 LD = $(CROSSDEV)ld
-AR = $(CROSSDEV)ar rcs
-NM = $(CROSSDEV)nm
+AR = $(ARCROSSDEV)ar rcs
+NM = $(ARCROSSDEV)nm
 OBJCOPY = $(CROSSDEV)objcopy
 OBJDUMP = $(CROSSDEV)objdump
 
diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig
index d3f9ecfa3..75becc839 100644
--- a/nuttx/configs/stm3240g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh/defconfig
@@ -97,6 +97,7 @@ CONFIG_ARCH_DMA=n
 #
 CONFIG_STM32_CODESOURCERYW=y
 CONFIG_STM32_CODESOURCERYL=n
+CONFIG_STM32_ATOLLIC=n
 CONFIG_STM32_DEVKITARM=n
 CONFIG_STM32_RAISONANCE=n
 CONFIG_STM32_BUILDROOT=n
diff --git a/nuttx/configs/stm3240g-eval/nsh/setenv.sh b/nuttx/configs/stm3240g-eval/nsh/setenv.sh
index 265520997..aacd28089 100755
--- a/nuttx/configs/stm3240g-eval/nsh/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/nsh/setenv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # configs/stm3240g-eval/nsh/setenv.sh
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,11 @@ fi
 # the CodeSourcery toolchain in any other location
 export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
 
+# This the Cygwin path to the location where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the CodeSourcery toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
 # This the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"