Merge pull request #538 from sifive/bump-toolchain-v2020.08

Bump to Freedom Tools v2020.08

docker/Dockerfile

@@ -1,34 +1,37 @@
 FROM ubuntu:16.04 AS download-tarballs
 
-ARG RISCV_TOOLS_TARBALL=riscv64-unknown-elf-gcc-10.1.0-2020.07.0-x86_64-linux-ubuntu14.tar.gz
-ARG RISCV_PICOLIBC_TARBALL=riscv64-unknown-elf-picolibc-1.4.6-2020.07.0-x86_64-linux-ubuntu14.tar.gz
-ARG RISCV_SEGGER_LIBC_TARBALL=segger_libc_2020.07.0.tar.gz
-ARG QEMU_TARBALL=riscv-qemu-4.1.0-2019.08.0-x86_64-linux-ubuntu14.tar.gz
+ARG SIFIVE_TOOLS_URL=https://static.dev.sifive.com/dev-tools/freedom-tools/v2020.08
+
+ARG RISCV_TOOLS_TARBALL=riscv64-unknown-elf-gcc-10.1.0-2020.08.2-x86_64-linux-ubuntu14.tar.gz
+ARG RISCV_PICOLIBC_TARBALL=riscv64-unknown-elf-picolibc-1.4.6-2020.08.2-x86_64-linux-ubuntu14.tar.gz
+ARG RISCV_SEGGER_LIBC_TARBALL=segger_libc-2020.08.2.tar.bz2
+ARG QEMU_TARBALL=riscv-qemu-5.1.0-2020.08.1-x86_64-linux-ubuntu14.tar.gz
 
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y \
+    bzip2 \
     rsync \
     wget
 
 # Install picolibc
-RUN wget --no-verbose https://github.com/keith-packard/picolibc/releases/download/1.4.6/${RISCV_PICOLIBC_TARBALL} && \
+RUN wget --no-verbose https://github.com/picolibc/picolibc/releases/download/1.4.6/${RISCV_PICOLIBC_TARBALL} && \
     tar xzf ${RISCV_PICOLIBC_TARBALL}
 
 # Install RISC-V Toolchain
-RUN wget --no-verbose https://static.dev.sifive.com/dev-tools/freedom-tools/v2020.07/${RISCV_TOOLS_TARBALL} && \
+RUN wget --no-verbose ${SIFIVE_TOOLS_URL}/${RISCV_TOOLS_TARBALL} && \
     tar xzf ${RISCV_TOOLS_TARBALL} && \
     mkdir -p /tools && \
     rsync -a ${RISCV_TOOLS_TARBALL%.tar.gz}/* /tools/
 
 # Install Segger libc
 COPY ./segger-libc/${RISCV_SEGGER_LIBC_TARBALL} ./
-RUN tar xzf ${RISCV_SEGGER_LIBC_TARBALL} && \
-    cd ${RISCV_SEGGER_LIBC_TARBALL%.tar.gz} && \
+RUN tar xjf ${RISCV_SEGGER_LIBC_TARBALL} && \
+    cd ${RISCV_SEGGER_LIBC_TARBALL%.tar.bz2} && \
     RISCV_TOOL_PATH=/tools ./libc_segger_install.sh
 
 # Install QEMU
-RUN wget --no-verbose https://static.dev.sifive.com/dev-tools/${QEMU_TARBALL} && \
+RUN wget --no-verbose ${SIFIVE_TOOLS_URL}/${QEMU_TARBALL} && \
     tar xzf ${QEMU_TARBALL} && \
     mkdir -p /tools && \
     rsync -a ${QEMU_TARBALL%.tar.gz}/* /tools/