summaryrefslogtreecommitdiff
path: root/nuttx/configs/cloudctrl
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-03-05 16:29:58 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-03-05 16:29:58 -0600
commitade00d9f50648e66e78a562b0c6a83daa3ebe7a2 (patch)
tree88557a0add53d217566b83b3e5ea90b2dbbfcd1a /nuttx/configs/cloudctrl
parent24a92b4f1dfb8c0f3fd978c2a952f1eff61919e2 (diff)
downloadnuttx-ade00d9f50648e66e78a562b0c6a83daa3ebe7a2.tar.gz
nuttx-ade00d9f50648e66e78a562b0c6a83daa3ebe7a2.tar.bz2
nuttx-ade00d9f50648e66e78a562b0c6a83daa3ebe7a2.zip
Use common naming for rest of the toolchains too
Diffstat (limited to 'nuttx/configs/cloudctrl')
-rw-r--r--nuttx/configs/cloudctrl/README.txt3
-rw-r--r--nuttx/configs/cloudctrl/nsh/defconfig11
2 files changed, 6 insertions, 8 deletions
diff --git a/nuttx/configs/cloudctrl/README.txt b/nuttx/configs/cloudctrl/README.txt
index 1fbcca7f4..24d673726 100644
--- a/nuttx/configs/cloudctrl/README.txt
+++ b/nuttx/configs/cloudctrl/README.txt
@@ -197,8 +197,7 @@ GNU Toolchain Options
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux
- CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows
- CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows
+ CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC=y : The Atollic toolchain under Windows
CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows
CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE=y : Raisonance RIDE7 under Windows
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default)
diff --git a/nuttx/configs/cloudctrl/nsh/defconfig b/nuttx/configs/cloudctrl/nsh/defconfig
index 68c29bc29..c47ccac1c 100644
--- a/nuttx/configs/cloudctrl/nsh/defconfig
+++ b/nuttx/configs/cloudctrl/nsh/defconfig
@@ -116,12 +116,11 @@ CONFIG_ARCH_CHIP_STM32F107VC=y
# CONFIG_ARCH_CHIP_STM32F407IG is not set
CONFIG_STM32_STM32F10XX=y
CONFIG_STM32_CONNECTIVITYLINE=y
-CONFIG_STM32_CODESOURCERYW=y
-# CONFIG_STM32_CODESOURCERYL is not set
-# CONFIG_STM32_ATOLLIC_LITE is not set
-# CONFIG_STM32_ATOLLIC_PRO is not set
-# CONFIG_STM32_DEVKITARM is not set
-# CONFIG_STM32_RAISONANCE is not set
+CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
+# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
# CONFIG_STM32_DFU is not set