Skip to content

Commit 9840418

Browse files
authored
Merge pull request #5128 from liukangcc/action
[update] add riscv toolchain for ci.
2 parents 0211f2f + 791ec32 commit 9840418

File tree

4 files changed

+26
-5
lines changed

4 files changed

+26
-5
lines changed

.github/workflows/action.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- {RTT_BSP: "at91sam9260", RTT_TOOL_CHAIN: "sourcery-arm"}
3737
- {RTT_BSP: "allwinner_tina", RTT_TOOL_CHAIN: "sourcery-arm"}
3838
- {RTT_BSP: "gd32e230k-start", RTT_TOOL_CHAIN: "sourcery-arm"}
39+
- {RTT_BSP: "gd32vf103v-eval", RTT_TOOL_CHAIN: "sourcery-riscv-none-embed"}
3940
- {RTT_BSP: "gd32303e-eval", RTT_TOOL_CHAIN: "sourcery-arm"}
4041
- {RTT_BSP: "gd32450z-eval", RTT_TOOL_CHAIN: "sourcery-arm"}
4142
- {RTT_BSP: "imx6sx/cortex-a9", RTT_TOOL_CHAIN: "sourcery-arm"}
@@ -137,7 +138,7 @@ jobs:
137138
- {RTT_BSP: "raspberry-pi/raspi4-32", RTT_TOOL_CHAIN: "sourcery-arm"}
138139
- {RTT_BSP: "hc32l196", RTT_TOOL_CHAIN: "sourcery-arm"}
139140
- {RTT_BSP: "tae32f5300", RTT_TOOL_CHAIN: "sourcery-arm"}
140-
- {RTT_BSP: "bluetrum/ab32vg1-ab-prougen", RTT_TOOL_CHAIN: "sourcery-riscv"}
141+
- {RTT_BSP: "bluetrum/ab32vg1-ab-prougen", RTT_TOOL_CHAIN: "sourcery-riscv64-unknown-elf"}
141142
steps:
142143
- uses: actions/checkout@v2
143144
- name: Set up Python
@@ -171,6 +172,22 @@ jobs:
171172
/opt/mips-2016.05/bin/mips-sde-elf-gcc --version
172173
echo "RTT_EXEC_PATH=/opt/mips-2016.05/bin" >> $GITHUB_ENV
173174
175+
- name: Install Riscv64-unknown-elf ToolChains
176+
if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'sourcery-riscv64-unknown-elf' && success() }}
177+
run: |
178+
wget -q https://static.dev.sifive.com/dev-tools/freedom-tools/v2020.12/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz
179+
sudo tar zxvf riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz -C /opt
180+
/opt/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc --version
181+
echo "RTT_EXEC_PATH=/opt/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin" >> $GITHUB_ENV
182+
183+
- name: Install Riscv-none-embed ToolChains
184+
if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'sourcery-riscv-none-embed' && success() }}
185+
run: |
186+
wget -q https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v8.3.0-2.3/xpack-riscv-none-embed-gcc-8.3.0-2.3-linux-x64.tar.gz
187+
sudo tar zxvf xpack-riscv-none-embed-gcc-8.3.0-2.3-linux-x64.tar.gz -C /opt
188+
/opt/xpack-riscv-none-embed-gcc-8.3.0-2.3/bin/riscv-none-embed-gcc --version
189+
echo "RTT_EXEC_PATH=/opt/xpack-riscv-none-embed-gcc-8.3.0-2.3/bin" >> $GITHUB_ENV
190+
174191
- name: Bsp Scons Compile
175192
if: ${{ success() }}
176193
shell: bash

bsp/bluetrum/ab32vg1-ab-prougen/rtconfig.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import os
2+
import platform
3+
24

35
# toolchains options
46
ARCH ='risc-v'
@@ -55,8 +57,10 @@
5557

5658
DUMP_ACTION = OBJDUMP + ' -D -S $TARGET > rtt.asm\n'
5759
POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
58-
POST_ACTION += './riscv32-elf-xmaker -b rtthread.xm\n'
59-
POST_ACTION += './riscv32-elf-xmaker -b download.xm\n'
60+
61+
if "Windows" in platform.platform():
62+
POST_ACTION += './riscv32-elf-xmaker -b rtthread.xm\n'
63+
POST_ACTION += './riscv32-elf-xmaker -b download.xm\n'
6064

6165
def dist_handle(BSP_ROOT, dist_dir):
6266
import sys

bsp/bluetrum/libraries/hal_libraries/ab32vg1_hal/SConscript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ ASFLAGS = ""
4848
CPPDEFINES = []
4949
LOCAL_CPPDEFINES = []
5050

51-
LIBS = []
52-
LIBPATH = []
51+
LIBS = ['hal']
52+
LIBPATH = [CWD]
5353

5454
LINKFLAGS = ""
5555

36.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)