From 2df591b3bb4088eff539ea32fa76d7f27b279f04 Mon Sep 17 00:00:00 2001 From: "chao.an" Date: Tue, 19 Apr 2022 14:38:36 +0800 Subject: [PATCH] arch/armv7-a/r: Unify the toolchain definition of eabi for linux and windows Signed-off-by: chao.an --- arch/arm/src/armv7-a/Kconfig | 16 +++------------- arch/arm/src/armv7-a/Toolchain.defs | 8 +------- arch/arm/src/armv7-r/Kconfig | 16 +++------------- arch/arm/src/armv7-r/Toolchain.defs | 8 +------- boards/arm/a1x/pcduino-a10/README.txt | 2 +- boards/arm/am335x/beaglebone-black/README.txt | 2 +- boards/arm/sama5/giant-board/README.md | 2 +- boards/arm/sama5/sama5d2-xult/README.txt | 2 +- boards/arm/sama5/sama5d3-xplained/README.txt | 9 ++++----- boards/arm/sama5/sama5d3x-ek/README.txt | 11 +++++------ boards/arm/sama5/sama5d4-ek/README.txt | 17 ++++++++--------- tools/ci/testlist/arm-01.dat | 2 +- 12 files changed, 30 insertions(+), 65 deletions(-) diff --git a/arch/arm/src/armv7-a/Kconfig b/arch/arm/src/armv7-a/Kconfig index 6ed729f5377..9f68fc3cfc6 100644 --- a/arch/arm/src/armv7-a/Kconfig +++ b/arch/arm/src/armv7-a/Kconfig @@ -128,25 +128,15 @@ endif # ARMV7A_HAVE_L2CC choice prompt "Toolchain Selection" - default ARMV7A_TOOLCHAIN_GNU_EABIW if TOOLCHAIN_WINDOWS - default ARMV7A_TOOLCHAIN_GNU_EABIL if !TOOLCHAIN_WINDOWS + default ARMV7A_TOOLCHAIN_GNU_EABI config ARMV7A_TOOLCHAIN_BUILDROOT bool "Buildroot (Cygwin or Linux)" select ARCH_TOOLCHAIN_GNU depends on !WINDOWS_NATIVE -config ARMV7A_TOOLCHAIN_GNU_EABIL - bool "Generic GNU EABI toolchain under Linux (or other POSIX environment)" - 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 ARMV7A_TOOLCHAIN_GNU_EABIW - bool "Generic GNU EABI toolchain under Windows" - depends on TOOLCHAIN_WINDOWS - select CYGWIN_WINTOOL if WINDOWS_CYGWIN +config ARMV7A_TOOLCHAIN_GNU_EABI + bool "Generic GNU EABI toolchain" select ARCH_TOOLCHAIN_GNU ---help--- This option should work for any modern GNU toolchain (GCC 4.5 or newer) diff --git a/arch/arm/src/armv7-a/Toolchain.defs b/arch/arm/src/armv7-a/Toolchain.defs index 465f0c220f2..2f03798197b 100644 --- a/arch/arm/src/armv7-a/Toolchain.defs +++ b/arch/arm/src/armv7-a/Toolchain.defs @@ -32,13 +32,7 @@ ifeq ($(filter y, \ endif ifeq ($(filter y, \ - $(CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIL) \ - ),y) - CONFIG_ARMV7A_TOOLCHAIN ?= GNU_EABI -endif - -ifeq ($(filter y, \ - $(CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW) \ + $(CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI) \ ),y) CONFIG_ARMV7A_TOOLCHAIN ?= GNU_EABI endif diff --git a/arch/arm/src/armv7-r/Kconfig b/arch/arm/src/armv7-r/Kconfig index ec787e786a6..21f0dc19653 100644 --- a/arch/arm/src/armv7-r/Kconfig +++ b/arch/arm/src/armv7-r/Kconfig @@ -128,25 +128,15 @@ endif # ARMV7R_HAVE_L2CC choice prompt "Toolchain Selection" - default ARMV7R_TOOLCHAIN_GNU_EABIW if TOOLCHAIN_WINDOWS - default ARMV7R_TOOLCHAIN_GNU_EABIL if !TOOLCHAIN_WINDOWS + default ARMV7R_TOOLCHAIN_GNU_EABI config ARMV7R_TOOLCHAIN_BUILDROOT bool "Buildroot (Cygwin or Linux)" select ARCH_TOOLCHAIN_GNU depends on !WINDOWS_NATIVE -config ARMV7R_TOOLCHAIN_GNU_EABIL - bool "Generic GNU EABI toolchain under Linux (or other POSIX environment)" - 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 ARMV7R_TOOLCHAIN_GNU_EABIW - bool "Generic GNU EABI toolchain under Windows" - depends on TOOLCHAIN_WINDOWS - select CYGWIN_WINTOOL if WINDOWS_CYGWIN +config ARMV7R_TOOLCHAIN_GNU_EABI + bool "Generic GNU EABI toolchain" select ARCH_TOOLCHAIN_GNU ---help--- This option should work for any modern GNU toolchain (GCC 4.5 or newer) diff --git a/arch/arm/src/armv7-r/Toolchain.defs b/arch/arm/src/armv7-r/Toolchain.defs index 06186dd8816..0c589fe2bee 100644 --- a/arch/arm/src/armv7-r/Toolchain.defs +++ b/arch/arm/src/armv7-r/Toolchain.defs @@ -32,13 +32,7 @@ ifeq ($(filter y, \ endif ifeq ($(filter y, \ - $(CONFIG_ARMV7R_TOOLCHAIN_GNU_EABIL) \ - ),y) - CONFIG_ARMV7R_TOOLCHAIN ?= GNU_EABI -endif - -ifeq ($(filter y, \ - $(CONFIG_ARMV7R_TOOLCHAIN_GNU_EABIW) \ + $(CONFIG_ARMV7R_TOOLCHAIN_GNU_EABI) \ ),y) CONFIG_ARMV7R_TOOLCHAIN ?= GNU_EABI endif diff --git a/boards/arm/a1x/pcduino-a10/README.txt b/boards/arm/a1x/pcduino-a10/README.txt index 2069e2c2a89..cd070e43b30 100644 --- a/boards/arm/a1x/pcduino-a10/README.txt +++ b/boards/arm/a1x/pcduino-a10/README.txt @@ -367,7 +367,7 @@ Configurations CONFIG_WINDOWS_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain Configuration Sub-directories ----------------------------- diff --git a/boards/arm/am335x/beaglebone-black/README.txt b/boards/arm/am335x/beaglebone-black/README.txt index 07145fe3a45..ad6570e481b 100644 --- a/boards/arm/am335x/beaglebone-black/README.txt +++ b/boards/arm/am335x/beaglebone-black/README.txt @@ -210,7 +210,7 @@ Configurations CONFIG_WINDOWS_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain Configuration Sub-directories ----------------------------- diff --git a/boards/arm/sama5/giant-board/README.md b/boards/arm/sama5/giant-board/README.md index 149411e2c2f..6e5c02b9d28 100644 --- a/boards/arm/sama5/giant-board/README.md +++ b/boards/arm/sama5/giant-board/README.md @@ -453,7 +453,7 @@ NOTES: System Type -> Toolchain: - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain 4. The SAMA5Dx is running at 528MHz by default in these configurations. diff --git a/boards/arm/sama5/sama5d2-xult/README.txt b/boards/arm/sama5/sama5d2-xult/README.txt index bbe5453a0b9..c038600b7de 100644 --- a/boards/arm/sama5/sama5d2-xult/README.txt +++ b/boards/arm/sama5/sama5d2-xult/README.txt @@ -757,7 +757,7 @@ Configurations CONFIG_WINDOWS_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain 4. The SAMA5Dx is running at 528MHz by default in these configurations. diff --git a/boards/arm/sama5/sama5d3-xplained/README.txt b/boards/arm/sama5/sama5d3-xplained/README.txt index ac2c675044d..d58eb078e7e 100644 --- a/boards/arm/sama5/sama5d3-xplained/README.txt +++ b/boards/arm/sama5/sama5d3-xplained/README.txt @@ -109,8 +109,7 @@ GNU Toolchain Options configuration options to your .config (or defconfig) file: CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIL=y : Generic GCC ARM EABI toolchain for Linux - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : Generic GCC ARM EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : Generic GCC ARM EABI toolchain NOTE about Windows native toolchains ------------------------------------ @@ -3110,7 +3109,7 @@ Configurations CONFIG_WINDOWS_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain 4. The SAMA5Dx is running at 396MHz by default in these configurations. This is because the original timing for the PLLs, NOR FLASH, and SDRAM @@ -3173,7 +3172,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under Windows - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain If you are running on Linux, make *certain* that you have CONFIG_HOST_LINUX=y *before* the first make or you will create a @@ -3235,7 +3234,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under windows - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain If you are running on Linux, make *certain* that you have CONFIG_HOST_LINUX=y *before* the first make or you will create a diff --git a/boards/arm/sama5/sama5d3x-ek/README.txt b/boards/arm/sama5/sama5d3x-ek/README.txt index 9d81e348048..a84d8f40315 100644 --- a/boards/arm/sama5/sama5d3x-ek/README.txt +++ b/boards/arm/sama5/sama5d3x-ek/README.txt @@ -131,8 +131,7 @@ GNU Toolchain Options configuration options to your .config (or defconfig) file: CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIL=y : Generic GCC ARM EABI toolchain for Linux - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : Generic GCC ARM EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : Generic GCC ARM EABI toolchain IDEs ==== @@ -3294,7 +3293,7 @@ Configurations CONFIG_WINDOWS_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain 4. The SAMA5Dx is running at 396MHz by default in these configurations. This is because the original timing for the PLLs, NOR FLASH, and SDRAM @@ -3390,7 +3389,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under Windows - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain If you are running on Linux, make *certain* that you have CONFIG_HOST_LINUX=y *before* the first make or you will create a @@ -3468,7 +3467,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under Windows - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain If you are running on Linux, make *certain* that you have CONFIG_HOST_LINUX=y *before* the first make or you will create a @@ -3541,7 +3540,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under Windows - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain If you are running on Linux, make *certain* that you have CONFIG_HOST_LINUX=y *before* the first make or you will create a diff --git a/boards/arm/sama5/sama5d4-ek/README.txt b/boards/arm/sama5/sama5d4-ek/README.txt index bd63adb3628..dd3cd2f868a 100644 --- a/boards/arm/sama5/sama5d4-ek/README.txt +++ b/boards/arm/sama5/sama5d4-ek/README.txt @@ -125,8 +125,7 @@ GNU Toolchain Options configuration options to your .config (or defconfig) file: CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIL=y : Generic GCC ARM EABI toolchain for Linux - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : Generic GCC ARM EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : Generic GCC ARM EABI toolchain IDEs ==== @@ -3573,7 +3572,7 @@ Configurations CONFIG_WINDOWS_CYGWIN=y : Using Cygwin or other POSIX environment System Type -> Toolchain: - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain 4. The SAMA5Dx is running at 528MHz by default in these configurations. @@ -3665,7 +3664,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under Windows - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain If you are running on Linux, make *certain* that you have CONFIG_HOST_LINUX=y *before* the first make or you will create a @@ -3734,7 +3733,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under Windows - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain If you are running on Linux, make *certain* that you have CONFIG_HOST_LINUX=y *before* the first make or you will create a @@ -3813,7 +3812,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under windows - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIL=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain If you are running on Linux, make *certain* that you have CONFIG_HOST_LINUX=y *before* the first make or you will create a @@ -3982,7 +3981,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under Windows - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain If you are running on Linux, make *certain* that you have CONFIG_HOST_LINUX=y *before* the first make or you will create a @@ -4228,7 +4227,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under windows - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain If you are running on Linux, make *certain* that you have CONFIG_HOST_LINUX=y *before* the first make or you will create a @@ -4880,7 +4879,7 @@ Configurations CONFIG_HOST_WINDOWS=y : Windows operating system CONFIG_WINDOWS_CYGWIN=y : POSIX environment under Windows - CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for Windows + CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain If you are running on Linux, make *certain* that you have CONFIG_HOST_LINUX=y *before* the first make or you will create a diff --git a/tools/ci/testlist/arm-01.dat b/tools/ci/testlist/arm-01.dat index 5d40ea8b7da..421f36ee5c7 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/[a]*,CONFIG_ARMV7A_TOOLCHAIN_GNU_EABI /arm/[b-h]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI