diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 3 | ||||
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 4 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/runtime/cases/parselogs.py | 4 |
4 files changed, 1 insertions, 14 deletions
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 049681b27d..5dcc8b6f6b 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc | |||
@@ -8,9 +8,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" | |||
8 | 8 | ||
9 | QB_AUDIO_DRV = "alsa" | 9 | QB_AUDIO_DRV = "alsa" |
10 | QB_AUDIO_OPT = "-soundhw ac97,es1370" | 10 | QB_AUDIO_OPT = "-soundhw ac97,es1370" |
11 | QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" | 11 | QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1" |
12 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" | 12 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" |
13 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 13 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
14 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 14 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
15 | 15 | ||
16 | UVESA_MODE ?= "640x480-32" | ||
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 648cf2fe8f..db9004ee32 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
@@ -37,10 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" | |||
37 | 37 | ||
38 | MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" | 38 | MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" |
39 | 39 | ||
40 | KERNEL_MODULE_AUTOLOAD += "uvesafb" | ||
41 | KERNEL_MODULE_PROBECONF += "uvesafb" | ||
42 | module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" | ||
43 | |||
44 | WKS_FILE ?= "qemux86-directdisk.wks" | 40 | WKS_FILE ?= "qemux86-directdisk.wks" |
45 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 41 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |
46 | 42 | ||
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 8e0da82076..7e6723b880 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
@@ -34,10 +34,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" | |||
34 | 34 | ||
35 | MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" | 35 | MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" |
36 | 36 | ||
37 | KERNEL_MODULE_AUTOLOAD += "uvesafb" | ||
38 | KERNEL_MODULE_PROBECONF += "uvesafb" | ||
39 | module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" | ||
40 | |||
41 | WKS_FILE ?= "qemux86-directdisk.wks" | 37 | WKS_FILE ?= "qemux86-directdisk.wks" |
42 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 38 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |
43 | 39 | ||
diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index 9dafb89b03..3cad0709a1 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py | |||
@@ -60,7 +60,6 @@ common_errors = [ | |||
60 | ] | 60 | ] |
61 | 61 | ||
62 | video_related = [ | 62 | video_related = [ |
63 | "uvesafb", | ||
64 | ] | 63 | ] |
65 | 64 | ||
66 | x86_common = [ | 65 | x86_common = [ |
@@ -82,11 +81,8 @@ qemux86_common = [ | |||
82 | "fail to add MMCONFIG information, can't access extended PCI configuration space under this bridge.", | 81 | "fail to add MMCONFIG information, can't access extended PCI configuration space under this bridge.", |
83 | "can't claim BAR ", | 82 | "can't claim BAR ", |
84 | 'amd_nb: Cannot enumerate AMD northbridges', | 83 | 'amd_nb: Cannot enumerate AMD northbridges', |
85 | 'uvesafb: 5000 ms task timeout, infinitely waiting', | ||
86 | 'tsc: HPET/PMTIMER calibration failed', | 84 | 'tsc: HPET/PMTIMER calibration failed', |
87 | "modeset(0): Failed to initialize the DRI2 extension", | 85 | "modeset(0): Failed to initialize the DRI2 extension", |
88 | "uvesafb: cannot reserve video memory at", | ||
89 | "uvesafb: probe of uvesafb.0 failed with error", | ||
90 | "glamor initialization failed", | 86 | "glamor initialization failed", |
91 | ] + common_errors | 87 | ] + common_errors |
92 | 88 | ||