diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-27 19:50:35 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-27 19:50:35 +0000 |
| commit | 34abeda54d7093df62fc2808601c7d7e0bb2ab1c (patch) | |
| tree | 84593559b23d580c9330f7c2ca516069a166c789 /nuttx/configs/stm32f4discovery/nsh | |
| parent | a500a9ab6d73b61328c3e42e4b1e103ad0656e07 (diff) | |
| download | px4-nuttx-34abeda54d7093df62fc2808601c7d7e0bb2ab1c.tar.gz px4-nuttx-34abeda54d7093df62fc2808601c7d7e0bb2ab1c.tar.bz2 px4-nuttx-34abeda54d7093df62fc2808601c7d7e0bb2ab1c.zip | |
Add support for the Atollic Pro toolchain; Change extension .ihx to .hex to be better compatible with most of the rest of the world
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4431 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm32f4discovery/nsh')
| -rw-r--r-- | nuttx/configs/stm32f4discovery/nsh/Make.defs | 13 | ||||
| -rwxr-xr-x | nuttx/configs/stm32f4discovery/nsh/defconfig | 3 | ||||
| -rwxr-xr-x | nuttx/configs/stm32f4discovery/nsh/setenv.sh | 3 |
3 files changed, 16 insertions, 3 deletions
diff --git a/nuttx/configs/stm32f4discovery/nsh/Make.defs b/nuttx/configs/stm32f4discovery/nsh/Make.defs index 60d264c50..e1e285019 100644 --- a/nuttx/configs/stm32f4discovery/nsh/Make.defs +++ b/nuttx/configs/stm32f4discovery/nsh/Make.defs @@ -51,7 +51,7 @@ ifeq ($(CONFIG_STM32_CODESOURCERYL),y) ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft MAXOPTIMIZATION = -O2 endif -ifeq ($(CONFIG_STM32_ATOLLIC),y) +ifeq ($(CONFIG_STM32_ATOLLIC_LITE),y) # Atollic toolchain under Windows CROSSDEV = arm-atollic-eabi- ARCROSSDEV = @@ -62,6 +62,17 @@ else ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft endif endif +ifeq ($(CONFIG_STM32_ATOLLIC_PRO),y) + # Atollic toolchain under Windows + CROSSDEV = arm-atollic-eabi- + ARCROSSDEV = arm-atollic-eabi- + WINTOOL = y +ifeq ($(CONFIG_ARCH_FPU),y) + ARCHCPUFLAGS = -mcpu=cortex-m4 -mthumb -march=armv7e-m -mfpu=fpv4-sp-d16 -mfloat-abi=hard +else + ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft +endif +endif ifeq ($(CONFIG_STM32_DEVKITARM),y) # devkitARM under Windows CROSSDEV = arm-eabi- diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig index 5bc628323..61c4d51f5 100755 --- a/nuttx/configs/stm32f4discovery/nsh/defconfig +++ b/nuttx/configs/stm32f4discovery/nsh/defconfig @@ -97,7 +97,8 @@ CONFIG_ARCH_DMA=n # CONFIG_STM32_CODESOURCERYW=n CONFIG_STM32_CODESOURCERYL=y -CONFIG_STM32_ATOLLIC=n +CONFIG_STM32_ATOLLIC_LITE=n +CONFIG_STM32_ATOLLIC_PRO=n CONFIG_STM32_DEVKITARM=n CONFIG_STM32_RAISONANCE=n CONFIG_STM32_BUILDROOT=n diff --git a/nuttx/configs/stm32f4discovery/nsh/setenv.sh b/nuttx/configs/stm32f4discovery/nsh/setenv.sh index 22fbebab2..c131e3b76 100755 --- a/nuttx/configs/stm32f4discovery/nsh/setenv.sh +++ b/nuttx/configs/stm32f4discovery/nsh/setenv.sh @@ -57,9 +57,10 @@ 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 +# 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 # the CodeSourcery toolchain in any other location +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin" #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 |