mirror of
https://github.com/apache/nuttx.git
synced 2026-06-02 01:21:26 +08:00
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:
+3
-13
@@ -261,20 +261,10 @@ config ARCH_MPU_HAS_NAPOT
|
|||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "Toolchain Selection"
|
prompt "Toolchain Selection"
|
||||||
default RISCV_TOOLCHAIN_GNU_RVGW if TOOLCHAIN_WINDOWS
|
default RISCV_TOOLCHAIN_GNU_RVG
|
||||||
default RISCV_TOOLCHAIN_GNU_RVGL if !TOOLCHAIN_WINDOWS
|
|
||||||
|
|
||||||
config RISCV_TOOLCHAIN_GNU_RVGL
|
config RISCV_TOOLCHAIN_GNU_RVG
|
||||||
bool "Generic GNU RVG toolchain under Linux (or other POSIX environment)"
|
bool "Generic GNU RVG toolchain"
|
||||||
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
|
|
||||||
select ARCH_TOOLCHAIN_GNU
|
select ARCH_TOOLCHAIN_GNU
|
||||||
---help---
|
---help---
|
||||||
This option should work for any modern GNU toolchain (GCC 5.2 or newer)
|
This option should work for any modern GNU toolchain (GCC 5.2 or newer)
|
||||||
|
|||||||
@@ -27,11 +27,7 @@
|
|||||||
# command-line selection.
|
# command-line selection.
|
||||||
#
|
#
|
||||||
|
|
||||||
ifeq ($(filter y, $(CONFIG_RISCV_TOOLCHAIN_GNU_RVGL)),y)
|
ifeq ($(filter y, $(CONFIG_RISCV_TOOLCHAIN_GNU_RVG)),y)
|
||||||
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVG
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(filter y, $(CONFIG_RISCV_TOOLCHAIN_GNU_RVGW)),y)
|
|
||||||
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVG
|
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVG
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1029,7 +1029,7 @@ testbuild.sh
|
|||||||
stm32f429i-disco:nsh
|
stm32f429i-disco:nsh
|
||||||
arduino-due:nsh
|
arduino-due:nsh
|
||||||
/arm
|
/arm
|
||||||
/risc-v,CONFIG_RISCV_TOOLCHAIN_GNU_RVGL
|
/risc-v
|
||||||
|
|
||||||
The first value is the usual configuration description of the form
|
The first value is the usual configuration description of the form
|
||||||
<board-name>:<configuration-name> or /<folder-name> and must correspond to a
|
<board-name>:<configuration-name> or /<folder-name> and must correspond to a
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
|
|
||||||
# RISC-V
|
# 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
|
# ARM
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
/risc-v,CONFIG_RISCV_TOOLCHAIN_GNU_RVGL
|
/risc-v
|
||||||
|
|||||||
Reference in New Issue
Block a user