Skip to content

Commit

Permalink
ci: upgrade OpenSBI to version 1.4
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Kröning <[email protected]>
  • Loading branch information
mkroening committed Apr 16, 2024
1 parent e193fe4 commit bd35d6e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@ jobs:
kernel/hermit-builtins
- name: Download loader
run: gh release download --repo hermit-os/loader --pattern hermit-loader-${{ matrix.arch }}
- name: Dowload OpenSBI
if: matrix.arch == '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
- name: Install virtiofsd
run: cargo install --locked virtiofsd
if: matrix.arch == 'x86_64'
Expand Down
9 changes: 7 additions & 2 deletions xtask/src/ci/qemu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,12 @@ impl Qemu {
} else if self.build.cargo_build.artifact.arch == Arch::Aarch64 {
vec!["-machine".to_string(), "virt,gic-version=3".to_string()]
} else if self.build.cargo_build.artifact.arch == Arch::Riscv64 {
vec!["-machine".to_string(), "virt".to_string()]
vec![
"-machine".to_string(),
"virt".to_string(),
"-bios".to_string(),
"opensbi-1.4-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin".to_string(),
]
} else {
vec![]
}
Expand Down Expand Up @@ -203,7 +208,7 @@ impl Qemu {
fn memory(&self) -> usize {
let mut memory = 32usize;
if self.build.cargo_build.artifact.arch == Arch::Riscv64 {
memory *= 2;
memory *= 4;
}
if self.build.cargo_build.artifact.profile() == "dev" {
memory *= 4;
Expand Down

0 comments on commit bd35d6e

Please sign in to comment.