summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-09 22:38:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-12 11:57:41 -0700
commitff35b6c57a380ca4dc158c5104a6137f8faea5cd (patch)
tree7e36559a5fc276355d39fa537b304ea2ddae0d33 /meta
parent6acb45106dafaf6895ad1fb086b6977c256518f6 (diff)
downloadpoky-ff35b6c57a380ca4dc158c5104a6137f8faea5cd.tar.gz
qemuarm64: Fix graphics hang with 5.0 kernel
Ensure we turn on edid for the VGA display which fixes a hang with the 5.0 kernel for qemuarm64. Thanks to Jon Mason for the fix. (From OE-Core rev: c112be9643f9031964be4068feeb5e2f8528c107) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/machine/qemuarm64.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index e17245a0f7..6919e555a8 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -17,7 +17,7 @@ QB_CPU = "-cpu cortex-a57"
17# Standard Serial console 17# Standard Serial console
18QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" 18QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0"
19# For graphics to work we need to define the VGA device as well as the necessary USB devices 19# For graphics to work we need to define the VGA device as well as the necessary USB devices
20QB_OPT_APPEND = "-show-cursor -device VGA" 20QB_OPT_APPEND = "-show-cursor -device VGA,edid=on"
21QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" 21QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd"
22# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy 22# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
23QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" 23QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"