Revert to Xpack version

pretis · Sep 16, 2024 · 3cd63e9 · 3cd63e9
1 parent 13c6e0d
commit 3cd63e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,11 @@ jobs:
       - name: Cache Scala
         uses: coursier/cache-action@v5
       - name: Install dependencies
-        run: sudo apt install verilator gcc-riscv64-unknown-elf cmake -y
+        run: |
+          sudo apt install verilator cmake -y
+          wget -q https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v14.2.0-2/xpack-riscv-none-elf-gcc-14.2.0-2-linux-x64.tar.gz -O riscv-none-elf-gcc.tar.gz
+          tar xf riscv-none-elf-gcc.tar.gz --directory=~/opt/riscv-none-elf-gcc
+          echo "PATH=$PATH:/opt/riscv-none-elf-gcc/bin" >> $GITHUB_ENV
       - name: Run Chisel unit tests
         run: sbt 'test'
       - name: Build emulator and SDK

diff --git a/sdk/cmake/riscv-toolchain.cmake b/sdk/cmake/riscv-toolchain.cmake
@@ -20,7 +20,7 @@ set(RISCV_HOST_TAG linux)
 set(RISCV_TOOL_PATH $ENV{RISCV_TOOL_PATH_PREFIX} CACHE PATH "RISC-V tool path" FORCE)
 
 set(RISCV_TOOLCHAIN_ROOT "${RISCV_TOOL_PATH}/bin" CACHE PATH "RISC-V compiler path")
-set(RISCV_TOOLCHAIN_PREFIX "riscv64-unknown-elf-" CACHE STRING "RISC-V toolchain prefix")
+set(RISCV_TOOLCHAIN_PREFIX "riscv-none-elf-" CACHE STRING "RISC-V toolchain prefix")
 set(CMAKE_FIND_ROOT_PATH ${RISCV_TOOLCHAIN_ROOT})
 list(APPEND CMAKE_PREFIX_PATH "${RISCV_TOOLCHAIN_ROOT}")