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