summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemuarm64.conf2
-rw-r--r--meta/conf/machine/qemuarmv5.conf3
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 93d855b6e1..d71a793edf 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -20,7 +20,7 @@ QB_SMP = "-smp 4"
20# Standard Serial console 20# Standard Serial console
21QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" 21QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
22# For graphics to work we need to define the VGA device as well as the necessary USB devices 22# For graphics to work we need to define the VGA device as well as the necessary USB devices
23QB_GRAPHICS = "-device VGA,edid=on" 23QB_GRAPHICS = "-device virtio-gpu-pci"
24QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" 24QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
25# Virtio Networking support 25# Virtio Networking support
26QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" 26QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index ea7fae2722..3b08dedddc 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -19,7 +19,7 @@ QB_CPU = "-cpu cortex-a57"
19QB_SMP = "-smp 4" 19QB_SMP = "-smp 4"
20QB_CPU_KVM = "-cpu host -machine gic-version=3" 20QB_CPU_KVM = "-cpu host -machine gic-version=3"
21# For graphics to work we need to define the VGA device as well as the necessary USB devices 21# For graphics to work we need to define the VGA device as well as the necessary USB devices
22QB_GRAPHICS = "-device VGA,edid=on" 22QB_GRAPHICS = "-device virtio-gpu-pci"
23QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" 23QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
24# Virtio Networking support 24# Virtio Networking support
25QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" 25QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index 6c99a52965..252d6286d8 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -13,7 +13,8 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
13QB_SYSTEM_NAME = "qemu-system-arm" 13QB_SYSTEM_NAME = "qemu-system-arm"
14QB_MACHINE = "-machine versatilepb" 14QB_MACHINE = "-machine versatilepb"
15QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" 15QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
16QB_OPT_APPEND = "-usb -device usb-tablet" 16QB_GRAPHICS = "-device virtio-gpu-pci"
17QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
17PREFERRED_VERSION_linux-yocto ??= "5.13%" 18PREFERRED_VERSION_linux-yocto ??= "5.13%"
18QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 19QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
19 20