summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/qemuboot-x86.inc
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-04-27 23:49:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-28 20:55:08 +0100
commite8b1c653946ef921b65d47e52aea0dc530ef4286 (patch)
treedea512e575560d041c0a0e99323698040bd3e79c /meta/conf/machine/include/qemuboot-x86.inc
parent1ce923bfe1d81093edddfdaa0aa60e6300a5ea29 (diff)
downloadpoky-e8b1c653946ef921b65d47e52aea0dc530ef4286.tar.gz
v86d, qemuboot-x86.inc: use KERNEL_MODULE_AUTOLOAD+KERNEL_MODULE_PROBECONF for uvesafb instead of fbsetup init script
* also add UVESA_MODE variable for easier change of resolution and respect it in QB_KERNEL_CMDLINE_APPEND as well * don't use init script just to call modprobe * I wasn't able to test this all the way with runqemu, because runqemu doesn't work on my system, but I've verified that the right params appear there and that I can easily change UVESA_MODE from conf/local.conf, the modules.d and modprobe.d files look OK: OE qemux86@ ~/build/oe-core/tmp-glibc/deploy/images/qemux86/core-image-sato-qemux86-20170427212613.rootfs $ cat etc/modules-load.d/uvesafb.conf uvesafb OE qemux86@ ~/build/oe-core/tmp-glibc/deploy/images/qemux86/core-image-sato-qemux86-20170427212613.rootfs $ cat etc/modprobe.d/uvesafb.conf options uvesafb mode_option=1600x1200-32 so I'll be able to drop this KERNEL_MODULE_AUTOLOAD + KERNEL_MODULE_PROBECONF from my DISTRO conf. (From OE-Core rev: f7ba5b5f76bb5678ca3e6ad51586f25871f7a9fb) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include/qemuboot-x86.inc')
-rw-r--r--meta/conf/machine/include/qemuboot-x86.inc7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
index acd03a1ce8..acf9d55c40 100644
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ b/meta/conf/machine/include/qemuboot-x86.inc
@@ -10,6 +10,11 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo"
10 10
11QB_AUDIO_DRV = "alsa" 11QB_AUDIO_DRV = "alsa"
12QB_AUDIO_OPT = "-soundhw ac97,es1370" 12QB_AUDIO_OPT = "-soundhw ac97,es1370"
13QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1" 13QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
14# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy 14# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
15QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" 15QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
16
17KERNEL_MODULE_AUTOLOAD += "uvesafb"
18KERNEL_MODULE_PROBECONF += "uvesafb"
19UVESA_MODE ?= "640x480-32"
20module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"