tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/38334?usp=email )

Change subject: fpga-build: Update RISC-V toolchain to riscv-none-elf ......................................................................

fpga-build: Update RISC-V toolchain to riscv-none-elf

The riscv-none-embeded was deprecated ...

Change-Id: Iecdeae61f730d55d4e76056472100ca926229270 Signed-off-by: Sylvain Munaut tnt@246tNt.com --- M fpga-build/Dockerfile 1 file changed, 6 insertions(+), 6 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/34/38334/1

diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile index a5444d2..78eaaf6 100644 --- a/fpga-build/Dockerfile +++ b/fpga-build/Dockerfile @@ -3,7 +3,7 @@

# Arguments used after FROM must be specified again ARG FPGA_TOOLCHAIN_DATE=20200914 -ARG RISCV_TOOLCHAIN_VER=8.3.0-1.2 +ARG RISCV_TOOLCHAIN_VER=14.2.0-2

# Install fpga-toolchain RUN set -x && \ @@ -11,10 +11,10 @@ tar -C /opt -xf fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz && \ rm fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz

-# Install riscv-none-embed-gcc +# Install riscv-none-elf-gcc RUN set -x && \ - wget --quiet https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/downl... && \ - tar -C /opt -xf /xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz && \ - rm xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz + wget --quiet https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/downloa... && \ + tar -C /opt -xf xpack-riscv-none-elf-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz && \ + rm xpack-riscv-none-elf-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz

-ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH} +ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-elf-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH}