sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/armv8-m: Unify the toolchain definition of eabi/clang for linux and windows

Browse Source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-04-18 23:43:15 +08:00 committed by Xiang Xiao
parent bc998f6072
commit a79bf8c9eb
5 changed files with 10 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm/src/armv8-m/Kconfig
View File

@ -69,42 +69,24 @@ config ARMV8M_DTCM
choice choice
prompt "Toolchain Selection" prompt "Toolchain Selection"
default ARMV8M_TOOLCHAIN_GNU_EABIW if TOOLCHAIN_WINDOWS default ARMV8M_TOOLCHAIN_GNU_EABI
default ARMV8M_TOOLCHAIN_GNU_EABIL if !TOOLCHAIN_WINDOWS
config ARMV8M_TOOLCHAIN_BUILDROOT config ARMV8M_TOOLCHAIN_BUILDROOT
bool "Buildroot (Cygwin or Linux)" bool "Buildroot (Cygwin or Linux)"
depends on !WINDOWS_NATIVE depends on !WINDOWS_NATIVE
select ARCH_TOOLCHAIN_GNU select ARCH_TOOLCHAIN_GNU
config ARMV8M_TOOLCHAIN_GNU_EABIL config ARMV8M_TOOLCHAIN_GNU_EABI
bool "Generic GNU EABI toolchain under Linux (or other POSIX environment)" bool "Generic GNU EABI toolchain"
depends on !WINDOWS_NATIVE
select ARCH_TOOLCHAIN_GNU select ARCH_TOOLCHAIN_GNU
---help--- ---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer) This option should work for any modern GNU toolchain (GCC 4.5 or newer)
configured for arm-none-eabi. configured for arm-none-eabi.
config ARMV8M_TOOLCHAIN_GNU_EABIW config ARMV8M_TOOLCHAIN_CLANG
bool "Generic GNU EABI toolchain under Windows" bool "Generic Clang toolchain"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU 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 endchoice
config ARMV8M_OABI_TOOLCHAIN config ARMV8M_OABI_TOOLCHAIN

16
arch/arm/src/armv8-m/Toolchain.defs
View File

@ -34,25 +34,13 @@ ifeq ($(filter y, \
endif endif
ifeq ($(filter y, \ ifeq ($(filter y, \
$(CONFIG_ARMV8M_TOOLCHAIN_GNU_EABIL) \ $(CONFIG_ARMV8M_TOOLCHAIN_GNU_EABI) \
),y) ),y)
CONFIG_ARMV8M_TOOLCHAIN ?= GNU_EABI CONFIG_ARMV8M_TOOLCHAIN ?= GNU_EABI
endif endif
ifeq ($(filter y, \ ifeq ($(filter y, \
$(CONFIG_ARMV8M_TOOLCHAIN_GNU_EABIW) \ $(CONFIG_ARMV8M_TOOLCHAIN_CLANG) \
),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) \
),y) ),y)
CONFIG_ARMV8M_TOOLCHAIN ?= CLANG CONFIG_ARMV8M_TOOLCHAIN ?= CLANG
endif endif

2
boards/arm/stm32l5/nucleo-l552ze/README.txt
View File

@ -202,7 +202,7 @@ Configurations
CONFIG_HOST_LINUX=y : Linux environment CONFIG_HOST_LINUX=y : Linux environment
System Type -> Toolchain: 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 Configuration sub-directories
----------------------------- -----------------------------

2
boards/arm/stm32l5/stm32l562e-dk/README.txt
View File

@ -235,7 +235,7 @@ Configurations
CONFIG_HOST_LINUX=y : Linux environment CONFIG_HOST_LINUX=y : Linux environment
System Type -> Toolchain: 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 Configuration sub-directories
----------------------------- -----------------------------

2
boards/arm/stm32u5/b-u585i-iot02a/README.txt
View File

@ -130,7 +130,7 @@ Configurations
CONFIG_HOST_LINUX=y : Linux environment CONFIG_HOST_LINUX=y : Linux environment
System Type -> Toolchain: 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 Configuration sub-directories
----------------------------- -----------------------------