diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-21 19:54:44 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-21 19:54:44 +0000 |
| commit | 3689d913ceb2bb52b808e0e5598e83bcfdd88134 (patch) | |
| tree | 8d04a7378abacc76fc1078ee585c593f141ecc64 /nuttx/configs/cloudctrl/nsh | |
| parent | 14a77ec91b12454c9106836b3d4a08c63a098e1d (diff) | |
| download | px4-nuttx-3689d913ceb2bb52b808e0e5598e83bcfdd88134.tar.gz px4-nuttx-3689d913ceb2bb52b808e0e5598e83bcfdd88134.tar.bz2 px4-nuttx-3689d913ceb2bb52b808e0e5598e83bcfdd88134.zip | |
/configs/stm32f4discovery/winbuild and configs/cloudctrl upated to use Mike's Toolchain.defs; Fix error introduced into tools/configure.sh
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5380 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/cloudctrl/nsh')
| -rw-r--r-- | nuttx/configs/cloudctrl/nsh/Make.defs | 58 |
1 files changed, 1 insertions, 57 deletions
diff --git a/nuttx/configs/cloudctrl/nsh/Make.defs b/nuttx/configs/cloudctrl/nsh/Make.defs index a33f8d317..2b5302947 100644 --- a/nuttx/configs/cloudctrl/nsh/Make.defs +++ b/nuttx/configs/cloudctrl/nsh/Make.defs @@ -35,63 +35,7 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk - -# Setup for the selected toolchain - -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_LITE),y) - # Atollic toolchain under Windows - CROSSDEV = arm-atollic-eabi- - ARCROSSDEV = - WINTOOL = y - ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft -endif -ifeq ($(CONFIG_STM32_ATOLLIC_PRO),y) - # Atollic toolchain under Windows - CROSSDEV = arm-atollic-eabi- - ARCROSSDEV = arm-atollic-eabi- - 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 - # OABI - # CROSSDEV = arm-nuttx-elf- - # ARCROSSDEV = arm-nuttx-elf- - # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft - # EABI - CROSSDEV = arm-nuttx-eabi- - ARCROSSDEV = arm-nuttx-eabi- - ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft - MAXOPTIMIZATION = -Os -endif +include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs # Pick the linker script |