Merge pull request #553 from hermit-os/opensbi-ubuntu

ci: install OpenSBI from Ubuntu

Author: mkroening

.github/workflows/ci.yml

@@ -52,7 +52,7 @@ jobs:
           - arch: aarch64_be
             packages: qemu-system-arm ipxe-qemu u-boot-qemu u-boot-tools
           - arch: riscv64
-            packages: qemu-system-misc
+            packages: qemu-system-misc opensbi
     runs-on: ${{ (matrix.arch == 'aarch64' || matrix.arch == 'aarch64_be') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
     steps:
       - name: Install Packages
@@ -83,11 +83,6 @@ jobs:
         with:
           toolchain: ${{ matrix.arch == 'aarch64_be' && 'nightly' || 'stable' }}
           components: ${{ matrix.arch == 'aarch64_be' && 'rust-src' || '' }}
-      - name: Dowload OpenSBI
-        if: matrix.arch == 'riscv64'
-        run: |
-          gh release download v1.7 --repo riscv-software-src/opensbi --pattern 'opensbi-*-rv-bin.tar.xz'
-          tar -xvf opensbi-*-rv-bin.tar.xz opensbi-1.7-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin
       - run: cargo xtask ci qemu ${{ matrix.flags }} --target ${{ matrix.arch }}-elf
         if: matrix.arch == 'aarch64' || matrix.arch == 'aarch64_be'
       - run: cargo xtask ci qemu ${{ matrix.flags }} --target ${{ matrix.arch }}-elf --release

README.md

@@ -104,16 +104,9 @@ qemu-system-aarch64 \
 
 ### 64-bit RISC-V
 
-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.7 --repo riscv-software-src/opensbi --pattern 'opensbi-*-rv-bin.tar.xz'
-tar -xvf opensbi-*-rv-bin.tar.xz opensbi-1.7-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin
-```
+For 64-bit RISC-V, we need a recent version of [OpenSBI] (lp64 `fw_jump.bin`).
 
 [OpenSBI]: https://github.com/riscv-software-src/opensbi
-[GitHub CLI]: https://cli.github.com/
 
 The QEMU base command is as follows:
 
@@ -124,7 +117,7 @@ qemu-system-riscv64 \
     -smp 1 \
     -m 128M \
     -display none -serial stdio \
-    -bios opensbi-1.7-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin
+    -bios share/opensbi/lp64/generic/firmware/fw_jump.bin
     -kernel <LOADER>
     -initrd <APP> 
 ```

xtask/src/ci/qemu.rs

@@ -139,7 +139,7 @@ impl Qemu {
 				"-machine".to_string(),
 				"virt".to_string(),
 				"-bios".to_string(),
-				"opensbi-1.7-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin".to_string(),
+				"/usr/lib/riscv64-linux-gnu/opensbi/generic/fw_jump.bin".to_string(),
 			]
 		} else {
 			vec![]