diff options
Diffstat (limited to 'meta/conf/machine/qemuarm64.conf')
-rw-r--r-- | meta/conf/machine/qemuarm64.conf | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index 2f61eb0aed..a096d964db 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf | |||
@@ -2,7 +2,7 @@ | |||
2 | #@NAME: QEMU ARMv8 machine | 2 | #@NAME: QEMU ARMv8 machine |
3 | #@DESCRIPTION: Machine configuration for running an ARMv8 system on QEMU | 3 | #@DESCRIPTION: Machine configuration for running an ARMv8 system on QEMU |
4 | 4 | ||
5 | require conf/machine/include/tune-cortexa57.inc | 5 | require conf/machine/include/arm/armv8a/tune-cortexa57.inc |
6 | require conf/machine/include/qemu.inc | 6 | require conf/machine/include/qemu.inc |
7 | 7 | ||
8 | KERNEL_IMAGETYPE = "Image" | 8 | KERNEL_IMAGETYPE = "Image" |
@@ -10,23 +10,21 @@ KERNEL_IMAGETYPE = "Image" | |||
10 | UBOOT_MACHINE ?= "qemu_arm64_defconfig" | 10 | UBOOT_MACHINE ?= "qemu_arm64_defconfig" |
11 | 11 | ||
12 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" | 12 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" |
13 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
14 | 13 | ||
15 | # For runqemu | 14 | # For runqemu |
16 | QB_SYSTEM_NAME = "qemu-system-aarch64" | 15 | QB_SYSTEM_NAME = "qemu-system-aarch64" |
17 | QB_MACHINE = "-machine virt" | 16 | QB_MACHINE = "-machine virt" |
18 | QB_CPU = "-cpu cortex-a57" | 17 | QB_CPU = "-cpu cortex-a57" |
18 | QB_SMP ?= "-smp 4" | ||
19 | QB_CPU_KVM = "-cpu host -machine gic-version=3" | 19 | QB_CPU_KVM = "-cpu host -machine gic-version=3" |
20 | # Standard Serial console | ||
21 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" | ||
22 | # For graphics to work we need to define the VGA device as well as the necessary USB devices | 20 | # For graphics to work we need to define the VGA device as well as the necessary USB devices |
23 | QB_OPT_APPEND = "-device VGA,edid=on" | 21 | QB_GRAPHICS = "-device virtio-gpu-pci" |
24 | QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" | 22 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" |
25 | # Virtio Networking support | 23 | # Virtio Networking support |
26 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" | 24 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" |
27 | QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" | 25 | QB_NETWORK_DEVICE = "-device virtio-net-pci,netdev=net0,mac=@MAC@" |
28 | # Virtio block device | 26 | # Virtio block device |
29 | QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" | 27 | QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-pci,drive=disk0" |
30 | # Virtio serial console | 28 | # Virtio serial console |
31 | QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" | 29 | QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon" |
32 | QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" | 30 | QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon" |