We have some magic "runner:" keys in our labgrid env YAMLs to paper over
quirks, like that Qemu v5.2.0 depends on OpenSBI 32-bit firmware for
Qemu Virt, but doesn't ship it.
Now that we have a blessed test/Containerfile, we should adopt that as
baseline and drop all quirks that are not needed for that system.
Qemu v5.2.0 in Debian bullseye still doesn't ship OpenSBI 32-bit
firmware, but it ships the 64-bit one, so there's no need to download
the latter.
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
test/riscv/qemu-virt64@rv64i_defconfig.yaml | 5 -----
test/riscv/sifive@rv64i_defconfig.yaml | 5 -----
2 files changed, 10 deletions(-)
diff --git a/test/riscv/qemu-virt64@rv64i_defconfig.yaml b/test/riscv/qemu-virt64@rv64i_defconfig.yaml
index fefbd20e5c99..ee121f153619 100644
--- a/test/riscv/qemu-virt64@rv64i_defconfig.yaml
+++ b/test/riscv/qemu-virt64@rv64i_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: rv64
memory: 256M
kernel: barebox-dt-2nd.img
- bios: opensbi-riscv64-generic-fw_dynamic.bin
extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
@@ -15,12 +14,8 @@ targets:
BareboxTestStrategy: {}
features:
- virtio-mmio
- runner:
- download:
- opensbi-riscv64-generic-fw_dynamic.bin: https://github.com/qemu/qemu/blob/v5.2.0/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin?raw=true
images:
barebox-dt-2nd.img: !template "$LG_BUILDDIR/images/barebox-dt-2nd.img"
- opensbi-riscv64-generic-fw_dynamic.bin: !template "$LG_BUILDDIR/opensbi-riscv64-generic-fw_dynamic.bin"
tools:
qemu: /usr/bin/qemu-system-riscv64
imports:
diff --git a/test/riscv/sifive@rv64i_defconfig.yaml b/test/riscv/sifive@rv64i_defconfig.yaml
index f7299453a499..303f96299766 100644
--- a/test/riscv/sifive@rv64i_defconfig.yaml
+++ b/test/riscv/sifive@rv64i_defconfig.yaml
@@ -7,18 +7,13 @@ targets:
cpu: sifive-u54
memory: 256M
kernel: barebox-hifive-unleashed.img
- bios: opensbi-riscv64-generic-fw_dynamic.bin
extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
BareboxTestStrategy: {}
- runner:
- download:
- opensbi-riscv64-generic-fw_dynamic.bin: https://github.com/qemu/qemu/blob/v5.2.0/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin?raw=true
images:
barebox-hifive-unleashed.img: !template "$LG_BUILDDIR/images/barebox-hifive-unleashed.img"
- opensbi-riscv64-generic-fw_dynamic.bin: !template "$LG_BUILDDIR/opensbi-riscv64-generic-fw_dynamic.bin"
tools:
qemu: /usr/bin/qemu-system-riscv64
imports:
--
2.39.2
