mirror of
https://git.yoctoproject.org/poky
synced 2026-02-15 21:23:04 +01:00
d892af43aa
After commite8b1c65394, 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:6af89812e8Since 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>
37 lines
1.2 KiB
Plaintext
37 lines
1.2 KiB
Plaintext
#@TYPE: Machine
|
|
#@NAME: common_pc
|
|
#@DESCRIPTION: Machine configuration for running a common x86
|
|
|
|
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
|
|
PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
|
|
PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
|
|
PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
|
|
|
|
require conf/machine/include/qemu.inc
|
|
require conf/machine/include/tune-i586.inc
|
|
require conf/machine/include/qemuboot-x86.inc
|
|
|
|
KERNEL_IMAGETYPE = "bzImage"
|
|
|
|
SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
|
|
|
|
XSERVER = "xserver-xorg \
|
|
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
|
|
xf86-video-cirrus \
|
|
xf86-video-fbdev \
|
|
xf86-video-vmware \
|
|
xf86-video-modesetting \
|
|
xserver-xorg-module-libint10 \
|
|
"
|
|
|
|
MACHINE_FEATURES += "x86 pci"
|
|
|
|
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
|
|
|
|
KERNEL_MODULE_AUTOLOAD += "uvesafb"
|
|
KERNEL_MODULE_PROBECONF += "uvesafb"
|
|
module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
|
|
|
|
WKS_FILE ?= "directdisk.wks"
|
|
do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
|