summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2017-09-07 11:30:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-13 22:07:42 +0100
commitd892af43aaba6ba402c97c72c40f2a41202bf886 (patch)
treea862291c60dacb6b669c035da04ca54f246dfd74 /meta/conf/machine
parent4dc8f4fbf52c50a56e01aead6dec35194b613ddb (diff)
downloadpoky-d892af43aaba6ba402c97c72c40f2a41202bf886.tar.gz
qemu conf: Fix kernel module autoloading for uvesafb on genericx86
After commit e8b1c653946ef921b65d47e52aea0dc530ef4286, we started seeing errors like the following during boot on genericx86 machines: uvesafb: failed to execute /sbin/v86d uvesafb: probe of uvesafb.0 failed with error -22 uvesafb: vbe_init() failed with -22 uvesafb: Getting VBE info block failed (eax=0x4f00, err=-2) These were caused because the uvesa module was being loaded during boot, when it is only meant to be loaded on qemu according to: 6af89812e8a9931ffed63768ed85367519bf7aef Since genericx86-common.inc includes qemuboot-x86, the module also tries to be loaded on genericx86 machines, this patch removes the instruction from qemuboot-x86 and adds it in specific to both qemux86 machines confs so it is correctly loaded only on those. [YOCTO #11879] (From OE-Core rev: 261f9c382121c73b72556a151fdd4c7938b32a92) (From OE-Core rev: 554903483acb4af402feaba013366388db89e36b) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.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')
-rw-r--r--meta/conf/machine/include/qemuboot-x86.inc3
-rw-r--r--meta/conf/machine/qemux86-64.conf4
-rw-r--r--meta/conf/machine/qemux86.conf4
3 files changed, 8 insertions, 3 deletions
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
index 0596e2ed3f..1456bf7e8b 100644
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ b/meta/conf/machine/include/qemuboot-x86.inc
@@ -14,7 +14,4 @@ QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.tim
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 -device usb-tablet -device virtio-rng-pci" 15QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci"
16 16
17KERNEL_MODULE_AUTOLOAD += "uvesafb"
18KERNEL_MODULE_PROBECONF += "uvesafb"
19UVESA_MODE ?= "640x480-32" 17UVESA_MODE ?= "640x480-32"
20module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index ff6e5491bb..fcc44595e8 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -29,5 +29,9 @@ MACHINE_FEATURES += "x86 pci"
29 29
30MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" 30MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
31 31
32KERNEL_MODULE_AUTOLOAD += "uvesafb"
33KERNEL_MODULE_PROBECONF += "uvesafb"
34module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
35
32WKS_FILE ?= "directdisk.wks" 36WKS_FILE ?= "directdisk.wks"
33do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 37do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index f8b09c37f2..c53f7a92ce 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -28,5 +28,9 @@ MACHINE_FEATURES += "x86 pci"
28 28
29MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" 29MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
30 30
31KERNEL_MODULE_AUTOLOAD += "uvesafb"
32KERNEL_MODULE_PROBECONF += "uvesafb"
33module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
34
31WKS_FILE ?= "directdisk.wks" 35WKS_FILE ?= "directdisk.wks"
32do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 36do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"