diff options
| author | Tom Eccles <tom.eccles@codethink.co.uk> | 2020-10-09 15:16:10 +0100 |
|---|---|---|
| committer | Tom Eccles <tom.eccles@codethink.co.uk> | 2020-10-09 16:11:18 +0100 |
| commit | a4a0342cf59a1bff43ed79586065eb97dba0cddb (patch) | |
| tree | bfd4ff8dfe58087e3129f46e047ffa10301e1e71 | |
| parent | 6b8b396aeead9ee6dec7167b323174d220cfb2bd (diff) | |
| download | rust-a4a0342cf59a1bff43ed79586065eb97dba0cddb.tar.gz rust-a4a0342cf59a1bff43ed79586065eb97dba0cddb.zip | |
ci: disabled: riscv: work around QEMU regression
This bumps the version of the bbl bootloader not to perform 64-bit accesses to the PLIC. Doing so resulted in the QEMU test machine to fail to boot: bbl loader ../machine/mtrap.c:21: machine mode: unhandlable trap 7 @ 0x0000000080001f6e Power off Signed-off-by: Tom Eccles <tom.eccles@codethink.co.uk>
| -rw-r--r-- | src/ci/docker/host-x86_64/disabled/riscv64gc-linux/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/docker/host-x86_64/disabled/riscv64gc-linux/Dockerfile b/src/ci/docker/host-x86_64/disabled/riscv64gc-linux/Dockerfile index 3c39a638496..f3f52ed61d1 100644 --- a/src/ci/docker/host-x86_64/disabled/riscv64gc-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/disabled/riscv64gc-linux/Dockerfile @@ -84,9 +84,9 @@ RUN riscv64-linux-gnu-gcc addentropy.c -o rootfs/addentropy -static # download and build the riscv bootloader RUN git clone https://github.com/riscv/riscv-pk WORKDIR /tmp/riscv-pk -# nothing special about this revision: it is just master at the time of writing -# v1.0.0 doesn't build -RUN git checkout 5d9ed238e1cabfbca3c47f50d32894ce94bfc304 +# This revision fixes a fault in recent QEMU from 64-bit accesses to the PLIC +# commits later than this one should work too +RUN git checkout 7d8b7c0dab72108e3ea7bb7744d3f6cc907c7ef4 RUN mkdir build && cd build && \ ../configure --with-payload=/tmp/vmlinux --host=riscv64-linux-gnu && \ make -j$(nproc) && \ |