commit 108b7f7950058757f8b392f32cbb17c653484c61
author Sam Elliott <selliott@lowrisc.org> Wed Jun 03 11:52:24 2020 +0100
committer Philipp Wagner <mail@philipp-wagner.com> Wed Jun 03 13:25:17 2020 +0100
tree 3396b6b8de430a80a5983658be343141e8c94cdd
parent c09da26e6ff776adf7068f779b0656e04ee8f7ee

[sw] Switch CI to Combined Toolchain

Signed-off-by: Sam Elliott <selliott@lowrisc.org>

util/container/Dockerfile

diff --git a/util/container/Dockerfile b/util/container/Dockerfile
index 1de8eaa..0aa65d9 100644
--- a/util/container/Dockerfile
+++ b/util/container/Dockerfile
@@ -9,7 +9,7 @@
 ARG VERILATOR_VERSION=4.028
 
 # The RISCV toolchain version should match the release tag used in GitHub.
-ARG RISCV_TOOLCHAIN_TAR_VERSION=20191010-1
+ARG RISCV_TOOLCHAIN_TAR_VERSION=20200602-4
 
 # Build OpenOCD
 # OpenOCD is a tool to connect with the target chip over JTAG and similar

util/get-toolchain.py

diff --git a/util/get-toolchain.py b/util/get-toolchain.py
index 278ea38..dce06a2 100755
--- a/util/get-toolchain.py
+++ b/util/get-toolchain.py
@@ -27,7 +27,7 @@
 
 TARGET_DIR = '/tools/riscv'
 TOOLCHAIN_VERSION = 'latest'
-TOOLCHAIN_KIND = 'gcc-only'
+TOOLCHAIN_KIND = 'combined'
 
 FILE_PATTERNS_TO_REWRITE = [
     "riscv32-unknown-elf-*.cmake",