diff options
-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 |
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 |
15 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci" | 15 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci" |
16 | 16 | ||
17 | KERNEL_MODULE_AUTOLOAD += "uvesafb" | ||
18 | KERNEL_MODULE_PROBECONF += "uvesafb" | ||
19 | UVESA_MODE ?= "640x480-32" | 17 | UVESA_MODE ?= "640x480-32" |
20 | module_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 | ||
30 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" | 30 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" |
31 | 31 | ||
32 | KERNEL_MODULE_AUTOLOAD += "uvesafb" | ||
33 | KERNEL_MODULE_PROBECONF += "uvesafb" | ||
34 | module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" | ||
35 | |||
32 | WKS_FILE ?= "directdisk.wks" | 36 | WKS_FILE ?= "directdisk.wks" |
33 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 37 | do_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 | ||
29 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" | 29 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" |
30 | 30 | ||
31 | KERNEL_MODULE_AUTOLOAD += "uvesafb" | ||
32 | KERNEL_MODULE_PROBECONF += "uvesafb" | ||
33 | module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" | ||
34 | |||
31 | WKS_FILE ?= "directdisk.wks" | 35 | WKS_FILE ?= "directdisk.wks" |
32 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 36 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |