diff options
-rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 4 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 3 |
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 |
2 | IMAGE_CLASSES += "qemuboot" | 2 | IMAGE_CLASSES += "qemuboot" |
3 | QB_SYSTEM_NAME_x86 = "qemu-system-i386" | 3 | QB_SYSTEM_NAME_x86 = "qemu-system-i386" |
4 | QB_CPU_x86 = "-cpu pentium2" | 4 | QB_CPU_x86 = "-cpu core2duo" |
5 | QB_CPU_KVM_x86 = "-cpu pentium2" | 5 | QB_CPU_KVM_x86 = "-cpu core2duo" |
6 | 6 | ||
7 | QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64" | 7 | QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64" |
8 | QB_CPU_x86-64 = "-cpu core2duo" | 8 | QB_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" | |||
8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | 8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" |
9 | 9 | ||
10 | require conf/machine/include/qemu.inc | 10 | require conf/machine/include/qemu.inc |
11 | DEFAULTTUNE ?= "i586" | 11 | DEFAULTTUNE ?= "core2-32" |
12 | X86ARCH32 ?= "i586" | ||
13 | require conf/machine/include/tune-corei7.inc | 12 | require conf/machine/include/tune-corei7.inc |
14 | require conf/machine/include/qemuboot-x86.inc | 13 | require conf/machine/include/qemuboot-x86.inc |
15 | 14 | ||