From a79bf8c9eb483156c392bbda8a04344c5664b29f Mon Sep 17 00:00:00 2001 From: "chao.an" Date: Mon, 18 Apr 2022 23:43:15 +0800 Subject: [PATCH] arch/armv8-m: Unify the toolchain definition of eabi/clang for linux and windows Signed-off-by: chao.an --- arch/arm/src/armv8-m/Kconfig | 28 ++++---------------- arch/arm/src/armv8-m/Toolchain.defs | 16 ++--------- boards/arm/stm32l5/nucleo-l552ze/README.txt | 2 +- boards/arm/stm32l5/stm32l562e-dk/README.txt | 2 +- boards/arm/stm32u5/b-u585i-iot02a/README.txt | 2 +- 5 files changed, 10 insertions(+), 40 deletions(-) diff --git a/arch/arm/src/armv8-m/Kconfig b/arch/arm/src/armv8-m/Kconfig index 4ae3fcec507..3e499b6a043 100644 --- a/arch/arm/src/armv8-m/Kconfig +++ b/arch/arm/src/armv8-m/Kconfig @@ -69,42 +69,24 @@ config ARMV8M_DTCM choice prompt "Toolchain Selection" - default ARMV8M_TOOLCHAIN_GNU_EABIW if TOOLCHAIN_WINDOWS - default ARMV8M_TOOLCHAIN_GNU_EABIL if !TOOLCHAIN_WINDOWS + default ARMV8M_TOOLCHAIN_GNU_EABI config ARMV8M_TOOLCHAIN_BUILDROOT bool "Buildroot (Cygwin or Linux)" depends on !WINDOWS_NATIVE select ARCH_TOOLCHAIN_GNU -config ARMV8M_TOOLCHAIN_GNU_EABIL - bool "Generic GNU EABI toolchain under Linux (or other POSIX environment)" - depends on !WINDOWS_NATIVE +config ARMV8M_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) configured for arm-none-eabi. -config ARMV8M_TOOLCHAIN_GNU_EABIW - bool "Generic GNU EABI toolchain under Windows" - depends on TOOLCHAIN_WINDOWS - select CYGWIN_WINTOOL if WINDOWS_CYGWIN +config ARMV8M_TOOLCHAIN_CLANG + bool "Generic Clang toolchain" select ARCH_TOOLCHAIN_GNU -config ARMV8M_TOOLCHAIN_CLANGL - bool "Generic Clang toolchain under Linux (or other POSIX environment)" - depends on !WINDOWS_NATIVE - select ARCH_TOOLCHAIN_GNU - -config ARMV8M_TOOLCHAIN_CLANGW - bool "Generic Clang toolchain under Windows" - depends on TOOLCHAIN_WINDOWS - 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. - endchoice config ARMV8M_OABI_TOOLCHAIN diff --git a/arch/arm/src/armv8-m/Toolchain.defs b/arch/arm/src/armv8-m/Toolchain.defs index 81321ea145b..b7feb56c67c 100644 --- a/arch/arm/src/armv8-m/Toolchain.defs +++ b/arch/arm/src/armv8-m/Toolchain.defs @@ -34,25 +34,13 @@ ifeq ($(filter y, \ endif ifeq ($(filter y, \ - $(CONFIG_ARMV8M_TOOLCHAIN_GNU_EABIL) \ + $(CONFIG_ARMV8M_TOOLCHAIN_GNU_EABI) \ ),y) CONFIG_ARMV8M_TOOLCHAIN ?= GNU_EABI endif ifeq ($(filter y, \ - $(CONFIG_ARMV8M_TOOLCHAIN_GNU_EABIW) \ - ),y) - CONFIG_ARMV8M_TOOLCHAIN ?= GNU_EABI -endif - -ifeq ($(filter y, \ - $(CONFIG_ARMV8M_TOOLCHAIN_CLANGL) \ - ),y) - CONFIG_ARMV8M_TOOLCHAIN ?= CLANG -endif - -ifeq ($(filter y, \ - $(CONFIG_ARMV8M_TOOLCHAIN_CLANGW) \ + $(CONFIG_ARMV8M_TOOLCHAIN_CLANG) \ ),y) CONFIG_ARMV8M_TOOLCHAIN ?= CLANG endif diff --git a/boards/arm/stm32l5/nucleo-l552ze/README.txt b/boards/arm/stm32l5/nucleo-l552ze/README.txt index e5c7f9ee9ed..b2df324f81c 100644 --- a/boards/arm/stm32l5/nucleo-l552ze/README.txt +++ b/boards/arm/stm32l5/nucleo-l552ze/README.txt @@ -202,7 +202,7 @@ Configurations CONFIG_HOST_LINUX=y : Linux environment System Type -> Toolchain: - CONFIG_ARMV8M_TOOLCHAIN_GNU_EABIL=y : GNU ARM EABI toolchain + CONFIG_ARMV8M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories ----------------------------- diff --git a/boards/arm/stm32l5/stm32l562e-dk/README.txt b/boards/arm/stm32l5/stm32l562e-dk/README.txt index ad1e2c7c011..2b0065f0e03 100644 --- a/boards/arm/stm32l5/stm32l562e-dk/README.txt +++ b/boards/arm/stm32l5/stm32l562e-dk/README.txt @@ -235,7 +235,7 @@ Configurations CONFIG_HOST_LINUX=y : Linux environment System Type -> Toolchain: - CONFIG_ARMV8M_TOOLCHAIN_GNU_EABIL=y : GNU ARM EABI toolchain + CONFIG_ARMV8M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories ----------------------------- diff --git a/boards/arm/stm32u5/b-u585i-iot02a/README.txt b/boards/arm/stm32u5/b-u585i-iot02a/README.txt index 7b92118240d..d6d220e8c28 100644 --- a/boards/arm/stm32u5/b-u585i-iot02a/README.txt +++ b/boards/arm/stm32u5/b-u585i-iot02a/README.txt @@ -130,7 +130,7 @@ Configurations CONFIG_HOST_LINUX=y : Linux environment System Type -> Toolchain: - CONFIG_ARMV8M_TOOLCHAIN_GNU_EABIL=y : GNU ARM EABI toolchain + CONFIG_ARMV8M_TOOLCHAIN_GNU_EABI=y : GNU ARM EABI toolchain Configuration sub-directories -----------------------------