diff mbox series

board/qemu/riscv64-virt: update qemu cmdline for Qemu >= 5.1

Message ID 20201002160122.1530178-1-romain.naour@gmail.com
State Accepted
Headers show
Series board/qemu/riscv64-virt: update qemu cmdline for Qemu >= 5.1 | expand

Commit Message

Romain Naour Oct. 2, 2020, 4:01 p.m. UTC
Since 52f188140cd28e90103edf67db6c2cabb979f5d6 (qemu version bump to 5.1),
the image generated by qemu_riscv64_virt_defconfig doesn't boot anyore with
the following error:

rom: requested regions overlap (rom phdr #0: [...]/images//fw_jump.elf. free=0x000000008000e240, addr=0x0000000080000000)
qemu-system-riscv64: rom check and register reset failed

Update the qemu command line as described in the Qemu wiki for riscv64 [1]

Fixes:
https://gitlab.com/jugurthaB/buildroot/-/jobs/686104707

[1] https://wiki.qemu.org/Documentation/Platforms/RISCV#Booting_64-bit_OpenEmbedded_Images

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Jugurtha BELKALEM <jugurtha.belkalem@smile.fr>
Cc: Alistair Francis <alistair.francis@wdc.com>
Cc: Mark Corbin <mark@dibsco.co.uk>
---
 board/qemu/riscv64-virt/readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alistair Francis Oct. 2, 2020, 3:51 p.m. UTC | #1
On Fri, Oct 2, 2020 at 9:01 AM Romain Naour <romain.naour@gmail.com> wrote:
>
> Since 52f188140cd28e90103edf67db6c2cabb979f5d6 (qemu version bump to 5.1),
> the image generated by qemu_riscv64_virt_defconfig doesn't boot anyore with
> the following error:
>
> rom: requested regions overlap (rom phdr #0: [...]/images//fw_jump.elf. free=0x000000008000e240, addr=0x0000000080000000)
> qemu-system-riscv64: rom check and register reset failed
>
> Update the qemu command line as described in the Qemu wiki for riscv64 [1]
>
> Fixes:
> https://gitlab.com/jugurthaB/buildroot/-/jobs/686104707
>
> [1] https://wiki.qemu.org/Documentation/Platforms/RISCV#Booting_64-bit_OpenEmbedded_Images
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Jugurtha BELKALEM <jugurtha.belkalem@smile.fr>
> Cc: Alistair Francis <alistair.francis@wdc.com>
> Cc: Mark Corbin <mark@dibsco.co.uk>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Good catch! I fixed the 32-bit one but not the 64-bit.

Alistair

> ---
>  board/qemu/riscv64-virt/readme.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/board/qemu/riscv64-virt/readme.txt b/board/qemu/riscv64-virt/readme.txt
> index 81b5246e66..747a9ea674 100644
> --- a/board/qemu/riscv64-virt/readme.txt
> +++ b/board/qemu/riscv64-virt/readme.txt
> @@ -1,5 +1,5 @@
>  Run Linux in emulation with:
>
> -  qemu-system-riscv64 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80200000 -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig
> +  qemu-system-riscv64 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig
>
>  The login prompt will appear in the terminal that started Qemu.
> --
> 2.25.4
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Peter Korsgaard Oct. 3, 2020, 7:01 a.m. UTC | #2
>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > Since 52f188140cd28e90103edf67db6c2cabb979f5d6 (qemu version bump to 5.1),
 > the image generated by qemu_riscv64_virt_defconfig doesn't boot anyore with
 > the following error:

 > rom: requested regions overlap (rom phdr #0:
 > [...]/images//fw_jump.elf. free=0x000000008000e240,
 > addr=0x0000000080000000)
 > qemu-system-riscv64: rom check and register reset failed

 > Update the qemu command line as described in the Qemu wiki for riscv64 [1]

 > Fixes:
 > https://gitlab.com/jugurthaB/buildroot/-/jobs/686104707

 > [1] https://wiki.qemu.org/Documentation/Platforms/RISCV#Booting_64-bit_OpenEmbedded_Images

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>
 > Cc: Jugurtha BELKALEM <jugurtha.belkalem@smile.fr>
 > Cc: Alistair Francis <alistair.francis@wdc.com>
 > Cc: Mark Corbin <mark@dibsco.co.uk>

Committed, thanks.
diff mbox series

Patch

diff --git a/board/qemu/riscv64-virt/readme.txt b/board/qemu/riscv64-virt/readme.txt
index 81b5246e66..747a9ea674 100644
--- a/board/qemu/riscv64-virt/readme.txt
+++ b/board/qemu/riscv64-virt/readme.txt
@@ -1,5 +1,5 @@ 
 Run Linux in emulation with:
 
-  qemu-system-riscv64 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80200000 -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig
+  qemu-system-riscv64 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig
 
 The login prompt will appear in the terminal that started Qemu.