summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/riscv/qemuriscv.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/machine/include/riscv/qemuriscv.inc')
-rw-r--r--meta/conf/machine/include/riscv/qemuriscv.inc13
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc
index 47d7e9b174..d01d988eee 100644
--- a/meta/conf/machine/include/riscv/qemuriscv.inc
+++ b/meta/conf/machine/include/riscv/qemuriscv.inc
@@ -3,14 +3,13 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
3require conf/machine/include/qemu.inc 3require conf/machine/include/qemu.inc
4require conf/machine/include/riscv/tune-riscv.inc 4require conf/machine/include/riscv/tune-riscv.inc
5 5
6MACHINE_FEATURES = "screen keyboard ext2 ext3 serial" 6MACHINE_FEATURES += "keyboard ext2 ext3 serial"
7 7
8KERNEL_IMAGETYPE = "Image" 8KERNEL_IMAGETYPE = "Image"
9KERNEL_IMAGETYPES += "uImage" 9KERNEL_IMAGETYPES += "uImage"
10KEEPUIMAGE = "no" 10KEEPUIMAGE = "no"
11 11
12SERIAL_CONSOLES ?= "115200;ttyS0 115200;hvc0" 12SERIAL_CONSOLES ?= "115200;ttyS0 115200;hvc0"
13SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
14 13
15IMAGE_FSTYPES += "ext4 wic.qcow2" 14IMAGE_FSTYPES += "ext4 wic.qcow2"
16 15
@@ -22,10 +21,11 @@ EXTRA_IMAGEDEPENDS += "opensbi"
22RISCV_SBI_PLAT ?= "generic" 21RISCV_SBI_PLAT ?= "generic"
23RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin" 22RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin"
24 23
25UBOOT_ENTRYPOINT_riscv32 = "0x80400000" 24UBOOT_ENTRYPOINT:riscv32 = "0x80400000"
26UBOOT_ENTRYPOINT_riscv64 = "0x80200000" 25UBOOT_ENTRYPOINT:riscv64 = "0x80200000"
27 26
28# qemuboot options 27# qemuboot options
28QB_SMP ?= "-smp 4"
29QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" 29QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi"
30QB_MACHINE = "-machine virt" 30QB_MACHINE = "-machine virt"
31QB_DEFAULT_BIOS = "fw_jump.elf" 31QB_DEFAULT_BIOS = "fw_jump.elf"
@@ -33,4 +33,7 @@ QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
33QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" 33QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
34QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" 34QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0"
35QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" 35QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
36QB_TCPSERIAL_OPT = " -device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" 36QB_TCPSERIAL_OPT = " -device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon"
37QB_GRAPHICS = "-device bochs-display"
38QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
39QB_OPT_APPEND:riscv32 = "-device virtio-tablet-pci -device virtio-keyboard-pci"