docs/platform: Update QEMU parameter for fw_payload

Since QEMU v5.1, if there is no "-bios" option provided, the default
OpenSBI firmware will be loaded by QEMU as the BIOS automatically,
hence to load fw_payload type image, we should explicitly pass the
"-bios" option to QEMU.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
This commit is contained in:
Bin Meng
2020-06-25 18:26:02 -07:00
committed by Anup Patel
parent a98258d0b5
commit 35bc810252
2 changed files with 8 additions and 8 deletions

View File

@@ -28,7 +28,7 @@ make PLATFORM=generic
Run: Run:
``` ```
qemu-system-riscv64 -M virt -m 256M -nographic \ qemu-system-riscv64 -M virt -m 256M -nographic \
-kernel build/platform/generic/firmware/fw_payload.bin -bios build/platform/generic/firmware/fw_payload.bin
``` ```
**U-Boot Payload** **U-Boot Payload**
@@ -44,7 +44,7 @@ make PLATFORM=generic FW_PAYLOAD_PATH=<uboot_build_directory>/u-boot.bin
Run: Run:
``` ```
qemu-system-riscv64 -M virt -m 256M -nographic \ qemu-system-riscv64 -M virt -m 256M -nographic \
-kernel build/platform/generic/firmware/fw_payload.elf -bios build/platform/generic/firmware/fw_payload.elf
``` ```
or or
``` ```
@@ -66,7 +66,7 @@ make PLATFORM=generic FW_PAYLOAD_PATH=<linux_build_directory>/arch/riscv/boot/Im
Run: Run:
``` ```
qemu-system-riscv64 -M virt -m 256M -nographic \ qemu-system-riscv64 -M virt -m 256M -nographic \
-kernel build/platform/generic/firmware/fw_payload.elf \ -bios build/platform/generic/firmware/fw_payload.elf \
-drive file=<path_to_linux_rootfs>,format=raw,id=hd0 \ -drive file=<path_to_linux_rootfs>,format=raw,id=hd0 \
-device virtio-blk-device,drive=hd0 \ -device virtio-blk-device,drive=hd0 \
-append "root=/dev/vda rw console=ttyS0" -append "root=/dev/vda rw console=ttyS0"
@@ -95,7 +95,7 @@ make PLATFORM=generic PLATFORM_RISCV_XLEN=32
Run: Run:
``` ```
qemu-system-riscv32 -M virt -m 256M -nographic \ qemu-system-riscv32 -M virt -m 256M -nographic \
-kernel build/platform/generic/firmware/fw_payload.bin -bios build/platform/generic/firmware/fw_payload.bin
``` ```
**U-Boot Payload** **U-Boot Payload**
@@ -111,7 +111,7 @@ make PLATFORM=generic PLATFORM_RISCV_XLEN=32 FW_PAYLOAD_PATH=<uboot_build_direct
Run: Run:
``` ```
qemu-system-riscv32 -M virt -m 256M -nographic \ qemu-system-riscv32 -M virt -m 256M -nographic \
-kernel build/platform/generic/firmware/fw_payload.elf -bios build/platform/generic/firmware/fw_payload.elf
``` ```
or or
``` ```
@@ -133,7 +133,7 @@ make PLATFORM=generic PLATFORM_RISCV_XLEN=32 FW_PAYLOAD_PATH=<linux_build_direct
Run: Run:
``` ```
qemu-system-riscv32 -M virt -m 256M -nographic \ qemu-system-riscv32 -M virt -m 256M -nographic \
-kernel build/platform/generic/firmware/fw_payload.elf \ -bios build/platform/generic/firmware/fw_payload.elf \
-drive file=<path_to_linux_rootfs>,format=raw,id=hd0 \ -drive file=<path_to_linux_rootfs>,format=raw,id=hd0 \
-device virtio-blk-device,drive=hd0 \ -device virtio-blk-device,drive=hd0 \
-append "root=/dev/vda rw console=ttyS0" -append "root=/dev/vda rw console=ttyS0"

View File

@@ -59,7 +59,7 @@ make PLATFORM=generic
Run: Run:
``` ```
qemu-system-riscv64 -M spike -m 256M -nographic \ qemu-system-riscv64 -M spike -m 256M -nographic \
-kernel build/platform/generic/firmware/fw_payload.elf -bios build/platform/generic/firmware/fw_payload.elf
``` ```
**Linux Kernel Payload** **Linux Kernel Payload**
@@ -75,7 +75,7 @@ make PLATFORM=generic FW_PAYLOAD_PATH=<linux_build_directory>/arch/riscv/boot/Im
Run: Run:
``` ```
qemu-system-riscv64 -M spike -m 256M -nographic \ qemu-system-riscv64 -M spike -m 256M -nographic \
-kernel build/platform/generic/firmware/fw_payload.elf \ -bios build/platform/generic/firmware/fw_payload.elf \
-initrd <path_to_cpio_ramdisk> \ -initrd <path_to_cpio_ramdisk> \
-append "root=/dev/ram rw console=hvc0 earlycon=sbi" -append "root=/dev/ram rw console=hvc0 earlycon=sbi"
``` ```