Skip to content

Commit

Permalink
ci/Dockerfile: Update riscv toolchain to gcc13.2.0
Browse files Browse the repository at this point in the history
and change the default toolchain to riscv32-unknown-elf-

Signed-off-by: Xiang Xiao <[email protected]>
  • Loading branch information
xiaoxiang781216 committed Aug 20, 2023
1 parent 8f297f7 commit f73e367
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion arch/risc-v/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ config ARCH_MPU_HAS_NAPOT

choice
prompt "Toolchain Selection"
default RISCV_TOOLCHAIN_GNU_RV64
default RISCV_TOOLCHAIN_GNU_RV32

config RISCV_TOOLCHAIN_GNU_RV64
bool "Generic GNU RV64 toolchain"
Expand Down
16 changes: 8 additions & 8 deletions tools/ci/docker/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ RUN cd /tools/renesas-tools/build/gcc && \
# Build image for tool required by RISCV builds
###############################################################################
FROM nuttx-toolchain-base AS nuttx-toolchain-riscv
# Download the latest RISCV GCC toolchain prebuilt by SiFive
RUN mkdir riscv64-unknown-elf-gcc && \
curl -s -L "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" \
| tar -C riscv64-unknown-elf-gcc --strip-components 1 -xz
# Download the latest RISCV GCC toolchain prebuilt by Embecosm
RUN mkdir riscv32-unknown-elf-gcc && \
curl -s -L "https://buildbot.embecosm.com/job/riscv32-gcc-ubuntu2204-release/10/artifact/riscv32-embecosm-ubuntu2204-gcc13.2.0.tar.gz" \
| tar -C riscv32-unknown-elf-gcc --strip-components 1 -xz

###############################################################################
# Build image for tool required by SPARC builds
Expand Down Expand Up @@ -349,8 +349,8 @@ COPY --from=nuttx-toolchain-renesas /tools/renesas-toolchain/rx-elf-gcc/ renesas
ENV PATH="/tools/renesas-toolchain/rx-elf-gcc/bin:$PATH"

# RISCV toolchain
COPY --from=nuttx-toolchain-riscv /tools/riscv64-unknown-elf-gcc/ riscv64-unknown-elf-gcc/
ENV PATH="/tools/riscv64-unknown-elf-gcc/bin:$PATH"
COPY --from=nuttx-toolchain-riscv /tools/riscv32-unknown-elf-gcc/ riscv32-unknown-elf-gcc/
ENV PATH="/tools/riscv32-unknown-elf-gcc/bin:$PATH"

# SPARC toolchain
COPY --from=nuttx-toolchain-sparc /tools/sparc-gaisler-elf-gcc/ sparc-gaisler-elf-gcc/
Expand Down Expand Up @@ -392,8 +392,8 @@ RUN mkdir -p /tools/ccache/bin && \
ln -sf `which ccache` /tools/ccache/bin/g++ && \
ln -sf `which ccache` /tools/ccache/bin/p32-gcc && \
ln -sf `which ccache` /tools/ccache/bin/rx-elf-gcc && \
ln -sf `which ccache` /tools/ccache/bin/riscv64-unknown-elf-gcc && \
ln -sf `which ccache` /tools/ccache/bin/riscv64-unknown-elf-g++ && \
ln -sf `which ccache` /tools/ccache/bin/riscv32-unknown-elf-gcc && \
ln -sf `which ccache` /tools/ccache/bin/riscv32-unknown-elf-g++ && \
ln -sf `which ccache` /tools/ccache/bin/sparc-gaisler-elf-gcc && \
ln -sf `which ccache` /tools/ccache/bin/sparc-gaisler-elf-g++ && \
ln -sf `which ccache` /tools/ccache/bin/xtensa-esp32-elf-gcc && \
Expand Down
4 changes: 2 additions & 2 deletions tools/ci/testlist/macos.dat
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

# RISC-V

/risc-v/bl602/bl602evb/configs/wifi
/risc-v/bl602/bl602evb/configs/wifi,CONFIG_RISCV_TOOLCHAIN_GNU_RV64

/risc-v/esp32c3/esp32c3-devkit/configs/wifi
/risc-v/esp32c3/esp32c3-devkit/configs/wifi,CONFIG_RISCV_TOOLCHAIN_GNU_RV64

# ARM

Expand Down

0 comments on commit f73e367

Please sign in to comment.