It will be soon 5 years that we had that quirk to download opensbi-riscv32-generic-fw_dynamic.bin, because the QEMU version in Debian back then didn't ship with it.
This should no longer be needed nowadays, so drop all the special handling we have for this. Signed-off-by: Ahmad Fatoum <[email protected]> --- .github/workflows/test-labgrid-pytest.yml | 4 ---- test/Containerfile | 2 -- test/riscv/qemu@virt32_defconfig.yaml | 5 ----- 3 files changed, 11 deletions(-) diff --git a/.github/workflows/test-labgrid-pytest.yml b/.github/workflows/test-labgrid-pytest.yml index de06fab3e136..d387f9e3867a 100644 --- a/.github/workflows/test-labgrid-pytest.yml +++ b/.github/workflows/test-labgrid-pytest.yml @@ -114,10 +114,6 @@ jobs: ./MAKEALL -O ${KBUILD_OUTPUT} -l "" -v 0 ${{matrix.defconfig}} - if [ ${{matrix.arch}} = "riscv" ]; then - cp /usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.bin ${KBUILD_OUTPUT}/ - fi - - name: labgrid-pytest if: steps.build.outcome == 'success' run: | diff --git a/test/Containerfile b/test/Containerfile index c9e11b45985f..196000ce1c8e 100644 --- a/test/Containerfile +++ b/test/Containerfile @@ -85,8 +85,6 @@ RUN tgz_checksum_dl() { set -e; wget -nv -O archive.tgz "$1"; \ tgz_checksum_dl https://github.com/kalray/build-scripts/releases/download/v5.2.0/gcc-kalray-kvx-ubuntu-22.04-v5.2.0.tar.gz \ f59964cac188f1e5a8f628d0abef68e3b6ceebdae18dff51625472329fe6ec40 -RUN wget -nv "https://github.com/qemu/qemu/blob/v10.1.0/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin?raw=true"; -O /usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.bin - # Create our user/group RUN useradd -m -U barebox RUN echo barebox ALL=NOPASSWD: ALL > /etc/sudoers.d/barebox diff --git a/test/riscv/qemu@virt32_defconfig.yaml b/test/riscv/qemu@virt32_defconfig.yaml index d0b640aa189e..7f1423f660ec 100644 --- a/test/riscv/qemu@virt32_defconfig.yaml +++ b/test/riscv/qemu@virt32_defconfig.yaml @@ -7,7 +7,6 @@ targets: cpu: rv32 memory: 256M kernel: barebox-dt-2nd.img - bios: opensbi-riscv32-generic-fw_dynamic.bin display: qemu-default BareboxDriver: prompt: 'barebox@[^:]+:[^ ]+ ' @@ -17,11 +16,7 @@ targets: - virtio-mmio - barebox-state - testfs - runner: - download: - opensbi-riscv32-generic-fw_dynamic.bin: https://github.com/qemu/qemu/blob/v5.2.0/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin?raw=true images: barebox-dt-2nd.img: !template "$LG_BUILDDIR/images/barebox-dt-2nd.img" - opensbi-riscv32-generic-fw_dynamic.bin: !template "$LG_BUILDDIR/opensbi-riscv32-generic-fw_dynamic.bin" imports: - ../strategy.py -- 2.47.3
