Skip to content

Commit

Permalink
Merge pull request #363 from hermit-os/opensbi-1.5.1
Browse files Browse the repository at this point in the history
ci: upgrade to opensbi-1.5.1
  • Loading branch information
mkroening authored Aug 15, 2024
2 parents 67afd13 + f026000 commit 011dfed
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ jobs:
- name: Dowload OpenSBI
if: matrix.target == 'riscv64'
run: |
gh release download v1.4 --repo riscv-software-src/opensbi --pattern 'opensbi-*-rv-bin.tar.xz'
tar -xvf opensbi-*-rv-bin.tar.xz opensbi-1.4-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin
gh release download v1.5.1 --repo riscv-software-src/opensbi --pattern 'opensbi-*-rv-bin.tar.xz'
tar -xvf opensbi-*-rv-bin.tar.xz opensbi-1.5.1-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin
- name: Download OVMF (prebuilt)
run: |
gh release download edk2-stable202405-r1 --repo rust-osdev/ovmf-prebuilt --pattern 'edk2-stable*-bin.tar.xz'
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ For 64-bit RISC-V, we need a recent version of [OpenSBI].
To download the release asset with [GitHub CLI] and extract the correct binary, run:

```bash
gh release download v1.4 --repo riscv-software-src/opensbi --pattern 'opensbi-*-rv-bin.tar.xz'
tar -xvf opensbi-*-rv-bin.tar.xz opensbi-1.4-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin
gh release download v1.5.1 --repo riscv-software-src/opensbi --pattern 'opensbi-*-rv-bin.tar.xz'
tar -xvf opensbi-*-rv-bin.tar.xz opensbi-1.5.1-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin
```

[OpenSBI]: https://github.com/riscv-software-src/opensbi
Expand All @@ -89,7 +89,7 @@ qemu-system-riscv64 \
-smp 1 \
-m 128M \
-display none -serial stdio \
-bios opensbi-1.4-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin
-bios opensbi-1.5.1-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin
-kernel <LOADER>
-initrd <APP>
```
Expand Down
2 changes: 1 addition & 1 deletion xtask/src/ci/qemu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl Qemu {
"-machine".to_string(),
"virt".to_string(),
"-bios".to_string(),
"opensbi-1.4-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin".to_string(),
"opensbi-1.5.1-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin".to_string(),
]
} else {
vec![]
Expand Down

0 comments on commit 011dfed

Please sign in to comment.