From 2246afcdd858f720d6dcc2baca55fa80a81e8a27 Mon Sep 17 00:00:00 2001 From: "chao.an" Date: Tue, 19 Apr 2022 00:02:33 +0800 Subject: [PATCH] arch/armv7-m: Unify the toolchain definition of eabi/clang/iar for linux and windows Signed-off-by: chao.an --- arch/arm/src/armv7-m/Kconfig | 41 ++++--------------- arch/arm/src/armv7-m/Toolchain.defs | 16 +------- boards/arm/dm320/ntosd-dm320/README.txt | 2 +- boards/arm/efm32/efm32-g8xx-stk/README.txt | 2 +- boards/arm/efm32/efm32gg-stk3700/README.txt | 2 +- .../efm32/olimex-efm32g880f128-stk/README.txt | 2 +- .../arm/eoss3/quickfeather/scripts/Make.defs | 2 +- boards/arm/imx6/sabre-6quad/README.txt | 2 +- boards/arm/kinetis/freedom-k64f/README.txt | 4 +- boards/arm/kinetis/freedom-k66f/README.txt | 4 +- boards/arm/kinetis/teensy-3.x/README.txt | 4 +- .../kinetis/teensy-3.x/configs/nsh/defconfig | 1 - boards/arm/kl/freedom-kl25z/README.txt | 2 +- boards/arm/kl/freedom-kl26z/README.txt | 2 +- boards/arm/lpc17xx_40xx/lincoln60/README.txt | 2 +- .../lpc17xx_40xx/lpc4088-devkit/README.txt | 2 +- .../lpc4088-quickstart/README.txt | 2 +- .../lpcxpresso-lpc1768/README.txt | 2 +- .../lpc17xx_40xx/olimex-lpc1766stk/README.txt | 6 +-- boards/arm/lpc17xx_40xx/open1788/README.txt | 2 +- boards/arm/lpc43xx/bambino-200e/README.txt | 2 +- boards/arm/lpc43xx/lpc4330-xplorer/README.txt | 4 +- boards/arm/lpc43xx/lpc4337-ws/README.txt | 4 +- boards/arm/lpc43xx/lpc4357-evb/README.txt | 4 +- boards/arm/lpc43xx/lpc4370-link2/README.txt | 4 +- .../lpc54xx/lpcxpresso-lpc54628/README.txt | 2 +- boards/arm/nuc1xx/nutiny-nuc120/README.txt | 2 +- boards/arm/sam34/arduino-due/README.txt | 2 +- boards/arm/sam34/flipnclick-sam3x/README.txt | 2 +- boards/arm/sam34/sam3u-ek/README.txt | 2 +- boards/arm/sam34/sam4e-ek/README.txt | 2 +- boards/arm/sam34/sam4l-xplained/README.txt | 2 +- .../arm/sam34/sam4s-xplained-pro/README.txt | 2 +- boards/arm/sam34/sam4s-xplained/README.txt | 2 +- boards/arm/samd2l2/saml21-xplained/README.txt | 4 +- boards/arm/samv7/same70-qmtech/README.txt | 2 +- boards/arm/samv7/same70-xplained/README.txt | 2 +- boards/arm/samv7/samv71-xult/README.txt | 2 +- boards/arm/stm32/clicker2-stm32/README.txt | 2 +- boards/arm/stm32/cloudctrl/README.txt | 2 +- boards/arm/stm32/hymini-stm32v/README.txt | 2 +- boards/arm/stm32/mikroe-stm32f4/README.txt | 4 +- boards/arm/stm32/nucleo-f446re/README.txt | 2 +- .../arm/stm32/nucleo-f446re/scripts/Make.defs | 2 +- boards/arm/stm32/nucleo-f4x1re/README.txt | 2 +- .../arm/stm32/nucleo-f4x1re/scripts/Make.defs | 2 +- boards/arm/stm32/shenzhou/README.txt | 2 +- boards/arm/stm32/stm3210e-eval/README.txt | 4 +- boards/arm/stm32/stm3220g-eval/README.txt | 8 ++-- boards/arm/stm32/stm3240g-eval/README.txt | 12 +++--- boards/arm/stm32/stm32_tiny/README.txt | 4 +- boards/arm/stm32/stm32f103-minimum/README.txt | 2 +- boards/arm/stm32/stm32f3discovery/README.txt | 4 +- boards/arm/stm32/stm32f429i-disco/README.txt | 2 +- boards/arm/stm32/stm32f4discovery/README.txt | 16 ++++---- .../configs/testlibcxx/defconfig | 1 - .../stm32/stm32f4discovery/scripts/Make.defs | 2 +- boards/arm/stm32/stm32ldiscovery/README.txt | 2 +- boards/arm/stm32/stm32vldiscovery/README.txt | 2 +- .../arm/stm32/viewtool-stm32f107/README.txt | 6 +-- .../arm/stm32f0l0g0/nucleo-f072rb/README.txt | 2 +- .../arm/stm32f0l0g0/nucleo-f091rc/README.txt | 2 +- boards/arm/stm32f7/nucleo-144/README.txt | 4 +- .../arm/stm32f7/stm32f746g-disco/README.txt | 2 +- .../stm32f746g-disco/configs/fb/defconfig | 1 - .../stm32f746g-disco/configs/nsh/defconfig | 1 - .../stm32f746g-disco/scripts/Make.defs | 2 +- boards/arm/stm32l4/b-l475e-iot01a/README.txt | 2 +- boards/arm/stm32l4/nucleo-l432kc/README.txt | 2 +- boards/arm/stm32l4/nucleo-l452re/README.txt | 2 +- boards/arm/stm32l4/nucleo-l476rg/README.txt | 2 +- boards/arm/stm32l4/nucleo-l496zg/README.txt | 2 +- .../arm/stm32l4/stm32l476vg-disco/README.txt | 2 +- .../arm/stm32l4/stm32l4r9ai-disco/README.txt | 2 +- boards/arm/tiva/dk-tm4c129x/README.txt | 2 +- boards/arm/tiva/eagle100/README.txt | 5 +-- boards/arm/tiva/lm3s6965-ek/README.txt | 2 +- .../arm/tms570/launchxl-tms57004/README.txt | 4 +- boards/arm/xmc4/xmc4500-relax/README.txt | 2 +- tools/README.txt | 6 +-- tools/ci/testlist/arm-01.dat | 2 +- tools/ci/testlist/arm-02.dat | 2 +- tools/ci/testlist/arm-03.dat | 2 +- tools/ci/testlist/arm-04.dat | 12 +++--- tools/ci/testlist/arm-05.dat | 6 +-- tools/ci/testlist/arm-06.dat | 8 ++-- tools/ci/testlist/arm-07.dat | 8 ++-- tools/ci/testlist/arm-08.dat | 10 ++--- tools/ci/testlist/arm-09.dat | 14 +++---- tools/ci/testlist/arm-10.dat | 16 ++++---- tools/ci/testlist/arm-11.dat | 8 ++-- tools/ci/testlist/arm-12.dat | 4 +- tools/ci/testlist/arm-13.dat | 6 +-- tools/ci/testlist/macos.dat | 2 +- 94 files changed, 171 insertions(+), 211 deletions(-) diff --git a/arch/arm/src/armv7-m/Kconfig b/arch/arm/src/armv7-m/Kconfig index 87c7c2297b..03f2aafc2f 100644 --- a/arch/arm/src/armv7-m/Kconfig +++ b/arch/arm/src/armv7-m/Kconfig @@ -88,53 +88,30 @@ config ARMV7M_DTCM choice prompt "Toolchain Selection" - default ARMV7M_TOOLCHAIN_GNU_EABIW if TOOLCHAIN_WINDOWS - default ARMV7M_TOOLCHAIN_GNU_EABIL if !TOOLCHAIN_WINDOWS + default ARMV7M_TOOLCHAIN_GNU_EABI -config ARMV7M_TOOLCHAIN_IARW - bool "IAR for Windows" - depends on TOOLCHAIN_WINDOWS +config ARMV7M_TOOLCHAIN_IAR + bool "IAR ANSI C/C++ toolchain" select CYGWIN_WINTOOL if WINDOWS_CYGWIN select ARCH_TOOLCHAIN_IAR -config ARMV7M_TOOLCHAIN_IARL - bool "IAR for Linux" - depends on HOST_LINUX - select ARCH_TOOLCHAIN_IAR - config ARMV7M_TOOLCHAIN_BUILDROOT bool "Buildroot (Cygwin or Linux)" depends on !WINDOWS_NATIVE select ARCH_TOOLCHAIN_GNU -config ARMV7M_TOOLCHAIN_GNU_EABIL - bool "Generic GNU EABI toolchain under Linux (or other POSIX environment)" - depends on !WINDOWS_NATIVE - select ARCH_TOOLCHAIN_GNU - ---help--- - This option should work for any modern GNU toolchain (GCC 4.5 or newer) - configured for arm-none-eabi. - -config ARMV7M_TOOLCHAIN_GNU_EABIW - bool "Generic GNU EABI toolchain under Windows" - depends on TOOLCHAIN_WINDOWS - select CYGWIN_WINTOOL if WINDOWS_CYGWIN - select ARCH_TOOLCHAIN_GNU - -config ARMV7M_TOOLCHAIN_CLANGL - bool "Generic Clang toolchain under Linux (or other POSIX environment)" - depends on !WINDOWS_NATIVE - select ARCH_TOOLCHAIN_GNU - -config ARMV7M_TOOLCHAIN_CLANGW - bool "Generic Clang toolchain under Windows" - depends on TOOLCHAIN_WINDOWS +config ARMV7M_TOOLCHAIN_GNU_EABI + bool "Generic GNU EABI toolchain" select CYGWIN_WINTOOL if WINDOWS_CYGWIN select ARCH_TOOLCHAIN_GNU ---help--- This option should work for any modern GNU toolchain (GCC 4.5 or newer) configured for arm-none-eabi. +config ARMV7M_TOOLCHAIN_CLANG + bool "Generic Clang toolchain" + select ARCH_TOOLCHAIN_GNU + endchoice config ARMV7M_OABI_TOOLCHAIN diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs index 1c45efff8f..03f1bf1911 100644 --- a/arch/arm/src/armv7-m/Toolchain.defs +++ b/arch/arm/src/armv7-m/Toolchain.defs @@ -34,25 +34,13 @@ ifeq ($(filter y, \ endif ifeq ($(filter y, \ - $(CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL) \ + $(CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI) \ ),y) CONFIG_ARMV7M_TOOLCHAIN ?= GNU_EABI endif ifeq ($(filter y, \ - $(CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW) \ - ),y) - CONFIG_ARMV7M_TOOLCHAIN ?= GNU_EABI -endif - -ifeq ($(filter y, \ - $(CONFIG_ARMV7M_TOOLCHAIN_CLANGL) \ - ),y) - CONFIG_ARMV7M_TOOLCHAIN ?= CLANG -endif - -ifeq ($(filter y, \ - $(CONFIG_ARMV7M_TOOLCHAIN_CLANGW) \ + $(CONFIG_ARMV7M_TOOLCHAIN_CLANG) \ ),y) CONFIG_ARMV7M_TOOLCHAIN ?= CLANG endif diff --git a/boards/arm/dm320/ntosd-dm320/README.txt b/boards/arm/dm320/ntosd-dm320/README.txt index 1ac832def9..3c85c86942 100644 --- a/boards/arm/dm320/ntosd-dm320/README.txt +++ b/boards/arm/dm320/ntosd-dm320/README.txt @@ -239,7 +239,7 @@ Common Configuration Notes Linux. This is easily reconfigured: CONFIG_HOST_LINUX=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y Configuration Sub-Directories ----------------------------- diff --git a/boards/arm/efm32/efm32-g8xx-stk/README.txt b/boards/arm/efm32/efm32-g8xx-stk/README.txt index e27951c563..f28a592e79 100644 --- a/boards/arm/efm32/efm32-g8xx-stk/README.txt +++ b/boards/arm/efm32/efm32-g8xx-stk/README.txt @@ -262,4 +262,4 @@ CONFIGURATIONS CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows diff --git a/boards/arm/efm32/efm32gg-stk3700/README.txt b/boards/arm/efm32/efm32gg-stk3700/README.txt index 29aed94c84..a3af5ef440 100644 --- a/boards/arm/efm32/efm32gg-stk3700/README.txt +++ b/boards/arm/efm32/efm32gg-stk3700/README.txt @@ -214,4 +214,4 @@ Configurations CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows diff --git a/boards/arm/efm32/olimex-efm32g880f128-stk/README.txt b/boards/arm/efm32/olimex-efm32g880f128-stk/README.txt index 09143771b1..54df3df3ba 100644 --- a/boards/arm/efm32/olimex-efm32g880f128-stk/README.txt +++ b/boards/arm/efm32/olimex-efm32g880f128-stk/README.txt @@ -162,5 +162,5 @@ Configurations CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows diff --git a/boards/arm/eoss3/quickfeather/scripts/Make.defs b/boards/arm/eoss3/quickfeather/scripts/Make.defs index be771818e1..405441500a 100644 --- a/boards/arm/eoss3/quickfeather/scripts/Make.defs +++ b/boards/arm/eoss3/quickfeather/scripts/Make.defs @@ -40,7 +40,7 @@ ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGSXX = -Wall -Wshadow -Wundef ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10 -ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANGL),y) +ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANG),y) ARCHCFLAGS += -nostdlib -ffreestanding ARCHCXXFLAGS += -nostdlib -ffreestanding else diff --git a/boards/arm/imx6/sabre-6quad/README.txt b/boards/arm/imx6/sabre-6quad/README.txt index f0e46812d4..0750903bdd 100644 --- a/boards/arm/imx6/sabre-6quad/README.txt +++ b/boards/arm/imx6/sabre-6quad/README.txt @@ -754,7 +754,7 @@ NOTES: CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories ----------------------------- diff --git a/boards/arm/kinetis/freedom-k64f/README.txt b/boards/arm/kinetis/freedom-k64f/README.txt index cdc2414753..3df8c60129 100644 --- a/boards/arm/kinetis/freedom-k64f/README.txt +++ b/boards/arm/kinetis/freedom-k64f/README.txt @@ -810,7 +810,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Cygwin under Windows CONFIG_WINDOWS_CYGWIN=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : ARM/mbed toolcahin (arm-none-elf-gcc) + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : ARM/mbed toolcahin (arm-none-elf-gcc) CONFIG_INTELHEX_BINARY=y : Output formats: Intel hex binary 3. The Serial Console is provided on UART3 with the correct pin @@ -860,7 +860,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Cygwin under Windows CONFIG_WINDOWS_CYGWIN=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : ARM/mbed toolcahin (arm-none-elf-gcc) + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : ARM/mbed toolcahin (arm-none-elf-gcc) CONFIG_INTELHEX_BINARY=y : Output formats: Intel hex binary 3. The Serial Console is provided on UART0 with the correct pin diff --git a/boards/arm/kinetis/freedom-k66f/README.txt b/boards/arm/kinetis/freedom-k66f/README.txt index 688f8c3333..8c78ccd967 100644 --- a/boards/arm/kinetis/freedom-k66f/README.txt +++ b/boards/arm/kinetis/freedom-k66f/README.txt @@ -814,7 +814,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Cygwin under Windows CONFIG_WINDOWS_CYGWIN=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : ARM/mbed toolcahin (arm-none-elf-gcc) + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : ARM/mbed toolcahin (arm-none-elf-gcc) CONFIG_INTELHEX_BINARY=y : Output formats: Intel hex binary 3. The Serial Console is provided on UART1 with the correct pin @@ -864,7 +864,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Cygwin under Windows CONFIG_WINDOWS_CYGWIN=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : ARM/mbed toolcahin (arm-none-elf-gcc) + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : ARM/mbed toolcahin (arm-none-elf-gcc) CONFIG_INTELHEX_BINARY=y : Output formats: Intel hex binary 3. The Serial Console is provided on UART1 with the correct pin diff --git a/boards/arm/kinetis/teensy-3.x/README.txt b/boards/arm/kinetis/teensy-3.x/README.txt index 40753db685..e30e3a3614 100644 --- a/boards/arm/kinetis/teensy-3.x/README.txt +++ b/boards/arm/kinetis/teensy-3.x/README.txt @@ -266,7 +266,7 @@ NOTES: CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain NOTE: As of this writing, there are issues with using this tool at the -Os level of optimization. This has not been proven to be a @@ -298,7 +298,7 @@ NOTES: CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows Support for builtin applications is enabled, but in the base configuration diff --git a/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig b/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig index f0356ab26c..ff477b00db 100644 --- a/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig +++ b/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig @@ -18,7 +18,6 @@ CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK20DX256VLH7=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y CONFIG_BOARD_LOOPSPERMSEC=6024 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y diff --git a/boards/arm/kl/freedom-kl25z/README.txt b/boards/arm/kl/freedom-kl25z/README.txt index cc89aace93..2297c7d68e 100644 --- a/boards/arm/kl/freedom-kl25z/README.txt +++ b/boards/arm/kl/freedom-kl25z/README.txt @@ -306,7 +306,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. Serial Console. A serial console is necessary to interrupt with NSH. The serial console is configured on UART0 which is available diff --git a/boards/arm/kl/freedom-kl26z/README.txt b/boards/arm/kl/freedom-kl26z/README.txt index 92ebb292c0..ede757e5f3 100644 --- a/boards/arm/kl/freedom-kl26z/README.txt +++ b/boards/arm/kl/freedom-kl26z/README.txt @@ -284,7 +284,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. Serial Console. A serial console is necessary to interrupt with NSH. The serial console is configured on UART0 which is available diff --git a/boards/arm/lpc17xx_40xx/lincoln60/README.txt b/boards/arm/lpc17xx_40xx/lincoln60/README.txt index 0a31b4f566..c96f681da8 100644 --- a/boards/arm/lpc17xx_40xx/lincoln60/README.txt +++ b/boards/arm/lpc17xx_40xx/lincoln60/README.txt @@ -348,7 +348,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Windows CONFIG_HOST_WINDOWS_CYGWIN=y : under Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows STATUS: 2015-06-06: The BINFS CGI files are seems to be running, but the diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/README.txt b/boards/arm/lpc17xx_40xx/lpc4088-devkit/README.txt index 600147573f..e23f3f95d2 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/README.txt +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/README.txt @@ -262,7 +262,7 @@ Information Common to All Configurations CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain 3. By Default, UART0 is used as the serial console in all configurations. This may be connected to your computer via an external RS-232 driver or diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/README.txt b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/README.txt index 44d36da0f2..1fbeec6f6c 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/README.txt +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/README.txt @@ -247,7 +247,7 @@ Information Common to All Configurations CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain 3. By Default, UART0 is used as the serial console in all configurations. This may be connected to your computer via an external RS-232 driver or diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/README.txt b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/README.txt index 006088e472..486ec17f0e 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/README.txt +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/README.txt @@ -653,7 +653,7 @@ Where is one of the following: 3. Build setup (easily reconfigured): CONFIG_HOST_LINUX=y : Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Linux 4. Jumpers: Nothing special. Use the default base board jumper settings. diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt index 6482ad0c1d..db997f558a 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt @@ -737,7 +737,7 @@ Configuration Sub-Directories 2. This configuration targets Linux using a generic ARM EABI toolchain: CONFIG_LINUX=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y But that can easily be re-configured. @@ -780,7 +780,7 @@ Configuration Sub-Directories CONFIG_HOST_WINDOWS=y : Windows CONFIG_WINDOWS_CYGWIN=y : Cygwin environment on Windows - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 2. The mouse is really useless with no display and no cursor. So this configuration is only suited for low-level testing. It is also awkward @@ -893,7 +893,7 @@ Configuration Sub-Directories CONFIG_HOST_WINDOWS=y : Windows CONFIG_HOST_WINDOWS_CYGWIN=y : under Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows STATUS: 2015-06-02. This configuration was added in an attempt to replace diff --git a/boards/arm/lpc17xx_40xx/open1788/README.txt b/boards/arm/lpc17xx_40xx/open1788/README.txt index 2d168f1906..7d764bbb6e 100644 --- a/boards/arm/lpc17xx_40xx/open1788/README.txt +++ b/boards/arm/lpc17xx_40xx/open1788/README.txt @@ -273,7 +273,7 @@ Information Common to All Configurations CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain 3. By Default, UART0 is used as the serial console in all configurations. This may be connected to your computer via an external RS-232 driver or diff --git a/boards/arm/lpc43xx/bambino-200e/README.txt b/boards/arm/lpc43xx/bambino-200e/README.txt index dd79e55e37..717cb258a6 100644 --- a/boards/arm/lpc43xx/bambino-200e/README.txt +++ b/boards/arm/lpc43xx/bambino-200e/README.txt @@ -415,7 +415,7 @@ Where is one of the following: SRAM. CONFIG_LPC43_BOOT_SRAM=y : Executing in SRAM - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. To execute from SPIFI, you would need to set: diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/README.txt b/boards/arm/lpc43xx/lpc4330-xplorer/README.txt index 93633308ee..050e2883fa 100644 --- a/boards/arm/lpc43xx/lpc4330-xplorer/README.txt +++ b/boards/arm/lpc43xx/lpc4330-xplorer/README.txt @@ -279,7 +279,7 @@ Code Red IDE/Tools from SRAM. CONFIG_LPC43_BOOT_SRAM=y : Executing in SRAM - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows To execute from SPIFI, you would need to set: @@ -576,7 +576,7 @@ Where is one of the following: SRAM. CONFIG_LPC43_BOOT_SRAM=y : Executing in SRAM - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. To execute from SPIFI, you would need to set: diff --git a/boards/arm/lpc43xx/lpc4337-ws/README.txt b/boards/arm/lpc43xx/lpc4337-ws/README.txt index 96cf0fcf78..ddc30d7a05 100644 --- a/boards/arm/lpc43xx/lpc4337-ws/README.txt +++ b/boards/arm/lpc43xx/lpc4337-ws/README.txt @@ -275,7 +275,7 @@ Code Red IDE/Tools from SRAM. CONFIG_LPC43_BOOT_SRAM=y : Executing in SRAM - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows To execute from SPIFI, you would need to set: @@ -615,7 +615,7 @@ Where is one of the following: by setting the following configuration options. CONFIG_LPC43_BOOT_SRAM=y : Executing in SRAM - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. To execute from SPIFI, you would need to set: diff --git a/boards/arm/lpc43xx/lpc4357-evb/README.txt b/boards/arm/lpc43xx/lpc4357-evb/README.txt index 463a93689c..ab5c327ff9 100644 --- a/boards/arm/lpc43xx/lpc4357-evb/README.txt +++ b/boards/arm/lpc43xx/lpc4357-evb/README.txt @@ -272,7 +272,7 @@ Code Red IDE/Tools from SRAM. CONFIG_LPC43_BOOT_SRAM=y : Executing in SRAM - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Linux To execute from SPIFI, you would need to set: @@ -612,7 +612,7 @@ Where is one of the following: by setting the following configuration options. CONFIG_LPC43_BOOT_SRAM=y : Executing in SRAM - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. To execute from SPIFI, you would need to set: diff --git a/boards/arm/lpc43xx/lpc4370-link2/README.txt b/boards/arm/lpc43xx/lpc4370-link2/README.txt index 44daaf1328..ee24ae0fa5 100644 --- a/boards/arm/lpc43xx/lpc4370-link2/README.txt +++ b/boards/arm/lpc43xx/lpc4370-link2/README.txt @@ -275,7 +275,7 @@ Code Red IDE/Tools from SRAM. CONFIG_LPC43_BOOT_SRAM=y : Executing in SRAM - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows To execute from SPIFI, you would need to set: @@ -615,7 +615,7 @@ Where is one of the following: by setting the following configuration options. CONFIG_LPC43_BOOT_SRAM=y : Executing in SRAM - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. To execute from SPIFI, you would need to set: diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/README.txt b/boards/arm/lpc54xx/lpcxpresso-lpc54628/README.txt index 78b019ae70..bcbb0cb973 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/README.txt +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/README.txt @@ -185,7 +185,7 @@ Configurations CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration Sub-directories ----------------------------- diff --git a/boards/arm/nuc1xx/nutiny-nuc120/README.txt b/boards/arm/nuc1xx/nutiny-nuc120/README.txt index 34414f4d48..5d57da2ef6 100644 --- a/boards/arm/nuc1xx/nutiny-nuc120/README.txt +++ b/boards/arm/nuc1xx/nutiny-nuc120/README.txt @@ -287,7 +287,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. Serial Console. A serial console is necessary to interrupt with NSH. The serial console is configured on UART1 which is available diff --git a/boards/arm/sam34/arduino-due/README.txt b/boards/arm/sam34/arduino-due/README.txt index 957bbce6d5..90dd165c91 100644 --- a/boards/arm/sam34/arduino-due/README.txt +++ b/boards/arm/sam34/arduino-due/README.txt @@ -710,7 +710,7 @@ Configurations CONFIG_HOST_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : General GCC EABI toolchain under windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : General GCC EABI toolchain under windows This re-configuration should be done before making NuttX or else the subsequent 'make' will fail. If you have already attempted building diff --git a/boards/arm/sam34/flipnclick-sam3x/README.txt b/boards/arm/sam34/flipnclick-sam3x/README.txt index 03871c3a05..42932a24a8 100644 --- a/boards/arm/sam34/flipnclick-sam3x/README.txt +++ b/boards/arm/sam34/flipnclick-sam3x/README.txt @@ -595,7 +595,7 @@ Configurations 'make menuconfig'. Here are the relevant current settings: System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain for Windows Configuration sub-directories ----------------------------- diff --git a/boards/arm/sam34/sam3u-ek/README.txt b/boards/arm/sam34/sam3u-ek/README.txt index ede947c4c6..f79123053e 100644 --- a/boards/arm/sam34/sam3u-ek/README.txt +++ b/boards/arm/sam34/sam3u-ek/README.txt @@ -258,7 +258,7 @@ Configurations CONFIG_HOST_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : General GCC EABI toolchain under windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : General GCC EABI toolchain under windows Library Routines -> CONFIG_ARCH_SIZET_LONG=n : size_t is an unsigned int, not long diff --git a/boards/arm/sam34/sam4e-ek/README.txt b/boards/arm/sam34/sam4e-ek/README.txt index ff34a8da08..213fc30966 100644 --- a/boards/arm/sam34/sam4e-ek/README.txt +++ b/boards/arm/sam34/sam4e-ek/README.txt @@ -1071,7 +1071,7 @@ Configurations CONFIG_HOST_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : General GCC EABI toolchain under windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : General GCC EABI toolchain under windows Library Routines -> CONFIG_ARCH_SIZET_LONG=n : size_t is an unsigned int, not long diff --git a/boards/arm/sam34/sam4l-xplained/README.txt b/boards/arm/sam34/sam4l-xplained/README.txt index 6d4e33f7bc..9a0d168272 100644 --- a/boards/arm/sam34/sam4l-xplained/README.txt +++ b/boards/arm/sam34/sam4l-xplained/README.txt @@ -457,7 +457,7 @@ Configurations CONFIG_HOST_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : General GCC EABI toolchain under windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : General GCC EABI toolchain under windows This re-configuration should be done before making NuttX or else the subsequent 'make' will fail. If you have already attempted building diff --git a/boards/arm/sam34/sam4s-xplained-pro/README.txt b/boards/arm/sam34/sam4s-xplained-pro/README.txt index 9bd8de27bd..74074c316c 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/README.txt +++ b/boards/arm/sam34/sam4s-xplained-pro/README.txt @@ -339,7 +339,7 @@ Configurations CONFIG_HOST_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : General GCC EABI toolchain under windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : General GCC EABI toolchain under windows This re-configuration should be done before making NuttX or else the subsequent 'make' will fail. If you have already attempted building diff --git a/boards/arm/sam34/sam4s-xplained/README.txt b/boards/arm/sam34/sam4s-xplained/README.txt index 1693908331..5a1a556b96 100644 --- a/boards/arm/sam34/sam4s-xplained/README.txt +++ b/boards/arm/sam34/sam4s-xplained/README.txt @@ -334,7 +334,7 @@ Configurations CONFIG_HOST_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : General GCC EABI toolchain under windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : General GCC EABI toolchain under windows This re-configuration should be done before making NuttX or else the subsequent 'make' will fail. If you have already attempted building diff --git a/boards/arm/samd2l2/saml21-xplained/README.txt b/boards/arm/samd2l2/saml21-xplained/README.txt index 7905048f40..fa327cf02a 100644 --- a/boards/arm/samd2l2/saml21-xplained/README.txt +++ b/boards/arm/samd2l2/saml21-xplained/README.txt @@ -265,8 +265,8 @@ GNU Toolchain Options the following configuration options to your .config (or defconfig) file: CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : Generic GCC ARM EABI toolchain for Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : Generic GCC ARM EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : Generic GCC ARM EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : Generic GCC ARM EABI toolchain for Windows NOTE about Windows native toolchains ------------------------------------ diff --git a/boards/arm/samv7/same70-qmtech/README.txt b/boards/arm/samv7/same70-qmtech/README.txt index cebc7522bd..fc0403a861 100644 --- a/boards/arm/samv7/same70-qmtech/README.txt +++ b/boards/arm/samv7/same70-qmtech/README.txt @@ -700,7 +700,7 @@ NOTES: CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain NOTE: As of this writing, there are issues with using this tool at the -Os level of optimization. This has not been proven to be a diff --git a/boards/arm/samv7/same70-xplained/README.txt b/boards/arm/samv7/same70-xplained/README.txt index 8111050c6b..00a939aaea 100644 --- a/boards/arm/samv7/same70-xplained/README.txt +++ b/boards/arm/samv7/same70-xplained/README.txt @@ -1300,7 +1300,7 @@ NOTES: CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain NOTE: As of this writing, there are issues with using this tool at the -Os level of optimization. This has not been proven to be a diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt index 1b9183e5f5..501be46d8b 100644 --- a/boards/arm/samv7/samv71-xult/README.txt +++ b/boards/arm/samv7/samv71-xult/README.txt @@ -1699,7 +1699,7 @@ NOTES: CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories ----------------------------- diff --git a/boards/arm/stm32/clicker2-stm32/README.txt b/boards/arm/stm32/clicker2-stm32/README.txt index 6cf7505d2a..c53cc225f5 100644 --- a/boards/arm/stm32/clicker2-stm32/README.txt +++ b/boards/arm/stm32/clicker2-stm32/README.txt @@ -216,7 +216,7 @@ Configurations CONFIG_HOST_LINUX =y : Linux environment System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories ----------------------------- diff --git a/boards/arm/stm32/cloudctrl/README.txt b/boards/arm/stm32/cloudctrl/README.txt index 848b045b5e..daf95bf982 100644 --- a/boards/arm/stm32/cloudctrl/README.txt +++ b/boards/arm/stm32/cloudctrl/README.txt @@ -474,7 +474,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_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for 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/boards/arm/stm32/hymini-stm32v/README.txt b/boards/arm/stm32/hymini-stm32v/README.txt index da16decad5..bc798d1e82 100644 --- a/boards/arm/stm32/hymini-stm32v/README.txt +++ b/boards/arm/stm32/hymini-stm32v/README.txt @@ -482,7 +482,7 @@ Where is one of the following: more information. CONFIG_HOST_LINUX=y : Linux host - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Linux USB debug output can be enabled as by changing the following settings in the configuration file: diff --git a/boards/arm/stm32/mikroe-stm32f4/README.txt b/boards/arm/stm32/mikroe-stm32f4/README.txt index 0d5faac62d..be61fc414b 100644 --- a/boards/arm/stm32/mikroe-stm32f4/README.txt +++ b/boards/arm/stm32/mikroe-stm32f4/README.txt @@ -479,7 +479,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Windows CONFIG_WINDOWS_CYGWIN=y : Cygwin environment on Windows - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows This is easily changed by modifying the configuration. @@ -612,7 +612,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. This configuration does have UART2 output enabled and set up as the system logging device: diff --git a/boards/arm/stm32/nucleo-f446re/README.txt b/boards/arm/stm32/nucleo-f446re/README.txt index e4fe895dd7..eb4ae0eb3a 100644 --- a/boards/arm/stm32/nucleo-f446re/README.txt +++ b/boards/arm/stm32/nucleo-f446re/README.txt @@ -535,7 +535,7 @@ Configurations for Linux. That can easily be reconfigured, of course. CONFIG_HOST_LINUX=y : Builds under Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Linux 3. Although the default console is USART2 (which would correspond to the Virtual COM port) I have done all testing with the console diff --git a/boards/arm/stm32/nucleo-f446re/scripts/Make.defs b/boards/arm/stm32/nucleo-f446re/scripts/Make.defs index 32a91740d1..ce7fed97a6 100644 --- a/boards/arm/stm32/nucleo-f446re/scripts/Make.defs +++ b/boards/arm/stm32/nucleo-f446re/scripts/Make.defs @@ -38,7 +38,7 @@ endif ARCHCFLAGS += -fno-common ARCHCXXFLAGS += -fno-common -ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANGL),y) +ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANG),y) ARCHCFLAGS += -nostdlib -ffreestanding ARCHCXXFLAGS += -nostdlib -ffreestanding endif diff --git a/boards/arm/stm32/nucleo-f4x1re/README.txt b/boards/arm/stm32/nucleo-f4x1re/README.txt index e6082f050a..eaa300d622 100644 --- a/boards/arm/stm32/nucleo-f4x1re/README.txt +++ b/boards/arm/stm32/nucleo-f4x1re/README.txt @@ -560,7 +560,7 @@ Configurations for Linux. That can easily be reconfigured, of course. CONFIG_HOST_LINUX=y : Builds under Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Linux 3. Although the default console is USART2 (which would correspond to the Virtual COM port) I have done all testing with the console diff --git a/boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs b/boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs index e5bb62e79b..e78378359d 100644 --- a/boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs +++ b/boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs @@ -44,7 +44,7 @@ endif ARCHCFLAGS += -fno-common ARCHCXXFLAGS += -fno-common -ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANGL),y) +ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANG),y) ARCHCFLAGS += -nostdlib -ffreestanding ARCHCXXFLAGS += -nostdlib -ffreestanding endif diff --git a/boards/arm/stm32/shenzhou/README.txt b/boards/arm/stm32/shenzhou/README.txt index f64982d0c4..f321c1b9f5 100644 --- a/boards/arm/stm32/shenzhou/README.txt +++ b/boards/arm/stm32/shenzhou/README.txt @@ -491,7 +491,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_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for 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/boards/arm/stm32/stm3210e-eval/README.txt b/boards/arm/stm32/stm3210e-eval/README.txt index a0fbef318a..80ec3bc363 100644 --- a/boards/arm/stm32/stm3210e-eval/README.txt +++ b/boards/arm/stm32/stm3210e-eval/README.txt @@ -606,7 +606,7 @@ Where is one of the following: focuses on general window controls, movement, mouse and keyboard input. - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows CONFIG_LCD_RPORTRAIT=y : 240x320 reverse portrait NOTES: @@ -800,7 +800,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Windows CONFIG_WINDOWS_CYGWIN=y : Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. CONFIG_ARCH_CUSTOM_PMINIT and CONFIG_ARCH_IDLE_CUSTOM are necessary parts of the PM configuration: diff --git a/boards/arm/stm32/stm3220g-eval/README.txt b/boards/arm/stm32/stm3220g-eval/README.txt index d0ba1c7e6f..3cada360f4 100644 --- a/boards/arm/stm32/stm3220g-eval/README.txt +++ b/boards/arm/stm32/stm3220g-eval/README.txt @@ -534,7 +534,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y CONFIG_WINDOWS_CYGWIN=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y nettest: ------- @@ -564,7 +564,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Windows CONFIG_WINDOWS_CYGWIN=y : Under Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows Than can, of course, be easily changes by reconfiguring per Note 1. @@ -573,7 +573,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_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows CONFIG_NSH_DHCPC=n : DHCP is disabled CONFIG_NSH_IPADDR=(192<<24|168<<16|13<<8|161) : Target IP address 192.168.8.161 CONFIG_NSH_DRIPADDR=(192<<24|168<<16|13<<8|1) : Host IP address 192.168.8.1 @@ -843,4 +843,4 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y CONFIG_WINDOWS_CYGWIN=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y diff --git a/boards/arm/stm32/stm3240g-eval/README.txt b/boards/arm/stm32/stm3240g-eval/README.txt index de0ddb056e..e9c71f7e79 100644 --- a/boards/arm/stm32/stm3240g-eval/README.txt +++ b/boards/arm/stm32/stm3240g-eval/README.txt @@ -630,7 +630,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y CONFIG_WINDOWS_CYGWIN=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y discover: -------- @@ -645,7 +645,7 @@ Where is one of the following: Configuration settings that you may need to change for your environment: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y - GNU EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y - GNU EABI toolchain for Linux CONFIG_EXAMPLES_DISCOVER_DHCPC=y - DHCP Client CONFIG_EXAMPLES_DISCOVER_IPADDR - (not defined) CONFIG_EXAMPLES_DISCOVER_DRIPADDR - Router IP address @@ -809,7 +809,7 @@ Where is one of the following: using the STM32's Ethernet controller. It uses apps/examples/nettest to exercise the TCP/IP network. - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows CONFIG_EXAMPLES_NETTEST_SERVER=n : Target is configured as the client CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y : Only network performance is verified. CONFIG_EXAMPLES_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) : Target side is IP: 10.0.0.2 @@ -832,7 +832,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_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows CONFIG_NSH_DHCPC=n : DHCP is disabled CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) : Target IP address 10.0.0.2 CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) : Host IP address 10.0.0.1 @@ -1168,7 +1168,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Windows CONFIG_WINDOWS_CYGWIN=y : With Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows nxwm ---- @@ -1206,7 +1206,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y CONFIG_WINDOWS_CYGWIN=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y xmlrpc ------ diff --git a/boards/arm/stm32/stm32_tiny/README.txt b/boards/arm/stm32/stm32_tiny/README.txt index d3a0441bd1..b2aadadd0b 100644 --- a/boards/arm/stm32/stm32_tiny/README.txt +++ b/boards/arm/stm32/stm32_tiny/README.txt @@ -294,7 +294,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. This example supports the PWM test (apps/examples/pwm) but this must be manually enabled by selecting: @@ -400,7 +400,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. This configuration does have UART2 output enabled and set up as the system logging device: diff --git a/boards/arm/stm32/stm32f103-minimum/README.txt b/boards/arm/stm32/stm32f103-minimum/README.txt index 435f69f0f6..ae1508965f 100644 --- a/boards/arm/stm32/stm32f103-minimum/README.txt +++ b/boards/arm/stm32/stm32f103-minimum/README.txt @@ -833,7 +833,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. This configuration does have UART2 output enabled and set up as the system logging device: diff --git a/boards/arm/stm32/stm32f3discovery/README.txt b/boards/arm/stm32/stm32f3discovery/README.txt index 0ed440b72c..0fc7ba02de 100644 --- a/boards/arm/stm32/stm32f3discovery/README.txt +++ b/boards/arm/stm32/stm32f3discovery/README.txt @@ -393,7 +393,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. This configuration includes USB Support (CDC/ACM device) @@ -475,7 +475,7 @@ Where is one of the following: CONFIG_WINDOWS_CYGWIN=y : Using Cygwin System Type: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. This configuration does have USART2 output enabled and set up as the system logging device: diff --git a/boards/arm/stm32/stm32f429i-disco/README.txt b/boards/arm/stm32/stm32f429i-disco/README.txt index cd43d3c907..fb64b791a5 100644 --- a/boards/arm/stm32/stm32f429i-disco/README.txt +++ b/boards/arm/stm32/stm32f429i-disco/README.txt @@ -701,7 +701,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 3. This example supports the PWM test (apps/examples/pwm) but this must be manually enabled by selecting: diff --git a/boards/arm/stm32/stm32f4discovery/README.txt b/boards/arm/stm32/stm32f4discovery/README.txt index 40c9824b95..b366f74213 100644 --- a/boards/arm/stm32/stm32f4discovery/README.txt +++ b/boards/arm/stm32/stm32f4discovery/README.txt @@ -1357,7 +1357,7 @@ Configuration Sub-directories CONFIG_HOST_WINDOWS=y : Windows CONFIG_WINDOWS_CYGWIN=y : Cygwin environment on Windows - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 2. By default, this project assumes that you are *NOT* using the DFU bootloader. @@ -1609,7 +1609,7 @@ Configuration Sub-directories CONFIG_HOST_WINDOWS=y : Windows CONFIG_WINDOWS_CYGWIN=y : Cygwin environment on Windows - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows This is easily changed by modifying the configuration. @@ -1769,7 +1769,7 @@ Configuration Sub-directories CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 2. To use this configuration with the STM32F4DIS-BB baseboard you should: @@ -2071,7 +2071,7 @@ Configuration Sub-directories An example using the NuttX graphics system (NX). This example focuses on placing lines on the background in various orientations. - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows CONFIG_LCD_LANDSCAPE=y : 320x240 landscape orientation The STM32F4Discovery board does not have any graphics capability. This @@ -2147,7 +2147,7 @@ Configuration Sub-directories CONFIG_HOST_WINDOWS=y : Windows CONFIG_WINDOWS_CYGWIN=y : Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 2. CONFIG_ARCH_CUSTOM_PMINIT and CONFIG_ARCH_IDLE_CUSTOM are necessary parts of the PM configuration: @@ -2197,7 +2197,7 @@ Configuration Sub-directories CONFIG_HOST_WINDOWS=y : Builds under windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin and - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : Generic ARM EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : Generic ARM EABI toolchain for Windows 2. By default, this project assumes that you are *NOT* using the DFU bootloader. @@ -2337,7 +2337,7 @@ Configuration Sub-directories CONFIG_HOST_WINDOWS=y : Builds under Windows CONFIG_WINDOWS_CYGWIN=y : Using Cygwin - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 2. This configuration does have USART2 output enabled and set up as the system logging device: @@ -2416,7 +2416,7 @@ Configuration Sub-directories CONFIG_HOST_WINDOWS=y : Windows CONFIG_WINDOWS_NATIVE=y : Native Windows environment - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for 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/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig index 78e5761701..ee3874bbe2 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig @@ -13,7 +13,6 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y diff --git a/boards/arm/stm32/stm32f4discovery/scripts/Make.defs b/boards/arm/stm32/stm32f4discovery/scripts/Make.defs index f62f45ec72..2e9806128e 100644 --- a/boards/arm/stm32/stm32f4discovery/scripts/Make.defs +++ b/boards/arm/stm32/stm32f4discovery/scripts/Make.defs @@ -41,7 +41,7 @@ ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGSXX = -Wall -Wshadow -Wundef ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10 -ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANGL),y) +ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANG),y) ARCHCFLAGS += -nostdlib -ffreestanding ARCHCXXFLAGS += -nostdlib -ffreestanding else diff --git a/boards/arm/stm32/stm32ldiscovery/README.txt b/boards/arm/stm32/stm32ldiscovery/README.txt index 74a968ec61..cddaea555d 100644 --- a/boards/arm/stm32/stm32ldiscovery/README.txt +++ b/boards/arm/stm32/stm32ldiscovery/README.txt @@ -519,7 +519,7 @@ Configuration sub-directories CONFIG_WINDOWS_CYGWIN=y : Using Cygwin System Type: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 4. To enable SLCD support: diff --git a/boards/arm/stm32/stm32vldiscovery/README.txt b/boards/arm/stm32/stm32vldiscovery/README.txt index b819f7b9b4..fb1d093c8a 100644 --- a/boards/arm/stm32/stm32vldiscovery/README.txt +++ b/boards/arm/stm32/stm32vldiscovery/README.txt @@ -215,4 +215,4 @@ Where is one of the following: Default toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Linux diff --git a/boards/arm/stm32/viewtool-stm32f107/README.txt b/boards/arm/stm32/viewtool-stm32f107/README.txt index a6cee00035..f62fbac6c3 100644 --- a/boards/arm/stm32/viewtool-stm32f107/README.txt +++ b/boards/arm/stm32/viewtool-stm32f107/README.txt @@ -852,7 +852,7 @@ Configurations Here are the relevant current settings: System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows See also the "NOTE about Windows native toolchains" in the section call "GNU Toolchain Options" above. @@ -938,7 +938,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under Windows - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 6. USB support is disabled by default. See the section above entitled, "USB Interface" @@ -970,7 +970,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under Windows - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows 4. USB support is disabled by default. See the section above entitled, "USB Interface" diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt b/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt index d4ec1b91f2..7c5f7e04bf 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt @@ -265,7 +265,7 @@ Configurations CONFIG_HOST_LINUX=y : Linux environment System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories ----------------------------- diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt b/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt index 4284ea7d5a..27ab23492e 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt @@ -251,7 +251,7 @@ Configurations CONFIG_HOST_LINUX=y : Linux environment System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories ----------------------------- diff --git a/boards/arm/stm32f7/nucleo-144/README.txt b/boards/arm/stm32f7/nucleo-144/README.txt index 0c55f6a690..98a48aac5d 100644 --- a/boards/arm/stm32f7/nucleo-144/README.txt +++ b/boards/arm/stm32f7/nucleo-144/README.txt @@ -533,7 +533,7 @@ f7xx-nsh: for Linux. That can easily be reconfigured, of course. CONFIG_HOST_LINUX=y : Builds under Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : ARM GNU for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : ARM GNU for Linux 3. The serial console may be configured to use either USART3 (which would correspond to the Virtual COM port) or with the console device @@ -600,4 +600,4 @@ f7xx-evalos: for Linux. That can easily be reconfigured, of course. CONFIG_HOST_LINUX=y : Builds under Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : ARM GNU for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : ARM GNU for Linux diff --git a/boards/arm/stm32f7/stm32f746g-disco/README.txt b/boards/arm/stm32f7/stm32f746g-disco/README.txt index 7c6605c612..2aac635d38 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/README.txt +++ b/boards/arm/stm32f7/stm32f746g-disco/README.txt @@ -494,7 +494,7 @@ Configurations CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain NOTE: As of this writing, there are issues with using this tool at the -Os level of optimization. This has not been proven to be a diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig index 1d3f3d6839..2578dc05ff 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig @@ -22,7 +22,6 @@ CONFIG_ARMV7M_DCACHE=y CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y CONFIG_ARMV7M_DTCM=y CONFIG_ARMV7M_ICACHE=y -CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig index 08d02c5425..bf50f1d7ea 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig @@ -20,7 +20,6 @@ CONFIG_ARMV7M_DCACHE=y CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y CONFIG_ARMV7M_DTCM=y CONFIG_ARMV7M_ICACHE=y -CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y diff --git a/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs b/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs index 86ad92c191..65a5502315 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs +++ b/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs @@ -33,7 +33,7 @@ endif ARCHCFLAGS += -fno-common ARCHCXXFLAGS += -fno-common -ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANGL),y) +ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANG),y) ARCHCFLAGS += -nostdlib -ffreestanding ARCHCXXFLAGS += -nostdlib -ffreestanding endif diff --git a/boards/arm/stm32l4/b-l475e-iot01a/README.txt b/boards/arm/stm32l4/b-l475e-iot01a/README.txt index 0d147f41aa..082791102d 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/README.txt +++ b/boards/arm/stm32l4/b-l475e-iot01a/README.txt @@ -259,7 +259,7 @@ Configurations CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories ----------------------------- diff --git a/boards/arm/stm32l4/nucleo-l432kc/README.txt b/boards/arm/stm32l4/nucleo-l432kc/README.txt index 19487b0c2d..ae2cf54f23 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/README.txt +++ b/boards/arm/stm32l4/nucleo-l432kc/README.txt @@ -442,7 +442,7 @@ Configurations for Linux. That can easily be reconfigured, of course. CONFIG_HOST_LINUX=y : Builds under Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Linux 3. Although the default console is USART2 (which would correspond to the Virtual COM port) I have done all testing with the console diff --git a/boards/arm/stm32l4/nucleo-l452re/README.txt b/boards/arm/stm32l4/nucleo-l452re/README.txt index 03dc121890..412d789c12 100644 --- a/boards/arm/stm32l4/nucleo-l452re/README.txt +++ b/boards/arm/stm32l4/nucleo-l452re/README.txt @@ -257,7 +257,7 @@ Configurations CONFIG_HOST_LINUX=y : Linux environment System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories ----------------------------- diff --git a/boards/arm/stm32l4/nucleo-l476rg/README.txt b/boards/arm/stm32l4/nucleo-l476rg/README.txt index be6df33f17..d0d5a79e08 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/README.txt +++ b/boards/arm/stm32l4/nucleo-l476rg/README.txt @@ -565,7 +565,7 @@ Configurations for Linux. That can easily be reconfigured, of course. CONFIG_HOST_LINUX=y : Builds under Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Linux 3. Although the default console is USART2 (which would correspond to the Virtual COM port) I have done all testing with the console diff --git a/boards/arm/stm32l4/nucleo-l496zg/README.txt b/boards/arm/stm32l4/nucleo-l496zg/README.txt index b7e2648dd4..f97a2b0ecd 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/README.txt +++ b/boards/arm/stm32l4/nucleo-l496zg/README.txt @@ -291,7 +291,7 @@ nsh: for Linux. That can easily be reconfigured, of course. CONFIG_HOST_LINUX=y : Builds under Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : ARM GNU for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : ARM GNU for Linux 3. Although the default console is LPUART1 (which would correspond to the Virtual COM port) I have done all testing with the console diff --git a/boards/arm/stm32l4/stm32l476vg-disco/README.txt b/boards/arm/stm32l4/stm32l476vg-disco/README.txt index ba86388a64..550fddcd2a 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/README.txt +++ b/boards/arm/stm32l4/stm32l476vg-disco/README.txt @@ -443,7 +443,7 @@ Configurations for Linux. That can easily be reconfigured, of course. CONFIG_HOST_LINUX=y : Builds under Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : Generic EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : Generic EABI toolchain for Linux 3. Although the default console is USART2 (which would correspond to the Virtual COM port) I have done all testing with the console diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/README.txt b/boards/arm/stm32l4/stm32l4r9ai-disco/README.txt index fa6ddf1c6b..e62c6727b9 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/README.txt +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/README.txt @@ -340,7 +340,7 @@ Configurations for Linux. That can easily be reconfigured, of course. CONFIG_HOST_LINUX=y : Builds under Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : Generic EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : Generic EABI toolchain for Linux 3. The default console is UART4 diff --git a/boards/arm/tiva/dk-tm4c129x/README.txt b/boards/arm/tiva/dk-tm4c129x/README.txt index b94d670d01..34b4a926a9 100644 --- a/boards/arm/tiva/dk-tm4c129x/README.txt +++ b/boards/arm/tiva/dk-tm4c129x/README.txt @@ -673,7 +673,7 @@ Where is one of the following: CONFIG_HOST_WINDOWS=y : Windows :CONFIG_WINDOWS_CYGWIN=y : Cygwin under Windows - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Windows CONFIG_RAW_BINARY=y : Output formats: ELF and raw binary 3. Default stack sizes are large and should really be tuned to reduce diff --git a/boards/arm/tiva/eagle100/README.txt b/boards/arm/tiva/eagle100/README.txt index b10774b587..afd5c767a4 100644 --- a/boards/arm/tiva/eagle100/README.txt +++ b/boards/arm/tiva/eagle100/README.txt @@ -215,7 +215,7 @@ Configuration Sub-Directories CONFIG_HOST_WINDOWS=y CONFIG_WINDOWS_CYGWIN=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y httpd: This builds the uIP web server example using the examples/webserver application @@ -228,8 +228,7 @@ Configuration Sub-Directories CONFIG_HOST_WINDOWS=y CONFIG_WINDOWS_CYGWIN=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y This example can only be built using the buildroot toolchain with NXFLAT support diff --git a/boards/arm/tiva/lm3s6965-ek/README.txt b/boards/arm/tiva/lm3s6965-ek/README.txt index 3b680ead72..b16b42e959 100644 --- a/boards/arm/tiva/lm3s6965-ek/README.txt +++ b/boards/arm/tiva/lm3s6965-ek/README.txt @@ -468,7 +468,7 @@ Where is one of the following: 2. Default platform/toolchain: CONFIG_HOST_LINUX=y : Linux - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : GNU EABI toolchain for Linux + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for Linux CONFIG_RAW_BINARY=y : Output formats: ELF and raw binary 3. As it is configured now, you MUST have a network connected. diff --git a/boards/arm/tms570/launchxl-tms57004/README.txt b/boards/arm/tms570/launchxl-tms57004/README.txt index 79fdf2970f..179f8f1382 100644 --- a/boards/arm/tms570/launchxl-tms57004/README.txt +++ b/boards/arm/tms570/launchxl-tms57004/README.txt @@ -83,7 +83,7 @@ Toolchain CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain LEDs and Buttons ================ @@ -211,7 +211,7 @@ Configurations CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories ----------------------------- diff --git a/boards/arm/xmc4/xmc4500-relax/README.txt b/boards/arm/xmc4/xmc4500-relax/README.txt index 9db54a70be..f1c15a583a 100644 --- a/boards/arm/xmc4/xmc4500-relax/README.txt +++ b/boards/arm/xmc4/xmc4500-relax/README.txt @@ -141,7 +141,7 @@ Configurations CONFIG_WINDOWS_CYGWIN=y : Cywin under Windows System Type -> Toolchain: - CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : GNU ARM EABI toolchain + CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories ----------------------------- diff --git a/tools/README.txt b/tools/README.txt index 782eac25bf..0d05e062ce 100644 --- a/tools/README.txt +++ b/tools/README.txt @@ -1026,9 +1026,9 @@ testbuild.sh The test list file is a sequence of build descriptions, one per line. One build descriptions consists of two comma separated values. For example: - stm32f429i-disco:nsh,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL - arduino-due:nsh,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL - /arm,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL + stm32f429i-disco:nsh + arduino-due:nsh + /arm /risc-v,CONFIG_RISCV_TOOLCHAIN_GNU_RVGL The first value is the usual configuration description of the form diff --git a/tools/ci/testlist/arm-01.dat b/tools/ci/testlist/arm-01.dat index 8ef1b5a72e..5d40ea8b7d 100644 --- a/tools/ci/testlist/arm-01.dat +++ b/tools/ci/testlist/arm-01.dat @@ -1,3 +1,3 @@ /arm/[a]*,CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIL -/arm/[b-h]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/[b-h]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI diff --git a/tools/ci/testlist/arm-02.dat b/tools/ci/testlist/arm-02.dat index f5c6f973a9..c609e75503 100644 --- a/tools/ci/testlist/arm-02.dat +++ b/tools/ci/testlist/arm-02.dat @@ -1,4 +1,4 @@ -/arm/[i-k]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/[i-k]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -imxrt1050-evk:libcxxtest -imxrt1060-evk:libcxxtest -imxrt1064-evk:libcxxtest diff --git a/tools/ci/testlist/arm-03.dat b/tools/ci/testlist/arm-03.dat index 8e92ab6b00..8740271641 100644 --- a/tools/ci/testlist/arm-03.dat +++ b/tools/ci/testlist/arm-03.dat @@ -1,4 +1,4 @@ -/arm/lpc17xx_40xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/lpc17xx_40xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -lpcxpresso-lpc1768:thttpd -olimex-lpc1766stk:slip-httpd -olimex-lpc1766stk:thttpd-nxflat diff --git a/tools/ci/testlist/arm-04.dat b/tools/ci/testlist/arm-04.dat index de8f68647b..93d7f209f1 100644 --- a/tools/ci/testlist/arm-04.dat +++ b/tools/ci/testlist/arm-04.dat @@ -1,11 +1,11 @@ -/arm/lc823450,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/lc823450,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/lpc214x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/lpc214x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/lpc2378,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/lpc2378,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/lpc31xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/lpc31xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/lpc43xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/lpc43xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/lpc54xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/lpc54xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI diff --git a/tools/ci/testlist/arm-05.dat b/tools/ci/testlist/arm-05.dat index e79de836c9..c2c4ce5a93 100644 --- a/tools/ci/testlist/arm-05.dat +++ b/tools/ci/testlist/arm-05.dat @@ -1,6 +1,6 @@ -/arm/[m-r]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/[m-r]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -moxa:nsh -/arm/s32k1xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/s32k1xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/sam34,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/sam34,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI diff --git a/tools/ci/testlist/arm-06.dat b/tools/ci/testlist/arm-06.dat index c733d4c60e..cf6ce280b8 100644 --- a/tools/ci/testlist/arm-06.dat +++ b/tools/ci/testlist/arm-06.dat @@ -1,7 +1,7 @@ -/arm/sama5,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/sama5,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/samd2l2,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/samd2l2,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/samd5e5,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/samd5e5,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/samv7,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/samv7,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI diff --git a/tools/ci/testlist/arm-07.dat b/tools/ci/testlist/arm-07.dat index c531b45b3f..df8db1fea6 100644 --- a/tools/ci/testlist/arm-07.dat +++ b/tools/ci/testlist/arm-07.dat @@ -1,7 +1,7 @@ -/arm/stm32/[a-m]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/[a-m]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/nucleo-f1*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/nucleo-f1*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/nucleo-f2*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/nucleo-f2*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/nucleo-f30*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/nucleo-f30*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI diff --git a/tools/ci/testlist/arm-08.dat b/tools/ci/testlist/arm-08.dat index ac945ace3c..35afd3d75b 100644 --- a/tools/ci/testlist/arm-08.dat +++ b/tools/ci/testlist/arm-08.dat @@ -1,9 +1,9 @@ -/arm/stm32/nucleo-f33*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/nucleo-f33*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/nucleo-f4*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/nucleo-f4*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/nucleo-g*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/nucleo-g*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/nucleo-l*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/nucleo-l*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/olimex-*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/olimex-*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI diff --git a/tools/ci/testlist/arm-09.dat b/tools/ci/testlist/arm-09.dat index 277107012c..68918f2e76 100644 --- a/tools/ci/testlist/arm-09.dat +++ b/tools/ci/testlist/arm-09.dat @@ -1,14 +1,14 @@ -/arm/stm32/olimexino-stm32,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/olimexino-stm32,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/omnibusf4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/omnibusf4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/photon,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/photon,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/shenzhou,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/shenzhou,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -shenzhou:thttpd -/arm/stm32/stm3210e-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm3210e-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/stm3220g-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm3220g-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/stm3240g-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm3240g-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI diff --git a/tools/ci/testlist/arm-10.dat b/tools/ci/testlist/arm-10.dat index c30d5ba188..1b9f2db311 100644 --- a/tools/ci/testlist/arm-10.dat +++ b/tools/ci/testlist/arm-10.dat @@ -1,15 +1,15 @@ -/arm/stm32/stm32_tiny,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32_tiny,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/stm32butterfly2,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32butterfly2,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/stm32f103-minimum,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32f103-minimum,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/stm32f334-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32f334-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/stm32f3discovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32f3discovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/stm32f411-minimum,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32f411-minimum,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/stm32f411e-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32f411e-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/stm32f429i-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32f429i-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI diff --git a/tools/ci/testlist/arm-11.dat b/tools/ci/testlist/arm-11.dat index 2d8f2239a7..46cef148a7 100644 --- a/tools/ci/testlist/arm-11.dat +++ b/tools/ci/testlist/arm-11.dat @@ -1,10 +1,10 @@ -/arm/stm32/stm32f4discovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32f4discovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -stm32f4discovery:cxxtest -stm32f4discovery:testlibcxx -stm32f4discovery:winbuild -/arm/stm32/stm32ldiscovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32ldiscovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/stm32vldiscovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32vldiscovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32/viewtool-stm32f107,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/viewtool-stm32f107,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI diff --git a/tools/ci/testlist/arm-12.dat b/tools/ci/testlist/arm-12.dat index 5fcca3045e..406df4231d 100644 --- a/tools/ci/testlist/arm-12.dat +++ b/tools/ci/testlist/arm-12.dat @@ -1,3 +1,3 @@ -/arm/stm32f*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32f*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/stm32h*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32h*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI diff --git a/tools/ci/testlist/arm-13.dat b/tools/ci/testlist/arm-13.dat index 5656de6595..e6bd412b24 100644 --- a/tools/ci/testlist/arm-13.dat +++ b/tools/ci/testlist/arm-13.dat @@ -1,8 +1,8 @@ -/arm/stm32l*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32l*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/str71x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/str71x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -/arm/[t-z]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/[t-z]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI -eagle100:nxflat -eagle100:thttpd -launchxl-cc1310:nsh diff --git a/tools/ci/testlist/macos.dat b/tools/ci/testlist/macos.dat index 9834d7b349..f3c9432570 100644 --- a/tools/ci/testlist/macos.dat +++ b/tools/ci/testlist/macos.dat @@ -23,7 +23,7 @@ # ARM -/arm/stm32/stm32f4discovery/configs/nsh,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL +/arm/stm32/stm32f4discovery/configs/nsh,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI # XTENSA