summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/include/qemuboot-x86.inc4
-rw-r--r--meta/conf/machine/qemux86.conf3
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
index 5fdbe4df50..82ce46d860 100644
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ b/meta/conf/machine/include/qemuboot-x86.inc
@@ -1,8 +1,8 @@
1# For runqemu 1# For runqemu
2IMAGE_CLASSES += "qemuboot" 2IMAGE_CLASSES += "qemuboot"
3QB_SYSTEM_NAME_x86 = "qemu-system-i386" 3QB_SYSTEM_NAME_x86 = "qemu-system-i386"
4QB_CPU_x86 = "-cpu pentium2" 4QB_CPU_x86 = "-cpu core2duo"
5QB_CPU_KVM_x86 = "-cpu pentium2" 5QB_CPU_KVM_x86 = "-cpu core2duo"
6 6
7QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64" 7QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
8QB_CPU_x86-64 = "-cpu core2duo" 8QB_CPU_x86-64 = "-cpu core2duo"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index f2434a4b5f..272ad1e187 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -8,8 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
9 9
10require conf/machine/include/qemu.inc 10require conf/machine/include/qemu.inc
11DEFAULTTUNE ?= "i586" 11DEFAULTTUNE ?= "core2-32"
12X86ARCH32 ?= "i586"
13require conf/machine/include/tune-corei7.inc 12require conf/machine/include/tune-corei7.inc
14require conf/machine/include/qemuboot-x86.inc 13require conf/machine/include/qemuboot-x86.inc
15 14