]> code.ossystems Code Review - openembedded-core.git/commit
qemu conf: Fix kernel module autoloading for uvesafb on genericx86
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>
Thu, 7 Sep 2017 18:30:17 +0000 (11:30 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 13 Sep 2017 20:59:57 +0000 (21:59 +0100)
commit554903483acb4af402feaba013366388db89e36b
tree2e03154dbf38c6e10aee9eaf0f2c22a4848c4881
parent4304ed013a015bfb6f054017cb273578b874b4c2
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)

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>
meta/conf/machine/include/qemuboot-x86.inc
meta/conf/machine/qemux86-64.conf
meta/conf/machine/qemux86.conf