summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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"