diff --git a/configs/cloudctrl/README.txt b/configs/cloudctrl/README.txt index 1890dbc4f9..1fbcca7f42 100644 --- a/configs/cloudctrl/README.txt +++ b/configs/cloudctrl/README.txt @@ -195,13 +195,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows - CONFIG_STM32_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + 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_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) If you change the default toolchain, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. @@ -344,8 +344,8 @@ NuttX EABI buildroot Toolchain 8. Edit nuttx/.config to select the buildroot toolchain as described above and below: - -CONFIG_STM32_CODESOURCERYW=y - +CONFIG_STM32_BUILDROOT=y + -CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y + +CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y 9. Edit setenv.h, if necessary, so that the PATH variable includes the path to the newly built binaries. @@ -741,7 +741,7 @@ Where is one of the following: Configures the NuttShell (nsh) located at apps/examples/nsh. The Configuration enables both the serial and telnet NSH interfaces. - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows CONFIG_NSH_DHCPC=n : DHCP is disabled CONFIG_NSH_IPADDR=0x0a000002 : Target IP address 10.0.0.2 CONFIG_NSH_DRIPADDR=0x0a000001 : Host IP address 10.0.0.1 diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig index 15363cb1d0..68c29bc296 100644 --- a/configs/cloudctrl/nsh/defconfig +++ b/configs/cloudctrl/nsh/defconfig @@ -122,7 +122,7 @@ CONFIG_STM32_CODESOURCERYW=y # CONFIG_STM32_ATOLLIC_PRO is not set # CONFIG_STM32_DEVKITARM is not set # CONFIG_STM32_RAISONANCE is not set -# CONFIG_STM32_BUILDROOT is not set +# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_STM32_DFU is not set # diff --git a/configs/ea3131/README.txt b/configs/ea3131/README.txt index 1712a50b86..abc9af883a 100644 --- a/configs/ea3131/README.txt +++ b/configs/ea3131/README.txt @@ -44,13 +44,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_LPC31_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_LPC31_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_LPC31_DEVKITARM=y : devkitARM under Windows - CONFIG_LPC31_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARM_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_ARM_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows + CONFIG_ARM_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain - If you are not using CONFIG_LPC31_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARM_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. The toolchain may also be set using the kconfig-mconf utility (make menuconfig) or by diff --git a/configs/ea3131/pgnsh/Make.defs b/configs/ea3131/pgnsh/Make.defs index 08f47637b2..42facbece7 100644 --- a/configs/ea3131/pgnsh/Make.defs +++ b/configs/ea3131/pgnsh/Make.defs @@ -101,7 +101,7 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -ifneq ($(CONFIG_LPC31_BUILDROOT),y) +ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y) LDFLAGS += -nostartfiles -nodefaultlibs endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/configs/ea3131/usbserial/Make.defs b/configs/ea3131/usbserial/Make.defs index 6ecf2e7130..f6841f9bd7 100644 --- a/configs/ea3131/usbserial/Make.defs +++ b/configs/ea3131/usbserial/Make.defs @@ -101,7 +101,7 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -ifneq ($(CONFIG_LPC31_BUILDROOT),y) +ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y) LDFLAGS += -nostartfiles -nodefaultlibs endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/configs/ea3152/README.txt b/configs/ea3152/README.txt index c895d4f645..c5d3a544fa 100644 --- a/configs/ea3152/README.txt +++ b/configs/ea3152/README.txt @@ -43,13 +43,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_LPC31_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_LPC31_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_LPC31_DEVKITARM=y : devkitARM under Windows - CONFIG_LPC31_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARM_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_ARM_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows + CONFIG_ARM_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain - If you are not using CONFIG_LPC31_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARM_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. The toolchain may also be set using the kconfig-mconf utility (make menuconfig) diff --git a/configs/ea3152/ostest/Make.defs b/configs/ea3152/ostest/Make.defs index b67c35a08a..78aadf455b 100644 --- a/configs/ea3152/ostest/Make.defs +++ b/configs/ea3152/ostest/Make.defs @@ -101,7 +101,7 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -ifneq ($(CONFIG_LPC31_BUILDROOT),y) +ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y) LDFLAGS += -nostartfiles -nodefaultlibs endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/configs/ekk-lm3s9b96/README.txt b/configs/ekk-lm3s9b96/README.txt index 848b75625c..44802f60b1 100644 --- a/configs/ekk-lm3s9b96/README.txt +++ b/configs/ekk-lm3s9b96/README.txt @@ -105,9 +105,9 @@ GNU Toolchain Options CONFIG_LM_CODESOURCERYW=y : CodeSourcery under Windows CONFIG_LM_CODESOURCERYL=y : CodeSourcery under Linux CONFIG_LM_DEVKITARM=y : devkitARM under Windows - CONFIG_LM_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - If you are not using CONFIG_LM_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the CodeSourcery (for Windows) and devkitARM are Windows native toolchains. diff --git a/configs/fire-stm32v2/README.txt b/configs/fire-stm32v2/README.txt index 8e2ce37346..6b93739959 100644 --- a/configs/fire-stm32v2/README.txt +++ b/configs/fire-stm32v2/README.txt @@ -189,13 +189,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows - CONFIG_STM32_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + 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_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) If you change the default toolchain, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig index 0778f1a84a..6c41414c83 100644 --- a/configs/fire-stm32v2/nsh/defconfig +++ b/configs/fire-stm32v2/nsh/defconfig @@ -109,7 +109,7 @@ CONFIG_STM32_CODESOURCERYW=y # CONFIG_STM32_ATOLLIC_PRO is not set # CONFIG_STM32_DEVKITARM is not set # CONFIG_STM32_RAISONANCE is not set -# CONFIG_STM32_BUILDROOT is not set +# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_STM32_DFU is not set # diff --git a/configs/hymini-stm32v/README.txt b/configs/hymini-stm32v/README.txt index 085021f6f9..cd64dcf0d3 100644 --- a/configs/hymini-stm32v/README.txt +++ b/configs/hymini-stm32v/README.txt @@ -45,13 +45,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + 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) - If you are not using CONFIG_STM32_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the CodeSourcery (for Windows), devkitARM, and Raisonance toolchains are diff --git a/configs/kwikstik-k40/README.txt b/configs/kwikstik-k40/README.txt index 60b87c73f5..aeacbd11ba 100644 --- a/configs/kwikstik-k40/README.txt +++ b/configs/kwikstik-k40/README.txt @@ -170,12 +170,12 @@ GNU Toolchain Options use the devkitARM or the NuttX GNU toolchain, you simply need to change the the following configuration options to your .config (or defconfig) file: - CONFIG_KINETIS_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_KINETIS_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_KINETIS_DEVKITARM=y : devkitARM under Windows - CONFIG_KINETIS_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows + CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - If you are not using CONFIG_KINETIS_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the CodeSourcery (for Windows) and devkitARM toolchains are diff --git a/configs/lincoln60/README.txt b/configs/lincoln60/README.txt index 65e6c19e6c..797dcd1878 100644 --- a/configs/lincoln60/README.txt +++ b/configs/lincoln60/README.txt @@ -70,12 +70,12 @@ GNU Toolchain Options the CodeSourcery or devkitARM toolchain, you simply need add one of the following configuration options to your .config (or defconfig) file: - CONFIG_LPC17_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_LPC17_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_LPC17_DEVKITARM=y : devkitARM under Windows - CONFIG_LPC17_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows + CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - If you are not using CONFIG_LPC17_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the CodeSourcery (for Windows)and devkitARM are Windows native toolchains. diff --git a/configs/lm3s6432-s2e/README.txt b/configs/lm3s6432-s2e/README.txt index 89f71c8fe2..becd662a18 100644 --- a/configs/lm3s6432-s2e/README.txt +++ b/configs/lm3s6432-s2e/README.txt @@ -97,12 +97,12 @@ GNU Toolchain Options To use a specific toolchain, you simply need to add one of the following configuration options to your .config (or defconfig) file: - CONFIG_LM_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_LM_CODESOURCERYL=y : CodeSourcery under Linux or on Mac OS X. - CONFIG_LM_DEVKITARM=y : devkitARM under Windows - CONFIG_LM_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux or on Mac OS X. + CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows + CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - If you are not using CONFIG_LM_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the CodeSourcery (for Windows) and devkitARM are Windows native toolchains. diff --git a/configs/lm3s6965-ek/README.txt b/configs/lm3s6965-ek/README.txt index 9b0413aec0..11ffbc8c35 100644 --- a/configs/lm3s6965-ek/README.txt +++ b/configs/lm3s6965-ek/README.txt @@ -206,12 +206,12 @@ GNU Toolchain Options the CodeSourcery or devkitARM, you simply need to add one of the following configuration options to your .config (or defconfig) file: - CONFIG_LM_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_LM_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_LM_DEVKITARM=y : devkitARM under Windows - CONFIG_LM_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows + CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - If you are not using CONFIG_LM_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the CodeSourcery (for Windows) and devkitARM are Windows native toolchains. diff --git a/configs/lpc4330-xplorer/README.txt b/configs/lpc4330-xplorer/README.txt index 342bd0f327..f6d8d00eff 100644 --- a/configs/lpc4330-xplorer/README.txt +++ b/configs/lpc4330-xplorer/README.txt @@ -154,9 +154,9 @@ GNU Toolchain Options CONFIG_LPC43_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows CONFIG_LPC43_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows CONFIG_LPC43_DEVKITARM=y : devkitARM under Windows - CONFIG_LPC43_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - If you are not using CONFIG_LPC43_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the Code Red, CodeSourcery (for Windows), Atollic and devkitARM toolchains diff --git a/configs/lpcxpresso-lpc1768/README.txt b/configs/lpcxpresso-lpc1768/README.txt index 42f23abc06..5be42d413f 100644 --- a/configs/lpcxpresso-lpc1768/README.txt +++ b/configs/lpcxpresso-lpc1768/README.txt @@ -251,12 +251,12 @@ GNU Toolchain Options the other toolchain, you simply need add one of the following configuration options to your .config (or defconfig) file: - CONFIG_LPC17_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_LPC17_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_LPC17_DEVKITARM=y : devkitARM under Windows - CONFIG_LPC17_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - CONFIG_LPC17_CODEREDW=n : Code Red toolchain under Windows - CONFIG_LPC17_CODEREDL=y : Code Red toolchain under Linux + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows + CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_CODEREDW=n : Code Red toolchain under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODEREDL=y : Code Red toolchain under Linux You may also have to modify the PATH in the setenv.h file if your make cannot find the tools. diff --git a/configs/mikroe-stm32f4/README.txt b/configs/mikroe-stm32f4/README.txt index b1af24636e..1a0d29a9b1 100644 --- a/configs/mikroe-stm32f4/README.txt +++ b/configs/mikroe-stm32f4/README.txt @@ -62,13 +62,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows - CONFIG_STM32_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + 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_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) If you change the default toolchain, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. @@ -426,7 +426,7 @@ CFLAGS Only the Atollic toolchain has built-in support for the Cortex-M4 FPU. You will see the following lines in each Make.defs file: - ifeq ($(CONFIG_STM32_ATOLLIC_LITE),y) + ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE),y) # Atollic toolchain under Windows ... ifeq ($(CONFIG_ARCH_FPU),y) @@ -453,22 +453,22 @@ Configuration Changes Below are all of the configuration changes that I had to make to configs/stm3240g-eval/nsh2 in order to successfully build NuttX using the Atollic toolchain WITH FPU support: - -CONFIG_ARCH_FPU=n : Enable FPU support + -CONFIG_ARCH_FPU=n : Enable FPU support +CONFIG_ARCH_FPU=y - -CONFIG_STM32_CODESOURCERYW=y : Disable the CodeSourcery toolchain - +CONFIG_STM32_CODESOURCERYW=n + -CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : Disable the CodeSourcery toolchain + +CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=n - -CONFIG_STM32_ATOLLIC_LITE=n : Enable *one* the Atollic toolchains - CONFIG_STM32_ATOLLIC_PRO=n - -CONFIG_STM32_ATOLLIC_LITE=y : The "Lite" version - CONFIG_STM32_ATOLLIC_PRO=n : The "Pro" version + -CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE=n : Enable *one* the Atollic toolchains + CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_PRO=n + -CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE=y : The "Lite" version + CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_PRO=n : The "Pro" version - -CONFIG_INTELHEX_BINARY=y : Suppress generation FLASH download formats - +CONFIG_INTELHEX_BINARY=n : (Only necessary with the "Lite" version) + -CONFIG_INTELHEX_BINARY=y : Suppress generation FLASH download formats + +CONFIG_INTELHEX_BINARY=n : (Only necessary with the "Lite" version) - -CONFIG_HAVE_CXX=y : Suppress generation of C++ code - +CONFIG_HAVE_CXX=n : (Only necessary with the "Lite" version) + -CONFIG_HAVE_CXX=y : Suppress generation of C++ code + +CONFIG_HAVE_CXX=n : (Only necessary with the "Lite" version) See the section above on Toolchains, NOTE 2, for explanations for some of the configuration settings. Some of the usual settings are just not supported diff --git a/configs/ntosd-dm320/README.txt b/configs/ntosd-dm320/README.txt index a02255ffac..8a3205154d 100644 --- a/configs/ntosd-dm320/README.txt +++ b/configs/ntosd-dm320/README.txt @@ -63,13 +63,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_DM320_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_DM320_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_DM320_DEVKITARM=y : devkitARM under Windows - CONFIG_DM320_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARM_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_ARM_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows + CONFIG_ARM_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain - If you are not using CONFIG_DM320_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARM_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. The toolchain may also be set using the kconfig-mconf utility (make menuconfig) diff --git a/configs/ntosd-dm320/nettest/Make.defs b/configs/ntosd-dm320/nettest/Make.defs index b2d236d436..ae2d26f418 100644 --- a/configs/ntosd-dm320/nettest/Make.defs +++ b/configs/ntosd-dm320/nettest/Make.defs @@ -107,10 +107,9 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't... -### ifneq ($(CONFIG_LPC313X_BUILDROOT),y) ### change to ...DM320... -### LDFLAGS += -nostartfiles -nodefaultlibs -### endif +ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y) + LDFLAGS += -nostartfiles -nodefaultlibs +endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) LDFLAGS += -g endif diff --git a/configs/ntosd-dm320/nsh/Make.defs b/configs/ntosd-dm320/nsh/Make.defs index 703860fcb8..35cd1bc30c 100644 --- a/configs/ntosd-dm320/nsh/Make.defs +++ b/configs/ntosd-dm320/nsh/Make.defs @@ -107,10 +107,9 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't... -### ifneq ($(CONFIG_LPC313X_BUILDROOT),y) ### change to ...DM320... -### LDFLAGS += -nostartfiles -nodefaultlibs -### endif +ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y) + LDFLAGS += -nostartfiles -nodefaultlibs +endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) LDFLAGS += -g endif diff --git a/configs/ntosd-dm320/poll/Make.defs b/configs/ntosd-dm320/poll/Make.defs index 4f46617c44..3542b8cc65 100644 --- a/configs/ntosd-dm320/poll/Make.defs +++ b/configs/ntosd-dm320/poll/Make.defs @@ -107,10 +107,9 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't... -### ifneq ($(CONFIG_LPC313X_BUILDROOT),y) ### change to ...DM320... -### LDFLAGS += -nostartfiles -nodefaultlibs -### endif +ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y) + LDFLAGS += -nostartfiles -nodefaultlibs +endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) LDFLAGS += -g endif diff --git a/configs/ntosd-dm320/thttpd/Make.defs b/configs/ntosd-dm320/thttpd/Make.defs index ffc579b370..590ee75feb 100644 --- a/configs/ntosd-dm320/thttpd/Make.defs +++ b/configs/ntosd-dm320/thttpd/Make.defs @@ -107,10 +107,9 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't... -### ifneq ($(CONFIG_LPC313X_BUILDROOT),y) ### change to ...DM320... -### LDFLAGS += -nostartfiles -nodefaultlibs -### endif +ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y) + LDFLAGS += -nostartfiles -nodefaultlibs +endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) LDFLAGS += -g endif diff --git a/configs/ntosd-dm320/udp/Make.defs b/configs/ntosd-dm320/udp/Make.defs index 1aacd7363e..333fa8d243 100644 --- a/configs/ntosd-dm320/udp/Make.defs +++ b/configs/ntosd-dm320/udp/Make.defs @@ -107,10 +107,9 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't... -### ifneq ($(CONFIG_LPC313X_BUILDROOT),y) ### change to ...DM320... -### LDFLAGS += -nostartfiles -nodefaultlibs -### endif +ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y) + LDFLAGS += -nostartfiles -nodefaultlibs +endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) LDFLAGS += -g endif diff --git a/configs/ntosd-dm320/uip/Make.defs b/configs/ntosd-dm320/uip/Make.defs index d214c4d6cb..f4fdaad67f 100644 --- a/configs/ntosd-dm320/uip/Make.defs +++ b/configs/ntosd-dm320/uip/Make.defs @@ -107,10 +107,9 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't... -### ifneq ($(CONFIG_LPC313X_BUILDROOT),y) ### change to ...DM320... -### LDFLAGS += -nostartfiles -nodefaultlibs -### endif +ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y) + LDFLAGS += -nostartfiles -nodefaultlibs +endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) LDFLAGS += -g endif diff --git a/configs/nucleus2g/README.txt b/configs/nucleus2g/README.txt index a3524397a8..781fdf503c 100644 --- a/configs/nucleus2g/README.txt +++ b/configs/nucleus2g/README.txt @@ -100,12 +100,12 @@ GNU Toolchain Options the CodeSourcery or devkitARM toolchain, you simply need add one of the following configuration options to your .config (or defconfig) file: - CONFIG_LPC17_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_LPC17_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_LPC17_DEVKITARM=y : devkitARM under Windows - CONFIG_LPC17_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows + CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - If you are not using CONFIG_LPC17_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the CodeSourcery (for Windows)and devkitARM are Windows native toolchains. diff --git a/configs/olimex-lpc1766stk/README.txt b/configs/olimex-lpc1766stk/README.txt index 7b11d8f9b8..dbb28047eb 100644 --- a/configs/olimex-lpc1766stk/README.txt +++ b/configs/olimex-lpc1766stk/README.txt @@ -186,12 +186,12 @@ GNU Toolchain Options the CodeSourcery or devkitARM toolchain, you simply need add one of the following configuration options to your .config (or defconfig) file: - CONFIG_LPC17_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_LPC17_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_LPC17_DEVKITARM=y : devkitARM under Windows - CONFIG_LPC17_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows + CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - If you are not using CONFIG_LPC17_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the CodeSourcery (for Windows)and devkitARM are Windows native toolchains. diff --git a/configs/shenzhou/README.txt b/configs/shenzhou/README.txt index 0de786dd83..8096305494 100644 --- a/configs/shenzhou/README.txt +++ b/configs/shenzhou/README.txt @@ -212,13 +212,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows - CONFIG_STM32_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + 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_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) If you change the default toolchain, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. @@ -361,8 +361,8 @@ NuttX EABI buildroot Toolchain 8. Edit nuttx/.config to select the buildroot toolchain as described above and below: - -CONFIG_STM32_CODESOURCERYW=y - +CONFIG_STM32_BUILDROOT=y + -CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y + +CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y 9. Edit setenv.h, if necessary, so that the PATH variable includes the path to the newly built binaries. @@ -758,7 +758,7 @@ Where is one of the following: Configures the NuttShell (nsh) located at apps/examples/nsh. The Configuration enables both the serial and telnet NSH interfaces. - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows CONFIG_NSH_DHCPC=n : DHCP is disabled CONFIG_NSH_IPADDR=0x0a000002 : Target IP address 10.0.0.2 CONFIG_NSH_DRIPADDR=0x0a000001 : Host IP address 10.0.0.1 diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig index 7655a150e6..48f6bd1a4a 100644 --- a/configs/shenzhou/nsh/defconfig +++ b/configs/shenzhou/nsh/defconfig @@ -122,7 +122,7 @@ CONFIG_STM32_CODESOURCERYW=y # CONFIG_STM32_ATOLLIC_PRO is not set # CONFIG_STM32_DEVKITARM is not set # CONFIG_STM32_RAISONANCE is not set -# CONFIG_STM32_BUILDROOT is not set +# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_STM32_DFU is not set # diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig index ddc3df4069..4bc5631574 100644 --- a/configs/shenzhou/thttpd/defconfig +++ b/configs/shenzhou/thttpd/defconfig @@ -109,7 +109,7 @@ CONFIG_STM32_CODESOURCERYW=n # CONFIG_STM32_ATOLLIC_PRO is not set # CONFIG_STM32_DEVKITARM is not set # CONFIG_STM32_RAISONANCE is not set -# CONFIG_STM32_BUILDROOT is not set +# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_STM32_DFU is not set # @@ -970,7 +970,7 @@ CONFIG_NSH_DHCPC=n CONFIG_THTTPD_IPADDR=0xc0a80032 CONFIG_THTTPD_PATH="/mnt/www" CONFIG_FS_NXFFS=y -CONFIG_STM32_BUILDROOT=y +CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_DEBUG_NET=n CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00 CONFIG_MMCSD_SDIO=n diff --git a/configs/spark/README.txt b/configs/spark/README.txt index 141f1ea0e6..1937333eb2 100644 --- a/configs/spark/README.txt +++ b/configs/spark/README.txt @@ -66,13 +66,13 @@ GNU Toolchain Options you simply need to add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=n : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_ATOLLIC_LITE=n : The free, "Lite" version of Atollic toolchain under Windows - CONFIG_STM32_ATOLLIC_PRO=n : The paid, "Pro" version of Atollic toolchain under Windows - CONFIG_STM32_DEVKITARM=n : devkitARM under Windows - CONFIG_STM32_RAISONANCEny : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=n : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=n : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE=n : The free, "Lite" version of Atollic toolchain under Windows + CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_PRO=n : The paid, "Pro" version of Atollic toolchain under Windows + CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=n : devkitARM under Windows + CONFIG_ARMV7M_TOOLCHAIN_RAISONANCEny : Raisonance RIDE7 under Windows + CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=n : NuttX buildroot under Linux or Cygwin (default) If you change the default toolchain, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig index 3f35bd2426..cda6bd4992 100644 --- a/configs/stm3240g-eval/discover/defconfig +++ b/configs/stm3240g-eval/discover/defconfig @@ -127,7 +127,7 @@ CONFIG_STM32_CODESOURCERYL=y # CONFIG_STM32_ATOLLIC_PRO is not set # CONFIG_STM32_DEVKITARM is not set # CONFIG_STM32_RAISONANCE is not set -# CONFIG_STM32_BUILDROOT is not set +# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_STM32_DFU is not set # diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig index 40c56c3fc6..388b698845 100644 --- a/configs/stm3240g-eval/xmlrpc/defconfig +++ b/configs/stm3240g-eval/xmlrpc/defconfig @@ -127,7 +127,7 @@ CONFIG_STM32_CODESOURCERYL=y # CONFIG_STM32_ATOLLIC_PRO is not set # CONFIG_STM32_DEVKITARM is not set # CONFIG_STM32_RAISONANCE is not set -# CONFIG_STM32_BUILDROOT is not set +# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_STM32_DFU is not set # diff --git a/configs/stm32_tiny/README.txt b/configs/stm32_tiny/README.txt index d55f455d0f..1210ccc722 100644 --- a/configs/stm32_tiny/README.txt +++ b/configs/stm32_tiny/README.txt @@ -50,13 +50,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows - CONFIG_STM32_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + 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_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) If you change the default toolchain, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. diff --git a/configs/stm32f100rc_generic/README.txt b/configs/stm32f100rc_generic/README.txt index 7c2a074e38..481a921477 100644 --- a/configs/stm32f100rc_generic/README.txt +++ b/configs/stm32f100rc_generic/README.txt @@ -48,13 +48,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows - CONFIG_STM32_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + 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_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) If you change the default toolchain, then you may also have to modify the PATH in the setenv.sh file if your make cannot find the tools. diff --git a/configs/stm32f100rc_generic/nsh/defconfig b/configs/stm32f100rc_generic/nsh/defconfig index 3d3fb9f861..be0c7c3a56 100644 --- a/configs/stm32f100rc_generic/nsh/defconfig +++ b/configs/stm32f100rc_generic/nsh/defconfig @@ -123,7 +123,7 @@ CONFIG_STM32_CODESOURCERYL=y # CONFIG_STM32_ATOLLIC_PRO is not set # CONFIG_STM32_DEVKITARM is not set # CONFIG_STM32_RAISONANCE is not set -# CONFIG_STM32_BUILDROOT is not set +# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_STM32_DFU is not set # diff --git a/configs/stm32f3discovery/README.txt b/configs/stm32f3discovery/README.txt index 52540d76f2..11a6da3e43 100644 --- a/configs/stm32f3discovery/README.txt +++ b/configs/stm32f3discovery/README.txt @@ -46,13 +46,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows - CONFIG_STM32_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + 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_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) If you change the default toolchain, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. @@ -369,7 +369,7 @@ CFLAGS Only the Atollic toolchain has built-in support for the Cortex-M4 FPU. You will see the following lines in each Make.defs file: - ifeq ($(CONFIG_STM32_ATOLLIC_LITE),y) + ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE),y) # Atollic toolchain under Windows ... ifeq ($(CONFIG_ARCH_FPU),y) @@ -396,22 +396,22 @@ Configuration Changes Below are all of the configuration changes that I had to make to configs/stm3240g-eval/nsh2 in order to successfully build NuttX using the Atollic toolchain WITH FPU support: - -CONFIG_ARCH_FPU=n : Enable FPU support + -CONFIG_ARCH_FPU=n : Enable FPU support +CONFIG_ARCH_FPU=y - -CONFIG_STM32_CODESOURCERYW=y : Disable the CodeSourcery toolchain - +CONFIG_STM32_CODESOURCERYW=n + -CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : Disable the CodeSourcery toolchain + +CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=n - -CONFIG_STM32_ATOLLIC_LITE=n : Enable *one* the Atollic toolchains - CONFIG_STM32_ATOLLIC_PRO=n - -CONFIG_STM32_ATOLLIC_LITE=y : The "Lite" version - CONFIG_STM32_ATOLLIC_PRO=n : The "Pro" version + -CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE=n : Enable *one* the Atollic toolchains + CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_PRO=n + -CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE=y : The "Lite" version + CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_PRO=n : The "Pro" version - -CONFIG_INTELHEX_BINARY=y : Suppress generation FLASH download formats - +CONFIG_INTELHEX_BINARY=n : (Only necessary with the "Lite" version) + -CONFIG_INTELHEX_BINARY=y : Suppress generation FLASH download formats + +CONFIG_INTELHEX_BINARY=n : (Only necessary with the "Lite" version) - -CONFIG_HAVE_CXX=y : Suppress generation of C++ code - +CONFIG_HAVE_CXX=n : (Only necessary with the "Lite" version) + -CONFIG_HAVE_CXX=y : Suppress generation of C++ code + +CONFIG_HAVE_CXX=n : (Only necessary with the "Lite" version) See the section above on Toolchains, NOTE 2, for explanations for some of the configuration settings. Some of the usual settings are just not supported diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt index 2a6416ba57..b12dc49dbf 100644 --- a/configs/stm32f4discovery/README.txt +++ b/configs/stm32f4discovery/README.txt @@ -63,13 +63,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows - CONFIG_STM32_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + 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_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) If you change the default toolchain, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. @@ -466,7 +466,7 @@ CFLAGS Only the Atollic toolchain has built-in support for the Cortex-M4 FPU. You will see the following lines in each Make.defs file: - ifeq ($(CONFIG_STM32_ATOLLIC_LITE),y) + ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE),y) # Atollic toolchain under Windows ... ifeq ($(CONFIG_ARCH_FPU),y) @@ -496,13 +496,13 @@ in order to successfully build NuttX using the Atollic toolchain WITH FPU suppor -CONFIG_ARCH_FPU=n : Enable FPU support +CONFIG_ARCH_FPU=y - -CONFIG_STM32_CODESOURCERYW=y : Disable the CodeSourcery toolchain - +CONFIG_STM32_CODESOURCERYW=n + -CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : Disable the CodeSourcery toolchain + +CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=n - -CONFIG_STM32_ATOLLIC_LITE=n : Enable *one* the Atollic toolchains - CONFIG_STM32_ATOLLIC_PRO=n - -CONFIG_STM32_ATOLLIC_LITE=y : The "Lite" version - CONFIG_STM32_ATOLLIC_PRO=n : The "Pro" version + -CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE=n : Enable *one* the Atollic toolchains + CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_PRO=n + -CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE=y : The "Lite" version + CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_PRO=n : The "Pro" version -CONFIG_INTELHEX_BINARY=y : Suppress generation FLASH download formats +CONFIG_INTELHEX_BINARY=n : (Only necessary with the "Lite" version) @@ -1105,9 +1105,9 @@ Where is one of the following: 2. Default platform/toolchain: - CONFIG_HOST_WINDOWS=y : Windows - CONFIG_WINDOWS_CYGWIN=y : Cygwin environment on Windows - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_HOST_WINDOWS=y : Windows + CONFIG_WINDOWS_CYGWIN=y : Cygwin environment on Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows 3. By default, this project assumes that you are *NOT* using the DFU bootloader. @@ -1411,8 +1411,8 @@ Where is one of the following: An example using the NuttX graphics system (NX). This example focuses on placing lines on the background in various orientations. - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_LCD_LANDSCAPE=y : 320x240 landscape orientation + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_LCD_LANDSCAPE=y : 320x240 landscape orientation The STM32F4Discovery board does not have any graphics capability. This configuration assumes that you have connected an SD1289-based LCD as @@ -1502,9 +1502,9 @@ Where is one of the following: 2. Default configuration is Cygwin under windows using the CodeSourcery toolchain: - CONFIG_HOST_WINDOWS=y : Windows - CONFIG_WINDOWS_CYGWIN=y : Cygwin - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_HOST_WINDOWS=y : Windows + CONFIG_WINDOWS_CYGWIN=y : Cygwin + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows 3. CONFIG_ARCH_CUSTOM_PMINIT and CONFIG_ARCH_IDLE_CUSTOM are necessary parts of the PM configuration: @@ -1561,9 +1561,9 @@ Where is one of the following: 2. Default toolchain: - CONFIG_HOST_WINDOWS=y : Builds under windows - CONFIG_WINDOWS_CYGWIN=y : Using Cygwin and - CONFIG_STM32_CODESOURCERYW=y : The native Windows CodeSourcery toolchain + CONFIG_HOST_WINDOWS=y : Builds under windows + CONFIG_WINDOWS_CYGWIN=y : Using Cygwin and + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : The native Windows CodeSourcery toolchain 3. By default, this project assumes that you are *NOT* using the DFU bootloader. @@ -1671,9 +1671,9 @@ Where is one of the following: standard issue, CMD.exe shell: ConEmu which can be downloaded from: http://code.google.com/p/conemu-maximus5/ - CONFIG_HOST_WINDOWS=y : Windows - CONFIG_WINDOWS_NATIVE=y : Native Windows environment - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_HOST_WINDOWS=y : Windows + CONFIG_WINDOWS_NATIVE=y : Native Windows environment + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows Build Tools. The build still relies on some Unix-like commands. I use the GNUWin32 tools that can be downloaded from http://gnuwin32.sourceforge.net/. diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig index 90307fab0b..06ba74df98 100644 --- a/configs/stm32f4discovery/winbuild/defconfig +++ b/configs/stm32f4discovery/winbuild/defconfig @@ -130,7 +130,7 @@ CONFIG_STM32_CODESOURCERYW=y # CONFIG_STM32_ATOLLIC_PRO is not set # CONFIG_STM32_DEVKITARM is not set # CONFIG_STM32_RAISONANCE is not set -# CONFIG_STM32_BUILDROOT is not set +# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_STM32_DFU is not set # diff --git a/configs/stm32ldiscovery/README.txt b/configs/stm32ldiscovery/README.txt index 5ee92c3a94..d1da30f2af 100644 --- a/configs/stm32ldiscovery/README.txt +++ b/configs/stm32ldiscovery/README.txt @@ -211,13 +211,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows - CONFIG_STM32_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + 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_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) If you change the default toolchain, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. diff --git a/configs/stm32vldiscovery/README.txt b/configs/stm32vldiscovery/README.txt index 123ec34da0..acdb3697c5 100644 --- a/configs/stm32vldiscovery/README.txt +++ b/configs/stm32vldiscovery/README.txt @@ -44,13 +44,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows - CONFIG_STM32_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + 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_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) If you change the default toolchain, then you may also have to modify the PATH in the setenv.sh file if your make cannot find the tools. diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig index c117a2d05c..a43f6c5885 100644 --- a/configs/stm32vldiscovery/nsh/defconfig +++ b/configs/stm32vldiscovery/nsh/defconfig @@ -123,7 +123,7 @@ CONFIG_STM32_CODESOURCERYL=y # CONFIG_STM32_ATOLLIC_PRO is not set # CONFIG_STM32_DEVKITARM is not set # CONFIG_STM32_RAISONANCE is not set -# CONFIG_STM32_BUILDROOT is not set +# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_STM32_DFU is not set # diff --git a/configs/twr-k60n512/README.txt b/configs/twr-k60n512/README.txt index ac10d1538e..39caaee835 100644 --- a/configs/twr-k60n512/README.txt +++ b/configs/twr-k60n512/README.txt @@ -307,12 +307,12 @@ GNU Toolchain Options use the devkitARM or the NuttX GNU toolchain, you simply need to change the the following configuration options to your .config (or defconfig) file: - CONFIG_KINETIS_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_KINETIS_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_KINETIS_DEVKITARM=y : devkitARM under Windows - CONFIG_KINETIS_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows + CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - If you are not using CONFIG_KINETIS_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the CodeSourcery (for Windows) and devkitARM toolchains are diff --git a/configs/vsn/README.txt b/configs/vsn/README.txt index 05f295b8af..9e5256d55b 100644 --- a/configs/vsn/README.txt +++ b/configs/vsn/README.txt @@ -45,13 +45,13 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_STM32_DEVKITARM=y : devkitARM under Windows - CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows - CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux + 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) - If you are not using CONFIG_STM32_BUILDROOT, then you may also have to modify + If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the CodeSourcery (for Windows), devkitARM, and Raisonance toolchains are