meta-agl-bsp: update qemuarm* QEMU options

Update QEMU option variables for qemuarm and qemuarm64 machines
to fix errors seen with runqemu after the upgrade to scarthgap.

Bug-AGL: SPEC-5212

Change-Id: I3667c42b304b75f50fbaec4057ce08767e5c9d61
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30116
Tested-by: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
(cherry picked from commit e4d77d25dce4f4afc33e04c9efa272f04f2eb205)
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30125

diff --git a/meta-agl-bsp/conf/include/agl_qemuarm.inc b/meta-agl-bsp/conf/include/agl_qemuarm.inc
index 2449e18..8a41757 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_qemuarm.inc
+++ b/meta-agl-bsp/conf/include/agl_qemuarm.inc
@@ -16,5 +16,5 @@ QB_MEM:qemuarm = "-m 2048"
 # Changes to make runqemu work out-of-the-box
 QB_AUDIO_DRV:qemuarm := "alsa"
 QB_MACHINE:qemuarm := "-machine virt-2.11 -smp 4"
-QB_OPT_APPEND:qemuarm := "-show-cursor -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
+QB_OPT_APPEND:qemuarm := "-device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd"
 QB_KERNEL_CMDLINE_APPEND:qemuarm := "console=ttyAMA0 verbose vmalloc=256M"

diff --git a/meta-agl-bsp/conf/include/agl_qemuarm64.inc b/meta-agl-bsp/conf/include/agl_qemuarm64.inc
index 46d3b4c..8e292c5 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_qemuarm64.inc
+++ b/meta-agl-bsp/conf/include/agl_qemuarm64.inc
@@ -16,5 +16,5 @@ QB_MEM:qemuarm64 = "-m 2048"
 # Changes to make runqemu work out-of-the-box
 QB_AUDIO_DRV:qemuarm64 := "alsa"
 QB_MACHINE:qemuarm64 := "-machine virt -smp 4"
-QB_OPT_APPEND:qemuarm64 := " -show-cursor -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
+QB_OPT_APPEND:qemuarm64 := " -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd"
 QB_KERNEL_CMDLINE_APPEND:qemuarm64 := "console=ttyAMA0,115200n8 verbose"
\ No newline at end of file