OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

arch/risc-v: Unify the toolchain definition of RVG for linux and windows 

Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-04-19 17:55:26 +08:00 committed by Xiang Xiao
parent 2df591b3bb
commit e066d5d1e0
5 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/risc-v/Kconfig
View File

@ -261,20 +261,10 @@ config ARCH_MPU_HAS_NAPOT
choice
prompt "Toolchain Selection"
default RISCV_TOOLCHAIN_GNU_RVGW if TOOLCHAIN_WINDOWS
default RISCV_TOOLCHAIN_GNU_RVGL if !TOOLCHAIN_WINDOWS
default RISCV_TOOLCHAIN_GNU_RVG
config RISCV_TOOLCHAIN_GNU_RVGL
bool "Generic GNU RVG toolchain under Linux (or other POSIX environment)"
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 5.2 or newer)
configured for riscv64-unknown-elf.
config RISCV_TOOLCHAIN_GNU_RVGW
bool "Generic GNU RVG toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
config RISCV_TOOLCHAIN_GNU_RVG
bool "Generic GNU RVG toolchain"
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 5.2 or newer)

6
arch/risc-v/src/common/Toolchain.defs
View File

@ -27,11 +27,7 @@
# command-line selection.
#
ifeq ($(filter y, $(CONFIG_RISCV_TOOLCHAIN_GNU_RVGL)),y)
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVG
endif
ifeq ($(filter y, $(CONFIG_RISCV_TOOLCHAIN_GNU_RVGW)),y)
ifeq ($(filter y, $(CONFIG_RISCV_TOOLCHAIN_GNU_RVG)),y)
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVG
endif

2
tools/README.txt
View File

@ -1029,7 +1029,7 @@ testbuild.sh
stm32f429i-disco:nsh
arduino-due:nsh
/arm
/risc-v,CONFIG_RISCV_TOOLCHAIN_GNU_RVGL
/risc-v
The first value is the usual configuration description of the form
<board-name>:<configuration-name> or /<folder-name> and must correspond to a

4
tools/ci/testlist/macos.dat
View File

@ -17,9 +17,9 @@
# RISC-V
/risc-v/bl602/bl602evb/configs/wifi,CONFIG_RISCV_TOOLCHAIN_GNU_RVGL
/risc-v/bl602/bl602evb/configs/wifi
/risc-v/esp32c3/esp32c3-devkit/configs/wapi,CONFIG_RISCV_TOOLCHAIN_GNU_RVGL
/risc-v/esp32c3/esp32c3-devkit/configs/wapi
# ARM

2
tools/ci/testlist/risc-v.dat
View File

@ -1 +1 @@
/risc-v,CONFIG_RISCV_TOOLCHAIN_GNU_RVGL
/risc-v