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

arch/arm/armv6-m: Unify the toolchain definition of eabi for linux and windows

Browse Source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-04-19 13:56:18 +08:00 committed by Xiang Xiao
parent 2246afcdd8
commit 4a085e1cdb
16 changed files with 24 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/src/arm/Kconfig
View File

@ -7,23 +7,14 @@ comment "ARM Configuration Options"
choice
prompt "Toolchain Selection"
default ARM_TOOLCHAIN_GNU_EABIW if TOOLCHAIN_WINDOWS
default ARM_TOOLCHAIN_GNU_EABIL if !TOOLCHAIN_WINDOWS
default ARM_TOOLCHAIN_GNU_EABI
config ARM_TOOLCHAIN_BUILDROOT
bool "Buildroot (Cygwin or Linux)"
depends on !WINDOWS_NATIVE
config ARM_TOOLCHAIN_GNU_EABIL
bool "Generic GNU EABI toolchain under Linux (or other POSIX environment)"
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
configured for arm-none-eabi-.
config ARM_TOOLCHAIN_GNU_EABIW
bool "Generic GNU EABI toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
config ARM_TOOLCHAIN_GNU_EABI
bool "Generic GNU EABI toolchain"
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
configured for arm-none-eabi-.

8
arch/arm/src/arm/Toolchain.defs
View File

@ -34,13 +34,7 @@ ifeq ($(filter y, \
endif
ifeq ($(filter y, \
$(CONFIG_ARM_TOOLCHAIN_GNU_EABIL) \
),y)
CONFIG_ARM_TOOLCHAIN ?= GNU_EABI
endif
ifeq ($(filter y, \
$(CONFIG_ARM_TOOLCHAIN_GNU_EABIW) \
$(CONFIG_ARM_TOOLCHAIN_GNU_EABI) \
),y)
CONFIG_ARM_TOOLCHAIN ?= GNU_EABI
endif

16
arch/arm/src/armv6-m/Kconfig
View File

@ -7,27 +7,17 @@ comment "ARMv6-M Configuration Options"
choice
prompt "Toolchain Selection"
default ARMV6M_TOOLCHAIN_GNU_EABIW if TOOLCHAIN_WINDOWS
default ARMV6M_TOOLCHAIN_GNU_EABIL if !TOOLCHAIN_WINDOWS
default ARMV6M_TOOLCHAIN_GNU_EABI
config ARMV6M_TOOLCHAIN_BUILDROOT
bool "Buildroot (Cygwin or Linux)"
depends on !WINDOWS_NATIVE
select ARCH_TOOLCHAIN_GNU
config ARMV6M_TOOLCHAIN_GNU_EABIL
bool "Generic GNU EABI toolchain under Linux (or other POSIX environment)"
config ARMV6M_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 ARMV6M_TOOLCHAIN_GNU_EABIW
bool "Generic GNU EABI toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
configured for arm-none-eabi.
endchoice

6
arch/arm/src/armv6-m/Toolchain.defs
View File

@ -31,11 +31,7 @@ ifeq ($(filter y, $(CONFIG_ARMV6M_TOOLCHAIN_BUILDROOT)),y)
CONFIG_ARMV6M_TOOLCHAIN ?= BUILDROOT
endif
ifeq ($(filter y, $(CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL)),y)
CONFIG_ARMV6M_TOOLCHAIN ?= GNU_EABI
endif
ifeq ($(filter y, $(CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW)),y)
ifeq ($(filter y, $(CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI)),y)
CONFIG_ARMV6M_TOOLCHAIN ?= GNU_EABI
endif

2
boards/arm/dm320/ntosd-dm320/README.txt
View File

@ -59,7 +59,7 @@ GNU Toolchain Options
a different toolchain, you simply need to modify the configuration. As an
example:
CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
Generic arm-none-eabi GNU Toolchain
-----------------------------------

4
boards/arm/lpc214x/zp214xpa/README.txt
View File

@ -308,7 +308,7 @@ Configurations:
2. Default platform/toolchain:
CONFIG_HOST_LINUX=y : Linux (Cygwin under Windows okay too).
CONFIG_ARM_TOOLCHAIN_GNU_EABIL=y : Buildroot (arm-nuttx-elf-gcc)
CONFIG_ARM_TOOLCHAIN_GNU_EABI=y : Buildroot (arm-nuttx-elf-gcc)
CONFIG_RAW_BINARY=y : Output formats: ELF and raw binary
nxlines:
@ -332,7 +332,7 @@ Configurations:
2. Default platform/toolchain:
CONFIG_HOST_LINUX=y : Linux (Cygwin under Windows okay too).
CONFIG_ARM_TOOLCHAIN_GNU_EABIL=y : Buildroot (arm-nuttx-elf-gcc)
CONFIG_ARM_TOOLCHAIN_GNU_EABI=y : Buildroot (arm-nuttx-elf-gcc)
CONFIG_RAW_BINARY=y : Output formats: ELF and raw binary
STATUS:

4
boards/arm/lpc31xx/ea3131/README.txt
View File

@ -39,7 +39,7 @@ GNU Toolchain Options
a different toolchain, you simply need to modify the configuration. As an
example:
CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
Generic arm-none-eabi GNU Toolchain
-----------------------------------
@ -560,7 +560,7 @@ Common Configuration Notes
CONFIG_HOST_WINDOWS=y
CONFIG_WINDOWS_CYGWIN=y
CONFIG_ARM_TOOLCHAIN_GNU_EABIW=y
CONFIG_ARM_TOOLCHAIN_GNU_EABI=y
Configuration Sub-Directories
-----------------------------

2
boards/arm/lpc31xx/ea3152/README.txt
View File

@ -38,7 +38,7 @@ GNU Toolchain Options
a different toolchain, you simply need to modify the configuration. As an
example:
CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
Generic arm-none-eabi GNU Toolchain
-----------------------------------

4
boards/arm/lpc31xx/olimex-lpc-h3131/README.txt
View File

@ -43,7 +43,7 @@ GNU Toolchain Options
a different toolchain, you simply need to modify the configuration. As an
example:
CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
Generic arm-none-eabi GNU Toolchain
-----------------------------------
@ -478,7 +478,7 @@ Configurations
CONFIG_WINDOWS_CYGWIN=y : Using Cygwin or other POSIX environment
System Type -> Toolchain:
CONFIG_ARM_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for windows
CONFIG_ARM_TOOLCHAIN_GNU_EABI=y : GNU EABI toolchain for windows
Configuration sub-directories
-----------------------------

5
boards/arm/samd2l2/samd20-xplained/README.txt
View File

@ -283,8 +283,7 @@ GNU Toolchain Options
the following configuration options to your .config (or defconfig) file:
CONFIG_ARMV6M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default)
CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL=y : Generic GCC ARM EABI toolchain for Linux
CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW=y : Generic GCC ARM EABI toolchain for Windows
CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI=y : Generic GCC ARM EABI toolchain
NOTE about Windows native toolchains
------------------------------------
@ -664,7 +663,7 @@ Configurations
that is easily reconfigured:
System Type -> Toolchain:
CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW=y
CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI=y
Any re-configuration should be done before making NuttX or else the
subsequent 'make' will fail. If you have already attempted building

2
boards/arm/samd2l2/samd21-xplained/README.txt
View File

@ -536,7 +536,7 @@ Configurations
that is easily reconfigured:
System Type -> Toolchain:
CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW=y
CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI=y
Any re-configuration should be done before making NuttX or else the
subsequent 'make' will fail. If you have already attempted building

2
boards/arm/samd2l2/saml21-xplained/README.txt
View File

@ -694,7 +694,7 @@ Configurations
that is easily reconfigured:
System Type -> Toolchain:
CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW=y
CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI=y
Any re-configuration should be done before making NuttX or else the
subsequent 'make' will fail. If you have already attempted building

2
boards/arm/stm32/nucleo-f446re/README.txt
View File

@ -106,7 +106,7 @@ GNU Toolchain Options
a different toolchain, you simply need to modify the configuration. As an
example:
CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
IDEs
====

2
boards/arm/stm32/nucleo-f4x1re/README.txt
View File

@ -129,7 +129,7 @@ GNU Toolchain Options
a different toolchain, you simply need to modify the configuration. As an
example:
CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
IDEs
====

2
boards/arm/stm32l4/nucleo-l432kc/README.txt
View File

@ -93,7 +93,7 @@ GNU Toolchain Options
a different toolchain, you simply need to modify the configuration. As an
example:
CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
IDEs
====

2
boards/arm/stm32l4/nucleo-l476rg/README.txt
View File

@ -106,7 +106,7 @@ GNU Toolchain Options
a different toolchain, you simply need to modify the configuration. As an
example:
CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
IDEs
====