summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-01-20 16:58:52 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-01-26 16:48:14 +0000
commit34105bf54189a6ed9cb86f60550623a72f1bd8c2 (patch)
tree38579908d299b3ebb737bc92044644b9ef89fd56
parentfecbdfac3f983b23aee4057e8d55dbde5570c72a (diff)
qemu[arm,arm64]: enable runqemu in graphic mode
This adds the necessary flags to launch runqemu for the qemuarm target with the full graphical agl-demo-platform image. Slow but working. Bug-AGL: SPEC-3764 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: Iffc2158e53d775d578b1d4ee0e94d3fd68e2a028 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25930 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Scott Murray <scott.murray@konsulko.com>
-rw-r--r--meta-agl-bsp/conf/include/agl_qemuarm.inc15
-rw-r--r--meta-agl-bsp/conf/include/agl_qemuarm64.inc20
2 files changed, 19 insertions, 16 deletions
diff --git a/meta-agl-bsp/conf/include/agl_qemuarm.inc b/meta-agl-bsp/conf/include/agl_qemuarm.inc
index 739eb8d..0c058c8 100644
--- a/meta-agl-bsp/conf/include/agl_qemuarm.inc
+++ b/meta-agl-bsp/conf/include/agl_qemuarm.inc
@@ -1,9 +1,3 @@
-# Configuration for serial console
-#QB_KERNEL_CMDLINE_APPEND_append = " console=ttyAMA0,115200n8"
-#
-# All boot message will be off
-QB_KERNEL_CMDLINE_APPEND_append = " quiet"
-
# Build updatable image. Only takes effect when sota.bbclass is inherited
#DISTRO_FEATURES_append = " sota"
@@ -12,3 +6,12 @@ ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02"
# Use our own wks file
WKS_FILE="directdisk.wks.in"
+
+# Over-ride setting in oe-core's qemuboot.bbclass
+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_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 ca2cc94..58e1812 100644
--- a/meta-agl-bsp/conf/include/agl_qemuarm64.inc
+++ b/meta-agl-bsp/conf/include/agl_qemuarm64.inc
@@ -1,17 +1,17 @@
-# Configuration for serial console
-#QB_KERNEL_CMDLINE_APPEND_append = " console=ttyAMA0,115200n8"
-
-# All boot message will be off
-QB_KERNEL_CMDLINE_APPEND_append = " quiet"
-
# Build updatable image. Only takes effect when sota.bbclass is inherited
-DISTRO_FEATURES_append = " sota"
+#DISTRO_FEATURES_append = " sota"
# Root device
ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02"
-# Over-ride setting in oe-core's qemuarm64.conf
-QB_MEM_qemuarm64 = "-m 2048"
-
# Use our own wks file
WKS_FILE="directdisk.wks.in"
+
+# Over-ride setting in oe-core's qemuboot.bbclass
+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_KERNEL_CMDLINE_APPEND_qemuarm64 := "console=ttyAMA0,115200n8 verbose" \ No newline at end of file