fesvr: Remove legacy repo and update Spike

The riscv-fesvr repo has been merged with Spike. This commit removes
the legacy install and updates riscv-isa-sim to the latest version.

Signed-off-by: Florian Zaruba <florian@openhwgroup.org>
This commit is contained in:
Florian Zaruba 2020-08-24 07:42:07 +02:00 committed by Florian Zaruba
parent a89032f96b
commit c04a73ec9d
3 changed files with 2 additions and 32 deletions

View file

@ -60,8 +60,6 @@ before_install:
stages:
- sw_build
# - compile1
- compile2
- test
jobs:
@ -73,7 +71,6 @@ jobs:
- mkdir -p $RISCV
- wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2020.04.0-x86_64-linux-ubuntu14.tar.gz
- tar -x -f riscv64-unknown-elf-gcc-8.3.0-2020.04.0-x86_64-linux-ubuntu14.tar.gz --strip-components=1 -C $RISCV
- ci/install-fesvr.sh
- ci/install-spike.sh
- stage: test

View file

@ -1,27 +0,0 @@
#!/bin/bash
set -e
ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
VERSION=30e85ce253788b29bd4ac0b5e5c23a077d96dc24
cd $ROOT/tmp
if [ -z ${NUM_JOBS} ]; then
NUM_JOBS=1
fi
if [ ! -e "${RISCV}/lib/libfesvr.so" ]; then
echo "Installing RISCV FESVR"
git clone https://github.com/riscv/riscv-fesvr.git
cd riscv-fesvr
git checkout $VERSION
mkdir -p build
cd build
../configure --prefix="$RISCV/"
make -j${NUM_JOBS}
make install
else
echo "Using RISCV FESVR from cached directory."
fi

View file

@ -1,7 +1,7 @@
#!/bin/bash
set -e
ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
VERSION="def4c5b104efd382e633d5fdca49508757bb5e23"
VERSION="5f76a0d1fa68bb80560cb890405c42041f744e89"
cd $ROOT/tmp
@ -11,7 +11,7 @@ fi
if [ ! -e "${RISCV}/bin/spike" ]; then
echo "Installing Spike"
git clone https://github.com/riscv/riscv-isa-sim.git
git clone https://github.com/riscv/riscv-isa-sim.git
cd riscv-isa-sim
git checkout $VERSION
mkdir -p build