diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-02-16 16:50:07 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-18 23:53:54 +0000 |
| commit | e88fe83014b771b1868ee1159672c80f7710f41d (patch) | |
| tree | 0542a4819324e64124d3ef32e5b9d09616040318 | |
| parent | cb4e69e6346a9fbeebf83a5d5397cacbd41d48b5 (diff) | |
| download | poky-e88fe83014b771b1868ee1159672c80f7710f41d.tar.gz | |
qemux86: do not add vga=0 to kernel parameters
This was added ages ago to enable GL passthrough with
vmware driver, and is no longer relevant, as std or virgl is used
instead nowadays.
Original commit:
commit 072545b1111c5efb66289a4866897429f5fcd969
Author: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed Jan 21 17:40:51 2009 +0000
scripts/poky-qemu-internal: Add support for GL passthrough in qemux86 images
(From OE-Core rev: 857078ba8eda153f4a097683db551a7d310ecc01)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/canned-wks/qemux86-directdisk.wks | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 495418fa04..049681b27d 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc | |||
| @@ -8,7 +8,7 @@ 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 = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" | 11 | QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-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" |
diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks index c8d9f121b5..22b45217f1 100644 --- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks +++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks | |||
| @@ -4,5 +4,5 @@ | |||
| 4 | 4 | ||
| 5 | include common.wks.inc | 5 | include common.wks.inc |
| 6 | 6 | ||
| 7 | bootloader --timeout=0 --append="vga=0 rw oprofile.timer=1 rootfstype=ext4 " | 7 | bootloader --timeout=0 --append="rw oprofile.timer=1 rootfstype=ext4 " |
| 8 | 8 | ||